From 650f1a0baeb6fcb859b84196c34da6c84c479fe1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 7 Jul 2022 12:48:58 +0200 Subject: [PATCH 1/5] modules: update openwrt f854de6ada OpenWrt v22.03.0-rc5: revert to branch defaults 0345c613ba OpenWrt v22.03.0-rc5: adjust config defaults bfd070e7fa kernel: Add missing mediatek configuration options 5c7aed8b1e openssl: bump to 1.1.1p 6b78bf1fd8 mediatek: mt7622: fix white dome LED of UniFi 6 LR 5a82803c76 mvebu: cortexa72: fix ImageBuilder for IEI Puzzle devices fa56db5ccc uboot-mediatek: update UniFi 6 LR board name d302839b65 mediatek: add Ubiquiti UniFi 6 LR v2 targets d815e1f67c mediatek: new target ubnt_unifi-6-lr-v1-ubootmod 8f0d8869d5 mediatek: new target mt7622-ubnt-unifi-6-lr-v1 1d96f6863e mediatek: build ubnt-ledbar as a module 2bea35cb55 mediatek: remove crypto-hw-mtk package 5a81e00063 mediatek: mt7622: fix banana pi r64 wps button e459a87eaf mediatek/mt7629: Activate CONFIG_ARM_ARCH_TIMER_EVTSTREAM fcd62930f7 mt76: update to the latest version ee67afeda9 kernel: Refresh patches for all targets 32e9095662 mt76: update to the latest version a3946a7cd1 mac80211: fix mesh queue selection issue 158a5af801 ramips: improve YunCore AX820 LEDs 6b44a6e731 kernel: bump 5.10 to 5.10.127 66da295f5a kernel: bump 5.10 to 5.10.126 7d6b8f5bdf qoriq: enable Book-E Watchdog Timer 85b5bad5a1 ipq40xx: cut ath10k board file for mikrotik subtarget 973ff0b8e8 ipq40xx: mikrotik: dont include ath10k-board-qca4019 by default 3e38bd1353 ipq-wifi: remove packaged BDF-s for MikroTik devices 80602d472a ipq40xx: mikrotik: provide BDF-s on demand 02cfd1f5a8 mac80211: ath10k: backport bus and device specific API 1 BDF selection 52a64755fc ath10k-ct: update to 2022-05-13 1edf306b31 firewall4: bump to git HEAD e222660bc8 qoriq: enable HARDENED_USERCOPY 9296d8970a qoriq: disable CONFIG_COMPAT c9448285f1 qoriq: 02_network fix sweth globbing logic 04091ffd68 qoriq: define reset button for Firebox M300 c7673625d9 qoriq: define leds for Firebox M300 d6a06e1d18 ath79: add support for RouterBOARD mAP 344ecf433a ipq40xx: mikrotik: make RouterBoot partition writeable fbbc127f42 ath79: mikrotik: add rw soft_config to extra devices 993b70a429 kernel: fix variable erasesize patch 656036a534 x86: 64: Add kmod-igc to default packages fb3b927643 iptables: default to ip(6)tables-nft e4caacc887 kernel: add missing symbol to 5.10 config 7c240ee279 qoriq: use FIT uImage for Firebox M300 kernel 88101fa239 qoriq: use KERNEL_SUFFIX in Build/sdcard-img 2b8021d614 kernel: bump 5.10 to 5.10.125 f2f03545d4 kernel: bump 5.10 to 5.10.124 50db012243 kernel: bump 5.10 to 5.10.123 4faf889e7e kernel: bump 5.10 to 5.10.122 81530d69ef kernel: bump 5.10 to 5.10.121 d8d8b82c59 dropbear: cherry-pick upstream commit 544f28a0 f91b0d7a92 wolfssl: disable AES-NI by default for x86_64 2b392383e6 x86: fix damaged config 5.10 refresh 9c609080b0 generic: enable CRYPTO_LIB_BLAKE2S[_X86|_ARM] 63b4881fcb include/prereq-build.mk: macOS cross build improvements d989124c02 broadcom-wl: Fix compilation with kernel 5.10 d8f8c78d96 464xlat: delete SNATed conntracks on interface teardown 049093b9fd mediatek: UniFi 6 LR: disable RTC d65ad3efa5 ramips: decrease SPI frequency for Phicomm K2P 267f86a7b2 wireless-regdb: bump to 2022.06.06 7e223a89a1 prereq-build: add additional git detection 08e1812900 mac80211: increase airtime scheduler quantum aab535d2bb mac80211: add airtime fairness improvements --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 5c3c3b05..0f36666e 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=a4390ea283893fd3166bf660c32f263a6501d5b5 +OPENWRT_COMMIT=f854de6adaba7671f223b436b53244097589cf86 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 From 88b2f240a2979a880b6e13e8ebadf67bb7467bd9 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 7 Jul 2022 12:49:05 +0200 Subject: [PATCH 2/5] modules: update packages 1123b9dae travelmate: update 2.0.9 a686f7975 xtables-addons: update to 3.21 d50620e22 xtables-addons: update to 3.20 9b1569377 xtables-addons: add PKG_LICENSE_FILES and use SPDX 1c4e8a14e xtables-addons: fix various warning in lua patch 4a5633b6b xtables-addons: update to 3.19 736996ecb Revert "gcc: update 11 minor version" d45c8f4c0 collectd: Fix various issues with lantiq dsl metrics. 6e49bec96 unbound: update to 1.16.0 f93755c93 yt-dlp: add package e846059b1 youtube-dl: drop package ed2234c1e glib2: replace intl patch with upstream solution 45f10a3be glib2: update libintl handling 19d957cfc glib2: update to 2.70.5 e1598040f openwisp-monitoring: added 0.1.1 dcc80b42c openwisp-config: update to 1.0.1 95acc51cd yq: Update to 4.25.3 3743870bc acme: switch from iptables to nft d845c3dc3 travelmate: update 2.0.8-3 5651f6a3e gcc: update 11 minor version d713c4b4d gcc: depend on libzstd e32d33a2a gcc: update to allow compiling different versions 90e5bfd4f gcc: change maintainer --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 0f36666e..31a97e37 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=f854de6adaba7671f223b436b53244097589cf86 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=4c4ac1b583fac788b2f19d93ee3da05846fbfeb2 +PACKAGES_PACKAGES_COMMIT=1123b9dae320ca172b47ad31acabab4f76e5bfd6 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 From 317fd910809866406062f77aa10fc4c691fadc65 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 7 Jul 2022 12:49:06 +0200 Subject: [PATCH 3/5] modules: update routing 69afa34 bird2: bump to version 2.0.10 --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 31a97e37..9ceff1ac 100644 --- a/modules +++ b/modules @@ -10,7 +10,7 @@ PACKAGES_PACKAGES_COMMIT=1123b9dae320ca172b47ad31acabab4f76e5bfd6 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 -PACKAGES_ROUTING_COMMIT=173576829bc19b66d46667b8b270b6adcddd4119 +PACKAGES_ROUTING_COMMIT=1ccc4e435175e6ba5ac60e626e1e95eb25c5757b PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff From a9fff111bd1bb331d9c6feb1dd0274bf40bfd52d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 7 Jul 2022 19:06:14 +0200 Subject: [PATCH 4/5] treewide: rename ip6tables-legacy The ip6tables-legacy metapackage was renamed to ip6ables-zz-legacy. --- package/gluon-iptables-clamp-mss-to-pmtu/Makefile | 2 +- package/gluon-mesh-vpn-core/Makefile | 2 +- targets/generic | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile index 20379e0a..d5d91443 100644 --- a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile +++ b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile @@ -6,7 +6,7 @@ include ../gluon.mk define Package/$(PKG_NAME) TITLE:=This will establish a firewall rule to clamp the mss to pmtu on the mesh-vpn interface when the connection is towards 64:ff9b::/96 - DEPENDS:= +ip6tables-legacy + DEPENDS:= +ip6tables-zz-legacy endef define Package/$(PKG_NAME)/description diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile index 9525f110..2111c7ce 100644 --- a/package/gluon-mesh-vpn-core/Makefile +++ b/package/gluon-mesh-vpn-core/Makefile @@ -6,7 +6,7 @@ include ../gluon.mk define Package/gluon-mesh-vpn-core TITLE:=Basic support for connecting meshes via VPN tunnels - DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-legacy +iptables-mod-extra +simple-tc + DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-zz-legacy +iptables-mod-extra +simple-tc USERID:=:gluon-mesh-vpn=800 endef diff --git a/targets/generic b/targets/generic index 7e8c17f2..1cb8b5e4 100644 --- a/targets/generic +++ b/targets/generic @@ -94,5 +94,5 @@ packages { '-wpad-basic-wolfssl', '-firewall4', 'gluon-core', - 'ip6tables-legacy', + 'ip6tables-zz-legacy', } From 842df426bfc6b0e51594a15f0ba8b4c4cdccd177 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 7 Jul 2022 21:40:02 +0200 Subject: [PATCH 5/5] ramips-mt7622: rename Ubiquiti UniFi 6 LR The Ubiquiti UniFi 6 LR now has a v2 with a different LED setup, thus the previous model was added a v1 suffix. Signed-off-by: David Bauer --- targets/mediatek-mt7622 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/mediatek-mt7622 b/targets/mediatek-mt7622 index 5868d9c9..8376c397 100644 --- a/targets/mediatek-mt7622 +++ b/targets/mediatek-mt7622 @@ -6,8 +6,9 @@ device('linksys-e8450-ubi', 'linksys_e8450-ubi', { }) -device('ubiquiti-unifi-6-lr', 'ubnt_unifi-6-lr', { +device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', { factory = false, + manifest_aliases = {'ubiquiti-unifi-6-lr'}, }) -- Xiaomi