From 4ca450deaca133b14a7798ab1803129c3f26353a Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 19 Jul 2023 15:45:10 +0200 Subject: [PATCH 1/5] tools/7z: update to 23.01 Release Notes: https://sourceforge.net/p/sevenzip/discussion/45797/thread/3f550826d8/#e950 Manually adjust: - 7-zip-flags.patch Automatically refresh: - 7-zip-musl.patch Signed-off-by: Nick Hainke --- tools/7z/Makefile | 6 +++--- tools/7z/patches/7-zip-flags.patch | 15 ++++----------- tools/7z/patches/7-zip-musl.patch | 8 ++++---- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/tools/7z/Makefile b/tools/7z/Makefile index 90362e79779..351ae527ffe 100644 --- a/tools/7z/Makefile +++ b/tools/7z/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=7z -PKG_VERSION:=22.01 -PKG_SOURCE_VERSION:=2201 +PKG_VERSION:=23.01 +PKG_SOURCE_VERSION:=2301 PKG_SOURCE:=$(PKG_NAME)$(PKG_SOURCE_VERSION)-src.tar.xz PKG_SOURCE_URL:=https://7-zip.org/a/ -PKG_HASH:=393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5 +PKG_HASH:=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74 # This builds the 7zr variant which supports only 7z, so no non-LGPL code should be included PKG_LICENSE:=LGPL-2.1-or-later diff --git a/tools/7z/patches/7-zip-flags.patch b/tools/7z/patches/7-zip-flags.patch index ed5b5084018..b9b2152f22a 100644 --- a/tools/7z/patches/7-zip-flags.patch +++ b/tools/7z/patches/7-zip-flags.patch @@ -1,14 +1,16 @@ --- a/CPP/7zip/7zip_gcc.mak +++ b/CPP/7zip/7zip_gcc.mak -@@ -18,13 +18,13 @@ PROGPATH_STATIC = $(O)/$(PROG)s +@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s ifneq ($(CC), xlc) --CFLAGS_WARN_WALL = -Wall -Werror -Wextra +-CFLAGS_WARN_WALL = -Werror -Wall -Wextra +CFLAGS_WARN_WALL = -Wall -Wextra endif # for object file +@@ -32,7 +32,7 @@ endif + # -save-temps CFLAGS_BASE_LIST = -c # CFLAGS_BASE_LIST = -S -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ @@ -16,12 +18,3 @@ -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -fPIC -@@ -192,7 +192,7 @@ all: $(O) $(PROGPATH) $(STATIC_TARGET) - $(O): - $(MY_MKDIR) $(O) - --LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2) -+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2) - $(PROGPATH): $(OBJS) - $(CXX) -o $(PROGPATH) $(LFLAGS_ALL) - diff --git a/tools/7z/patches/7-zip-musl.patch b/tools/7z/patches/7-zip-musl.patch index cf3386e4de3..e066cc8ec91 100644 --- a/tools/7z/patches/7-zip-musl.patch +++ b/tools/7z/patches/7-zip-musl.patch @@ -1,6 +1,6 @@ --- a/C/CpuArch.c +++ b/C/CpuArch.c -@@ -421,8 +421,6 @@ BoolInt CPU_IsSupported_AES (void) { ret +@@ -766,8 +766,6 @@ BoolInt CPU_IsSupported_AES (void) { ret #ifdef USE_HWCAP @@ -11,7 +11,7 @@ --- a/C/Threads.c +++ b/C/Threads.c -@@ -257,7 +257,7 @@ WRes Thread_Create_With_CpuSet(CThread * +@@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread * */ // ret2 = @@ -20,7 +20,7 @@ // if (ret2) ret = ret2; #endif } -@@ -267,14 +267,12 @@ WRes Thread_Create_With_CpuSet(CThread * +@@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread * if (!ret) { p->_created = 1; @@ -37,7 +37,7 @@ // ret2 = --- a/C/Threads.h +++ b/C/Threads.h -@@ -19,6 +19,7 @@ +@@ -20,6 +20,7 @@ #endif #include From 85efbbcf06ea305aef1cb3c4cdc7d59f92407343 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 20 Jul 2023 18:27:04 +0200 Subject: [PATCH 2/5] libtraceevent: update to 1.7.3 ChangeLog: dd14818 libtraceevent: version 1.7.3 0b9a34e libtraceevent: Handle printf '%+d" case eba4a41 libtraceevent: Add initial support for meson 1d8ddb9 libtraceevent: Handle %c Signed-off-by: Nick Hainke --- package/libs/libtraceevent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libtraceevent/Makefile b/package/libs/libtraceevent/Makefile index 5d8740faab4..bcba7eaf43f 100644 --- a/package/libs/libtraceevent/Makefile +++ b/package/libs/libtraceevent/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtraceevent -PKG_VERSION:=1.7.2 +PKG_VERSION:=1.7.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/ -PKG_HASH:=a8b4bf8f05c06d1d6405f6d0038467a87e7ab218f0d8b0608d08bca5d1fc112a +PKG_HASH:=097b72e0d907f3107825fb2edf0188324bf70dc9da360f6efa68dc484ffde541 PKG_MAINTAINER:=Nick Hainke From a8c84b550be10462f870688b2adf50cabb8dd2d2 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 20 Jul 2023 18:29:27 +0200 Subject: [PATCH 3/5] libtracefs: update to 1.7.0 ChangeLog: aebab37 libtracefs: version 1.7 a3237c3 libtracefs: Add initial support for meson b25019f libtarcefs doc: Add tracefs_kprobe_destroy() to index man page 4c2194f libtracefs doc: State that tracefs_dynevent_create() is needed for tracefs_kprobe_alloc() df53d43 libtracefs Documentation: Add missing prototypes in top level man page 9a2df4a libtracefs: Update version to 1.7.dev 18ede68 libtracefs: Add tracefs_kprobe_destory() API 309b1ba libtracefs tests: Add helper function to destroy dynamic events 53dce80 tracefs: Add tracefs_time_conversion() API 5ea4128 libtracefs: Add tracefs_find_cid_pid() API 857dd3e libtracefs/utest: Fix crashing of synth test when synths exist 6332309 libtracefs/utest: Do not use synth for test_synth element 25cd206 libtracefs: Clarify the tracefs_synth_create() man page 6b6d43f libtracefs: Do not allow tracefs_synth_set_instance() on created synth c860f93 libtracefs: Documentation for tracefs_synth_set_instance 0039173 libtracefs: New API to set synthetic event instance e97c311 libtracefs: Do not segfault in tests if synthetic events are not configured 185019c libtracefs: Add tracefs_instance_tracers() API 6775d23 libtracefs: Do not use hwlat tracer and fdb_delete event for tests 5a1a01e libtracefs: Add stacktrace to tracefs_sql() b1b234e libtracefs: Unit test for tracefs_instance_reset() dd620f4 libtracefs: Documentation for tracefs_instance_reset() 789e82d libtracefs: New API to reset ftrace instance Signed-off-by: Nick Hainke --- package/libs/libtracefs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/libtracefs/Makefile b/package/libs/libtracefs/Makefile index b97922f4606..eb879ee66dd 100644 --- a/package/libs/libtracefs/Makefile +++ b/package/libs/libtracefs/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtracefs -PKG_VERSION:=1.6.4 +PKG_VERSION:=1.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/ -PKG_HASH:=52ce793dbb35a3e59bddce31de09a5d92cedd4d0702e64d0916f1ccdb00526c9 +PKG_HASH:=411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16 PKG_MAINTAINER:=Nick Hainke From 6f8c79e00c70f08f234dc55fa4811f02d851c5d2 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 20 Jul 2023 18:32:13 +0200 Subject: [PATCH 4/5] tracecmd: update to v3.2 ChangeLog: 46952ef trace-cmd: Version 3.2 f5871a1 libtracecmd: Version 1.4.0 d498af1 trace-cmd build: Add trace-attach.c to meson build 736df06 trace-cmd: Add initial support for meson e183566 libtracecmd: Add initial support for meson c508713 trace-cmd test: Quiet valgrind from reporting forked children 8ec026f trace-cmd test: Close handle after opening 4c179a6 trace-cmd library: Fix memory leaks of followers aa21520 trace-cmd: Add Makefile target for memory test 925e15f trace-cmd and library: Update the version to the development 4fa31c0 trace-cmd attach: Add new command "attach" 7e721ef trace-cmd library: Add tracecmd_get_tsc2nsec() API 8908555 tracecmd library: Unlock records in tracecmd_iterate_events() 2668b13 trace-cmd agent: Add "IP" to -N argument in help message 22ad81e trace-cmd record: Remove redundant check of instance in allocate_instance() d7ce897 libtracecmd: Free buf_from in error path of tracecmd_compress_copy_from() 6776d7a trace-cmd: Update v7 trace.dat documentation to clarify the strings section 9d6f3ba trace-cmd record/extract: Do not destroy existing instances 9c9d5ed trace-cmd extract: Do not extract top level unless told to 4b92132 libtracecmd: Fix tracecmd_compress_copy_from() write size return f30abfd documentation: trace-cmd-report: Document filter scope 7a390c5 trace-cmd-report: Support global filters 04ad2c6 trace-cmd report: Ensure filter is applied to single input file edf9424 trace-cmd: Open code execvp routine to avoid multiple execve syscalls Signed-off-by: Nick Hainke --- package/devel/trace-cmd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 687907acaa0..c1a24dc1719 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v3.1.6 +PKG_VERSION:=v3.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/ -PKG_HASH:=f9198ea306deee9cda3b262342b03b6029e82c1b9c671ba521739a9703e115b9 +PKG_HASH:=62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING From 4a4e0c636fa3e1feb4e2d7af77ff23b097d9d33a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 1 Aug 2023 13:43:07 +0200 Subject: [PATCH 5/5] hostapd: fix mesh supplicant build error Include AP ucode source file Fixes: e56c5f7b276a ("hostapd: add ucode support, use ucode for the main ubus object") Signed-off-by: Felix Fietkau --- .../services/hostapd/patches/601-ucode_support.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/network/services/hostapd/patches/601-ucode_support.patch b/package/network/services/hostapd/patches/601-ucode_support.patch index 6cfc9b7d8d5..ff1a9ddc0d3 100644 --- a/package/network/services/hostapd/patches/601-ucode_support.patch +++ b/package/network/services/hostapd/patches/601-ucode_support.patch @@ -138,6 +138,16 @@ endif ifdef CONFIG_CODE_COVERAGE +@@ -999,6 +1011,9 @@ OBJS += ../src/ap/ctrl_iface_ap.o + ifdef CONFIG_UBUS + OBJS += ../src/ap/ubus.o + endif ++ifdef CONFIG_UCODE ++OBJS += ../src/ap/ucode.o ++endif + endif + + CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -7636,6 +7636,7 @@ struct wpa_supplicant * wpa_supplicant_a