ubus: update to the latest version

[openwrt/staging/hauke.git] / package / system / ubus / Makefile

diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index 56e17ea83b1e1eaae27ebb5b1f11f9766215c088..82c4dc601a235a50c6f70553a869fa570818a5ad 100644 (file)
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -5,16 +5,19 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
-PKG_SOURCE_DATE:=2019-12-19
-PKG_SOURCE_VERSION:=a1523d76b016ed46501f61e38ad38999d6c66f52
-PKG_MIRROR_HASH:=f0d46cac85d60e24e3f835c729ee17bb29f0e75c8bd831a86fb3456debd9ad62
+PKG_SOURCE_DATE:=2023-06-05
+PKG_SOURCE_VERSION:=f787c97b34894a38b15599886cacbca01271684f
+PKG_MIRROR_HASH:=f4e898eb9207f069652f1767835f6aa9f015df2282d51e50ab57a0c3736f36e3
+PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
-
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
+PKG_BUILD_FLAGS:=lto
+PKG_ASLR_PIE_REGULAR:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -30,13 +33,14 @@ define Package/ubusd
   CATEGORY:=Base system
   TITLE:=OpenWrt RPC daemon
   DEPENDS:=+libubox +libblobmsg-json
+  USERID:=ubus=81:ubus=81
 endef
 
 define Package/libubus
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libubox
-  ABI_VERSION:=20191219
+  ABI_VERSION:=$(PKG_ABI_VERSION)
   TITLE:=OpenWrt RPC client library
 endef
 
@@ -47,11 +51,11 @@ define Package/libubus-lua
   TITLE:=Lua binding for the OpenWrt RPC client
 endef
 
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -flto
-TARGET_LDFLAGS += -flto
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
-CMAKE_OPTIONS = \
-       -DLUAPATH=/usr/lib/lua
+CMAKE_OPTIONS += \
+       -DLUAPATH=/usr/lib/lua \
+       -DABIVERSION="$(PKG_ABI_VERSION)"
 
 define Package/ubus/install
        $(INSTALL_DIR) $(1)/bin
@@ -65,7 +69,7 @@ endef
 
 define Package/libubus/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
 endef
 
 define Package/libubus-lua/install