From 6dc5a4735b47e204986fa29fd3d3d7d2e95ae193 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 24 Mar 2023 16:17:05 +0100 Subject: [PATCH 1/3] modules: update openwrt 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 +- ...t7621-make-DSA-images-swconfig-upgradable.patch | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules b/modules index 21d18329..a97d496d 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=f5db04e8ea8377046a86885fdd5a83e948b54918 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 12c0e60a..d8fcb579 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,7 +3,7 @@ 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..982ca6b9196853df2ab5070c26f175ade6567eaa 100644 +index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f33966503c 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -179,7 +179,6 @@ endef @@ -14,7 +14,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U DEVICE_ALT0_VENDOR := ASUS -@@ -1233,7 +1232,6 @@ endef +@@ -1246,7 +1245,6 @@ endef TARGET_DEVICES += mts_wg430223 define Device/netgear_ex6150 @@ -22,7 +22,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad $(Device/uimage-lzma-loader) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 -@@ -1246,7 +1244,6 @@ endef +@@ -1259,7 +1257,6 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand @@ -30,7 +30,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad $(Device/uimage-lzma-loader) BLOCKSIZE := 128k PAGESIZE := 2048 -@@ -1429,7 +1426,6 @@ endef +@@ -1442,7 +1439,6 @@ endef TARGET_DEVICES += netgear_wax202 define Device/netgear_wndr3700-v5 @@ -38,7 +38,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad $(Device/netgear_sercomm_nor) $(Device/uimage-lzma-loader) IMAGE_SIZE := 15232k -@@ -1754,7 +1750,6 @@ endef +@@ -1779,7 +1775,6 @@ endef TARGET_DEVICES += tplink_tl-wpa8631p-v3 define Device/ubnt_edgerouter_common @@ -46,7 +46,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad $(Device/uimage-lzma-loader) DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k -@@ -2170,7 +2165,6 @@ endef +@@ -2195,7 +2190,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m @@ -54,7 +54,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink -@@ -2183,7 +2177,6 @@ endef +@@ -2208,7 +2202,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m From 63a3921acd65d134fda1d8a6fe3dff986e67ed68 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 24 Mar 2023 16:17:21 +0100 Subject: [PATCH 2/3] modules: update packages 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 3ea3a0657 haproxy: update to v2.4.22 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 a97d496d..901086c3 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=f5db04e8ea8377046a86885fdd5a83e948b54918 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=f06652bc117bb5af42db5f87fe5371a071a38064 +PACKAGES_PACKAGES_COMMIT=0d566071c90f7c1088fdc09360dc4216bef6765e PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 From 44e79fc5c9f69afd3647ea56d575e2b0c7f712b1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 24 Mar 2023 16:17:23 +0100 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 901086c3..a870faa2 100644 --- a/modules +++ b/modules @@ -10,7 +10,7 @@ PACKAGES_PACKAGES_COMMIT=0d566071c90f7c1088fdc09360dc4216bef6765e 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