From 94731839c8ccea494e996d8548c32ddf48a0a5b3 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 31 Mar 2023 13:59:26 +0200 Subject: [PATCH 1/3] modules: update openwrt c2331038b2 kernel: remove obsolete netfilter tcp window size check bypass patch 4ae854d055 mac80211, mt76: add fixes for recently discovered security issues b573a785e0 ncm: add error check and retry mechanism for gcom call f61c5cf76b kernel: bump 5.10 to 5.10.176 a4212b77c0 kernel: bump 5.10 to 5.10.175 6b19d24254 kernel: bump 5.10 to 5.10.174 24d84a13a4 kernel: bump 5.10 to 5.10.173 36bf158b47 kernel: tcindex classifier has been retired 999cb9574f x86: fix deprecated CONFIG_MICROCODE_OLD_INTERACE a88c65507d kernel: bump 5.10 to 5.10.172 cb91aa4b29 kernel: bump 5.10 to 5.10.170 26cc831e44 kernel: bump 5.10 to 5.10.169 28e5045f3a bcm4908: include usbport trigger 836e3d1e5e bcm4908: backport v6.4 pending DTS changes b7c031d933 ipq40xx: Linksys MR8300: fix the USB port power 0170bc1af1 ramips: mt7621: enable lzma-loader for AFOUNDRY EW1200 96e3fee7ad ramips: fix 5g mac for TOTOLINK X5000R f5db04e8ea ramips: add support for Mercusys MR70X c58959dc45 firmware-utils: tplink-safeloader: add Mercusys MR70X c1bfb704b1 ramips: fix Archer AX23 WiFi MAC address conflict 3c6692ba03 ramips: add support for TP-Link Archer AX23 v1 a507243bfe firmware-utils: tplink-safeloader: add TP-Link Archer AX23 v1 788a0cf15c mpc85xx: add support for Watchguard Firebox T10 --- modules | 2 +- ...1-make-DSA-images-swconfig-upgradable.patch | 18 +++++++++--------- ...-wake-up-calls-Android-bug-workaround.patch | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules b/modules index 32252cc6..330ccde4 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-22.03 -OPENWRT_COMMIT=0a32f66fea95cabc5d21c945678d918bed8cca47 +OPENWRT_COMMIT=c2331038b2577cfeb6d34b3b6a812c6c1cf7ba5f PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch index 184dcc1a..b1a27bce 100644 --- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch +++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch @@ -3,10 +3,10 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200 Subject: ramips-mt7621: make DSA images swconfig upgradable diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk -index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba5b8d4d22 100644 +index 1fb806043460895182159504f48708ae717379cb..3c26f75b9a1cbc397154b3eef4b29ec7d3d7f0db 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk -@@ -179,7 +179,6 @@ endef +@@ -180,7 +180,6 @@ endef TARGET_DEVICES += asiarf_ap7621-nv1 define Device/asus_rt-ac57u @@ -14,7 +14,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U DEVICE_ALT0_VENDOR := ASUS -@@ -426,7 +425,6 @@ endef +@@ -427,7 +426,6 @@ endef TARGET_DEVICES += dlink_dir-853-r1 define Device/dlink_dir-860l-b1 @@ -22,7 +22,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/seama-lzma-loader) SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb IMAGE_SIZE := 16064k -@@ -1233,7 +1231,6 @@ endef +@@ -1247,7 +1245,6 @@ endef TARGET_DEVICES += mts_wg430223 define Device/netgear_ex6150 @@ -30,7 +30,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/uimage-lzma-loader) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 -@@ -1246,7 +1243,6 @@ endef +@@ -1260,7 +1257,6 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand @@ -38,7 +38,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/uimage-lzma-loader) BLOCKSIZE := 128k PAGESIZE := 2048 -@@ -1429,7 +1425,6 @@ endef +@@ -1443,7 +1439,6 @@ endef TARGET_DEVICES += netgear_wax202 define Device/netgear_wndr3700-v5 @@ -46,7 +46,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/netgear_sercomm_nor) $(Device/uimage-lzma-loader) IMAGE_SIZE := 15232k -@@ -1754,7 +1749,6 @@ endef +@@ -1780,7 +1775,6 @@ endef TARGET_DEVICES += tplink_tl-wpa8631p-v3 define Device/ubnt_edgerouter_common @@ -54,7 +54,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/uimage-lzma-loader) DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k -@@ -2170,7 +2164,6 @@ endef +@@ -2196,7 +2190,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m @@ -62,7 +62,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink -@@ -2183,7 +2176,6 @@ endef +@@ -2209,7 +2202,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m diff --git a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch index 987050ac..ec9641c0 100644 --- a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch +++ b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch @@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047 + + int system_bridge_addif(struct device *bridge, struct device *dev) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 -index 4a17e635b2b4ff62e362c1815723aeaf30b1b443..9b11be8fcd59836a0c6351babae78343658a80f2 100644 +index a348d4821ecef796c8c2b983a969b7becb7ae334..dad7baabe69f53ca9afeff8e9392397dd9dc35aa 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -738,6 +738,7 @@ CONFIG_BRIDGE=y From 508dec4d893ff865e83fff20aa1ab8ee951026e0 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 31 Mar 2023 13:59:39 +0200 Subject: [PATCH 2/3] modules: update packages 391e18067 banip: update to 0.8.2-6 9748c394d banip: update to 0.8.2-5 5ae16a7a6 yq: Update to 4.33.1 e9b65e5d7 dnsproxy: Update to 0.48.2 7894fd057 dnsproxy: Update to 0.48.1 8a8c51a92 dnsproxy: Update to 0.48.0 b2c3f2d13 natmap: update to 20230322 7852691b8 banip: update to 0.8.2-4 9fb40dbb8 banip: update to 0.8.2-3 33431b63b sqlite3: Update to 3.41.1 0d566071c adblock: update to 4.1.5-7 05262f346 yq: Update to 4.32.2 245d3479c cloudflared: Update to 2023.3.1 bf9bafd2c v2raya: Update to 2.0.4 66816f0f6 banip: push 0.8.2-2 to stable branch 07e032ee1 v2ray-geodata: Update to latest version 869e5573c xray-core: Update to 1.8.0 b13728e6a strongswan: add fix for CVE-2022-40617 eb4966e54 golang: Update to 1.19.7 b1f684f01 miniupnpd: bump to 2.3.3 1f1bfff84 php8: update to 8.1.16 fe75545e6 gphoto2: fix compilation with BUILD_NLS 19347485a mv88e6xxx_dump: update to 2023.03.08 ae7dd67aa simple-adblock: update init file and config 4ee651287 crowdsec: update to 1.4.6 Update crowdsec to latest upstream release version 1.4.6 6c78413ed frp: update to 0.48.0 4ab4523f7 frp: update to 0.47.0 90749ee59 v2raya: switch to use nftables 70bfe06bb perl-ack: Update to 3.7.0 b53d4f03f v2ray-core: Update to 5.4.0 acddc2050 crowdsec-firewall-bouncer: update to 0.0.25 3c59f514b yt-dlp: update to 2023.3.4 3e3650bc9 curl: add lang/perl-www-curl/patches/230-curl_7.88_compat.patch 009b2d005 curl: update to 7.88.1 --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 330ccde4..7e698c4f 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=c2331038b2577cfeb6d34b3b6a812c6c1cf7ba5f PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=3ea3a0657775d5eceecf2c8ea847dbe00ecb5870 +PACKAGES_PACKAGES_COMMIT=391e18067e486017ba2feea69a4e430721c8b963 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 From 21b3b46a41c33ba18a90e3a7b43ead94b8dc5a49 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 31 Mar 2023 13:59:41 +0200 Subject: [PATCH 3/3] modules: update routing b8e0831 bird1: fix "Form token mismatch" errors in luci-app-bird1-ipv{4,6} 3d7df59 bird1: rename get_bool() to get_a_bool() in bird{4,6}-lib.sh 4e0e702 bird1-openwrt: fix Makefile issues 58a4a00 bird1-openwrt: use a single Makefile for IPv4 and IPv6 packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 7e698c4f..3215a7b6 100644 --- a/modules +++ b/modules @@ -10,7 +10,7 @@ PACKAGES_PACKAGES_COMMIT=391e18067e486017ba2feea69a4e430721c8b963 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 -PACKAGES_ROUTING_COMMIT=cc1dd763e08cc03926883a8943212f7edf2bf2ce +PACKAGES_ROUTING_COMMIT=1cc7676b9f32acc30ec47f15fcb70380d5d6ef01 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff