From 7863fb15fc6dfe1555d34b223e7ecc96d2915a75 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 27 Nov 2023 18:37:33 +0100 Subject: [PATCH 1/6] libubox: update to Git HEAD (2023-11-27) 82fa6480de7a uloop: add support for interval timers 13d9b04fb09d uloop: add support for user defined signal handlers f7d156911311 uloop: properly initialize signal handler mask 8a5a4319a85c uloop: fix typo in signal handling rework b3fa3d92e3eb uloop: reset flags after __uloop_fd_delete call d4c3066e7c5e udebug: add udebug library code Signed-off-by: Felix Fietkau --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index c62278adc5..b3da20310e 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=f22de22a784a0135cc2869fe81ff30e52136dca36863ee713503b4be5be01869 -PKG_SOURCE_DATE:=2023-05-23 -PKG_SOURCE_VERSION:=75a3b870cace1171faf57bd55e5a9a2f1564f757 +PKG_MIRROR_HASH:=e0881d8c61a953c2e0e721f3063e4a3d53de81fe74dee972074c839b5027a75f +PKG_SOURCE_DATE:=2023-11-27 +PKG_SOURCE_VERSION:=d4c3066e7c5efa5f395c21db77609516d386cbf8 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 From e6d376e33074374a8c24be52a0bb9dfae13b102e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 27 Nov 2023 18:37:55 +0100 Subject: [PATCH 2/6] udebug: update to Git HEAD (2023-11-27) a2301fa3b0c6 README: add wireshark info cfd83ccc1e4e server: properly handle unclaimed file descriptors cb71f64de0ec lib: remove leftover debug code a92101631c0d lib: fix avl tree lookup d4b99820afd0 lib: move library code to libubox, add ubus config handling code Signed-off-by: Felix Fietkau --- package/libs/udebug/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/udebug/Makefile b/package/libs/udebug/Makefile index 04fd741957..5d34fa11bf 100644 --- a/package/libs/udebug/Makefile +++ b/package/libs/udebug/Makefile @@ -11,9 +11,9 @@ PKG_NAME:=udebug CMAKE_INSTALL:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/udebug.git -PKG_MIRROR_HASH:=baf437fb12b1faaf6c7eea3fea253c6d87c31b85f768b48d3984fe398e5b20b8 -PKG_SOURCE_DATE:=2023-11-20 -PKG_SOURCE_VERSION:=759d9404034b7da97b3950c806ace7296a0f7a12 +PKG_MIRROR_HASH:=c0d3701516dcbe0fe2badbeda50076e4f07ec054c4a80621c7aaf4e83ea75d0c +PKG_SOURCE_DATE:=2023-11-27 +PKG_SOURCE_VERSION:=d4b99820afd03a726ea50687d4393007da0fd0df PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) PKG_LICENSE:=GPL-2.0 From f5a1e8953472a36868b793f87743db82195bf2b0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 27 Nov 2023 19:36:33 +0100 Subject: [PATCH 3/6] udebug: move ubus dependency to libudebug Signed-off-by: Felix Fietkau --- package/libs/udebug/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/udebug/Makefile b/package/libs/udebug/Makefile index 5d34fa11bf..2c25eb72fd 100644 --- a/package/libs/udebug/Makefile +++ b/package/libs/udebug/Makefile @@ -26,14 +26,14 @@ define Package/libudebug SECTION:=libs CATEGORY:=Libraries TITLE:=udebug client library - DEPENDS:=+libubox + DEPENDS:=+libubox +libubus endef define Package/udebugd SECTION:=utils CATEGORY:=Utilities TITLE:=OpenWrt debug service - DEPENDS:=+libudebug +libubus + DEPENDS:=+libudebug endef define Package/udebugd/conffiles From 8e7ab041cebdd8fc8847963dabac618b20af1547 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Nov 2023 12:51:37 +0100 Subject: [PATCH 4/6] ubox: add acl file for logd Fixes ubus reconnect, since the process user id changes to 'logd' Signed-off-by: Felix Fietkau --- package/system/ubox/Makefile | 3 ++- package/system/ubox/files/logd.json | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 package/system/ubox/files/logd.json diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index e91763b074..17bade25e4 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -63,10 +63,11 @@ define Package/ubox/install endef define Package/logd/install - $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ + $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ $(1)/usr/share/acl.d $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/ $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log + $(INSTALL_DATA) ./files/logd.json $(1)/usr/share/acl.d endef $(eval $(call BuildPackage,ubox)) diff --git a/package/system/ubox/files/logd.json b/package/system/ubox/files/logd.json new file mode 100644 index 0000000000..f0b2fb1e12 --- /dev/null +++ b/package/system/ubox/files/logd.json @@ -0,0 +1,4 @@ +{ + "user": "logd", + "publish": [ "log" ] +} From 889a50e2660ecaabc33db2a3fa0e1edcd636f8de Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Nov 2023 13:54:19 +0100 Subject: [PATCH 5/6] ubus: update to Git HEAD (2023-11-28) 2b39a27d8bcc libubus: fix reconnect with auto subscribe f84eb5998c6e libubus: fix initial subscribe with autosubscribe Signed-off-by: Felix Fietkau --- package/system/ubus/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 42737ff470..fdf16cfeee 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2023-11-14 -PKG_SOURCE_VERSION:=b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619 -PKG_MIRROR_HASH:=bb7296b17d5a59b9080d4c9ae188dee49f49c0ce88a5cbe0317102123583d663 +PKG_SOURCE_DATE:=2023-11-28 +PKG_SOURCE_VERSION:=f84eb5998c6ea2d34989ca2d3254e56c66139313 +PKG_MIRROR_HASH:=d0c15a0275fa3d35accddb84611700bf601745ad68462bc18905bb65da931f21 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 From 73410e2aa01fa1ee10b2caea4c8645835737c737 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 28 Nov 2023 22:12:15 +0100 Subject: [PATCH 6/6] libubox: update to Git HEAD (2023-11-28) b77f2a4ce903 uloop: fix build using C++ compilers 260ad5bd1566 udebug: add ulog support e80dc00ee90c link librt if needed for shm_open Signed-off-by: Felix Fietkau --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index b3da20310e..076cb37e53 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=e0881d8c61a953c2e0e721f3063e4a3d53de81fe74dee972074c839b5027a75f -PKG_SOURCE_DATE:=2023-11-27 -PKG_SOURCE_VERSION:=d4c3066e7c5efa5f395c21db77609516d386cbf8 +PKG_MIRROR_HASH:=ec4487b5edc071a127b21a63666c20ac1ad516cd48629ee600a679040c709faf +PKG_SOURCE_DATE:=2023-11-28 +PKG_SOURCE_VERSION:=e80dc00ee90c29ef56ae28f414b0e5bb361206e7 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1