From 94cb0786cab68e2021848cdfe62a4736b65b4fea Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Thu, 12 Dec 2024 18:58:58 +0100 Subject: [PATCH 1/3] modules: update openwrt b551214c9d ipq40xx: make GL.iNet A1300 switch functional 239cdcd90c build: Unconditionally append kmod feed for BuildBot db554fd450 build: profiles.json: add kernel version information 6d5c434b14 build: ensure silent Make behavior for json scripts a281c02288 wifi-scripts: Fix parsing of Capabilities d557e23932 ath79: lzma-loader: fix syntax error 769253775c ath79: add support for Huawei AP6010DN cafbecf853 kernel: bump 5.15 to 5.15.173 265d9112b3 kernel: bump 5.15 to 5.15.172 cd9998ef1b kernel: bump 5.15 to 5.15.171 0edb5d4fc0 mac80211: compatibility with kernel 6.6.59 25f85d4293 kernel: bump 5.15 to 5.15.170 e3b120f682 kernel: bump 5.15 to 5.15.169 b389c3d66f kernel: bump 5.15 to 5.15.168 --- modules | 2 +- ...ement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch | 2 +- .../0006-ath79-don-t-create-DIR-825-B1-factory-image.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 10573b41f3..2bd69bc6f2 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='gluon packages routing' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-23.05 -OPENWRT_COMMIT=33b45c0a0e1405d2b390e9231c29d5fb5314707a +OPENWRT_COMMIT=b551214c9db80e9c660ad2e47d3d9899dde07ebc PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022 diff --git a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch index 23235feed7..a38ea3ad2a 100644 --- a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch +++ b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch @@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c + + int system_bridge_addif(struct device *bridge, struct device *dev) diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 -index 4b059cb53f4fe1b7132675d15b66a175a0d44a60..ed36acdb8dc055bef60709191ad0950520f9cb57 100644 +index fd386467ef4585a5cb10c887a8cb922b7a2d9197..e18b099011c2e407f701d8afa5c37bb208b5a6ce 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -762,6 +762,7 @@ CONFIG_BRIDGE=y diff --git a/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch b/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch index 4530f838dc..176f09bb5a 100644 --- a/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch +++ b/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch @@ -12,7 +12,7 @@ factory image and install a Gluon sysupgrade. Signed-off-by: David Bauer diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index f264c14314ca862e39c71e821621a81f8f1957fa..d3e2a9ccd7ae3cb03e35bb4b68a2360bb4d4f84c 100644 +index 637788c73e8cc58aafce4b1f928952aa87924083..b35ad772f7747fb7fe26f67112e27f93d7c57525 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1073,11 +1073,6 @@ define Device/dlink_dir-825-b1 From 8c87cabc1f92f6a70e99dcaba469c57168b73483 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Thu, 12 Dec 2024 18:59:07 +0100 Subject: [PATCH 2/3] modules: update packages 030d96422 v2ray-geodata: Update to latest version 346e9f420 v2ray-geodata: Update to latest version f3907d211 xray-core: Update to 24.11.21 2411efad3 xray-core: Update to 24.11.11 571510a14 microsocks: backport upstream fixes 93b41c74e microsocks: update to 1.0.4 1627d875b ksmbd-tools: update to version 3.5.3 98a3c211f ksmbd-tools: update to version 3.5.2 940d45f41 libdeflate: update to 1.22 04b4e6af6 zerotier: update to 1.14.1 3ab18e422 zerotier: split configuration 1c0336d4c zerotier: update to 1.14.0 1850b3aac adblock-fast: bugfix: dnsmasq instances confdir hack baf67aa3e iperf3: fix crashing with musl 309372ed4 iperf3: explicitly disable SCTP 548b4d241 ruby: update to 3.2.6 c2f90268e php8: update to 8.2.26 c03910982 yggdrasil: bump to 0.5.10 713af8f00 adblock: update 4.2.3-2 bbd98303f adblock: release 4.2.3-1 e1bfb89d4 banIP: update 1.0.1-2 6f1e4580f banIP: release 1.0.1-1 9a4c3e955 banIP: update to 1.0.0-10 f931a1c97 django: bump to 4.2.16 39de0783f node: bump to v18.20.5 714aeeb61 openwisp-monitoring: align PKG_SOURCE_VERSION with PKG_VERSION 7ee4fe770 CI: multi-arch-test-build: move to shared workflow a94b703f8 openwisp-monitoring: allow not depending on rpcd-mod-iwinfo 452e1bfd6 openwisp-monitoring: fix Makefile for 0.2.0 update e7c336c18 openwisp-config: fix Makefile for 1.1.0 --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 2bd69bc6f2..10fe6e2b16 100644 --- a/modules +++ b/modules @@ -9,7 +9,7 @@ PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-23.05 -PACKAGES_PACKAGES_COMMIT=4689289706f7c1c4ff907e7a5bcade1f99c38a61 +PACKAGES_PACKAGES_COMMIT=030d96422ad81eac64ac73d6bec11c10263bb781 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-23.05 From 02b8c46390587207130209089f69c2683306886d Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Thu, 12 Dec 2024 18:59:09 +0100 Subject: [PATCH 3/3] modules: update routing 12b7112 batman-adv: Merge bugfixes from 2024.4 --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 10fe6e2b16..6b935b6d31 100644 --- a/modules +++ b/modules @@ -13,4 +13,4 @@ PACKAGES_PACKAGES_COMMIT=030d96422ad81eac64ac73d6bec11c10263bb781 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-23.05 -PACKAGES_ROUTING_COMMIT=67fb1bc0cbe1cf26748e83acb872513434bd0471 +PACKAGES_ROUTING_COMMIT=be6e1a44582451172fac68f241138936f80d7734