From 366fb0acee8bb2101c4f8c25fbade576603f51d6 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 1 Feb 2021 13:15:37 +0100 Subject: [PATCH 01/11] modules: update OpenWrt a7a207e18b mt76: update to the latest version 1ce5008597 wireguard: Fix compile with kernel 4.14.217 2ecb22dc51 kernel: bump 4.14 to 4.14.217 11f4918ebb dnsmasq: backport fixes 9999c87d3a netifd: fix IPv6 routing loop on point-to-point links 250dbb3a60 odhcp6c: fix IPv6 routing loop on point-to-point links d816c6cd31 kernel: bump 4.14 to 4.14.216 c21d59dc11 imagebuilder: pass IB=1 on checking requirements (cherry picked from commit 39c1f67236c0d65d0063e7b4d38952ff3d5b0541) --- modules | 2 +- ...mt7603-add-additional-EEPROM-chip-ID.patch | 46 ------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch diff --git a/modules b/modules index 55a6136a..6e621aae 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-19.07 -OPENWRT_COMMIT=6fc02f2a45e151ce16677d6131251af86ab4fc06 +OPENWRT_COMMIT=a7a207e18bf7fa04f265bb95cbe6fa91561fbfe8 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 diff --git a/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch b/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch deleted file mode 100644 index deac496d..00000000 --- a/patches/openwrt/0014-mt76-mt7603-add-additional-EEPROM-chip-ID.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: David Bauer -Date: Thu, 15 Oct 2020 22:42:54 +0200 -Subject: mt76: mt7603: add additional EEPROM chip ID - -Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are -shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a -possible valid ID. - -Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781 - -Suggested-by: Ron Asimi -Signed-off-by: David Bauer - -diff --git a/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..c749aa403f5940c19e5f580f461874b708b41f66 ---- /dev/null -+++ b/package/kernel/mt76/patches/002-mt76-mt7603-add-additional-EEPROM-chip-ID.patch -@@ -0,0 +1,27 @@ -+From 6b51340cdc32b1ba75163faaa8592feaeb4bddec Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Sat, 10 Oct 2020 00:36:02 +0200 -+Subject: [PATCH] mt76: mt7603: add additional EEPROM chip ID -+ -+Some newer MT7628 based routers (notably the TP-Link Archer C50 v4) are -+shipped with a chip-id of 0x7600 in the on-flash EEPROM. Add this as a -+possible valid ID. -+ -+Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2781 -+ -+Suggested-by: Ron Asimi -+Signed-off-by: David Bauer -+--- -+ mt7603/eeprom.c | 1 + -+ 1 file changed, 1 insertion(+) -+ -+--- a/mt7603/eeprom.c -++++ b/mt7603/eeprom.c -+@@ -136,6 +136,7 @@ static int mt7603_check_eeprom(struct mt -+ switch (val) { -+ case 0x7628: -+ case 0x7603: -++ case 0x7600: -+ return 0; -+ default: -+ return -EINVAL; From 10f585eda849f55ccbd7bdb0ccba6fcd0732055d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 15 Feb 2021 01:26:22 +0100 Subject: [PATCH 02/11] modules: update OpenWrt fec1aa6dfb mt76: update to the latest version 224fa47bf9 ramips: mark toggle input on EX6150 as a switch 3a05aa17db mac80211: Remove 357-mac80211-optimize-skb-resizing.patch 171d8bce0c ramips: remove factory image for TP-Link Archer C2 v1 2eb8444363 ath79: fix USB power GPIO for TP-Link TL-WR810N v1 d5a8e85878 wolfssl: Backport fix for CVE-2021-3336 cf5e5204d9 bcm63xx: sprom: override the PCI device ID 4465b44fc1 kernel: bump 4.14 to 4.14.219 4b9ade65ec bcm63xx: R5010UNv2: fix flash partitions for 16MB flash ab9cb390be hostapd: fix P2P group information processing vulnerability 1e90091c5d opkg: update to latest git HEAD of branch openwrt-19.07 312c05611b kernel: bump 4.14 to 4.14.218 3100649458 wolfssl: enable HAVE_SECRET_CALLBACK e9d2aa9dc6 wolfssl: Fix hostapd build with wolfssl 4.6.0 2044c01de8 wolfssl: Update to v4.6.0-stable 5ac0b2b431 mvebu: omnia: make initramfs image usable out of the box (cherry picked from commit 429223b99ff41da2905dcafd719c140fe867c51e) --- modules | 2 +- ...3-mt76-mt76x0-disable-GTK-offloading.patch | 49 ------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch diff --git a/modules b/modules index 6e621aae..c3d73bba 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-19.07 -OPENWRT_COMMIT=a7a207e18bf7fa04f265bb95cbe6fa91561fbfe8 +OPENWRT_COMMIT=fec1aa6dfbcea5fdcaa35ec441de6fdd750b4d1a PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 diff --git a/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch b/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch deleted file mode 100644 index c1f404c8..00000000 --- a/patches/openwrt/0013-mt76-mt76x0-disable-GTK-offloading.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: David Bauer -Date: Sat, 13 Jun 2020 19:19:17 +0200 -Subject: mt76: mt76x0: disable GTK offloading - -When the GTK is offloaded, MT7610 won't transmit any multicast frames. -This is most likely due to a bug in the offloading datapath. MT7612 is -not affected. - -Disable GTK offloading for now. It can be re-enabled once the bug in the -offloading path is fixed. - -Signed-off-by: David Bauer - -diff --git a/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..e7e19ac957dbfaa9510016d3387abe9eed353538 ---- /dev/null -+++ b/package/kernel/mt76/patches/001-mt76-mt76x0-disable-gtk-offloading.patch -@@ -0,0 +1,30 @@ -+From ae01717951013fbc8bb0315d902d5b9f5873631a Mon Sep 17 00:00:00 2001 -+From: David Bauer -+Date: Fri, 12 Jun 2020 01:09:57 +0200 -+Subject: [PATCH] mt76: mt76x0: disable GTK offloading -+ -+When the GTK is offloaded, MT7610 won't transmit any multicast frames. -+This is most likely due to a bug in the offloading datapath. MT7612 is -+not affected. -+ -+Disable GTK offloading for now. It can be re-enabled once the bug in the -+offloading path is fixed. -+ -+Signed-off-by: David Bauer -+--- -+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 ++++ -+ 1 file changed, 4 insertions(+) -+ -+--- a/mt76x02_util.c -++++ b/mt76x02_util.c -+@@ -432,6 +432,10 @@ int mt76x02_set_key(struct ieee80211_hw -+ !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) -+ return -EOPNOTSUPP; -+ -++ /* MT76x0 GTK offloading is currently broken */ -++ if (is_mt76x0(dev) && !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) -++ return -EOPNOTSUPP; -++ -+ /* -+ * In USB AP mode, broadcast/multicast frames are setup in beacon -+ * data registers and sent via HW beacons engine, they require to From 240614a70dbe6186ecb39db4fa26d6ed73056c1b Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Thu, 18 Feb 2021 17:44:38 +0100 Subject: [PATCH 03/11] modules: update OpenWrt 6aef4bc7c3 lantiq: fritz7320: enable USB power supply 6bf5bfc19f openssl: bump to 1.1.1j f44153038e OpenWrt v19.07.7: revert to branch defaults d5ae565873 OpenWrt v19.07.7: adjust config defaults c4a6851c72 kernel: bump 4.14 to 4.14.221 f8b849103d ramips: ethernet: Disable TSO support to improve stability (cherry picked from commit 6d3da664b084972f2ef38a0956bc66cd07d236ad) --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index c3d73bba..e151ca3c 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-19.07 -OPENWRT_COMMIT=fec1aa6dfbcea5fdcaa35ec441de6fdd750b4d1a +OPENWRT_COMMIT=6aef4bc7c396d19690ef989143d0bbcbb0fbdde1 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 From 7f836c33709d441b5204512ada193b0955f128d4 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Thu, 18 Feb 2021 17:49:32 +0100 Subject: [PATCH 04/11] modules: update OpenWrt routing packages e26b474 Merge pull request #644 from ecsv/batadv-for-19.07 369908c alfred: Start up alfred without valid interfaces 97e7600 alfred: Fix procd process handling for disable state 0a3432d Merge pull request #636 from ecsv/batadv-for-19.07 596dc84 batman-adv: Merge bugfixes from 2021.0 862a2df batctl: Merge bugfixes from 2021.0 (cherry picked from commit e511b3bcb44f5a5ef54a5c101fa0cb5117e3e485) --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index e151ca3c..522db35e 100644 --- a/modules +++ b/modules @@ -10,7 +10,7 @@ PACKAGES_PACKAGES_COMMIT=2974079d3db786fe5da00c10f1d80e79b0112093 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_BRANCH=openwrt-19.07 -PACKAGES_ROUTING_COMMIT=02b4dbfcb7b8f8b566940847d22d5a6f229d2e66 +PACKAGES_ROUTING_COMMIT=e26b4745209655976b7d124465b1dc53ade632f9 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c From 2304f5c481117088fee774e1d6074b664a825154 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 28 Feb 2021 12:21:19 +0100 Subject: [PATCH 05/11] ramips-mt7620: remove factory images for Archer C20 v1 Upstream removed the factory images for the Archer C20 v1 as they potentially brick the device. Remove them from Gluon to avoid build failures on the next OpenWrt 19.07 bump. Signed-off-by: David Bauer (cherry picked from commit 7d100bc4caaa9463e13f5280fb674a686b61a6e6) --- targets/ramips-mt7620 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620 index ff2e4529..ff90c0dc 100644 --- a/targets/ramips-mt7620 +++ b/targets/ramips-mt7620 @@ -42,7 +42,9 @@ device('tp-link-archer-c2-v1', 'tplink_c2-v1', { factory = false, }) -device('tp-link-archer-c20-v1', 'tplink_c20-v1') +device('tp-link-archer-c20-v1', 'tplink_c20-v1', { + factory = false, +}) device('tp-link-archer-c20i', 'ArcherC20i') From 1e9c3dea59a5bd322a443390db8cb81081651f3c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 7 Mar 2021 18:47:12 +0100 Subject: [PATCH 06/11] modules: update Gluon packages 3822f44013cc tunneldigger: remove unneeded kmod-l2tp-ip dependency 95c805c863cd tunneldigger: update to latest upstream (#238) (cherry picked from commit f68bad1171245b54abe326f55b3c55a641102b2d) --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 522db35e..cf96b176 100644 --- a/modules +++ b/modules @@ -13,4 +13,4 @@ PACKAGES_ROUTING_BRANCH=openwrt-19.07 PACKAGES_ROUTING_COMMIT=e26b4745209655976b7d124465b1dc53ade632f9 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c +PACKAGES_GLUON_COMMIT=3822f44013ccf60729d66c6143f554b6db2ccb63 From 8474fae2d025cac22fc86bb11a2e255c8f4cb22c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 7 Mar 2021 18:48:06 +0100 Subject: [PATCH 07/11] gluon-core: remove unneeded KERNEL_L2TP_IP config symbol No package uses l2tp_ip. (cherry picked from commit 2ecbe488bc9016ad6b9985e9ee11a63c6faae48b) --- package/gluon-core/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/gluon-core/Config.in b/package/gluon-core/Config.in index 7c3ba6fc..6550ec7e 100644 --- a/package/gluon-core/Config.in +++ b/package/gluon-core/Config.in @@ -24,16 +24,12 @@ config KERNEL_TUN config KERNEL_L2TP_V3 bool -config KERNEL_L2TP_IP - bool - config KERNEL_L2TP_ETH bool config KERNEL_L2TP bool select KERNEL_L2TP_V3 - select KERNEL_L2TP_IP select KERNEL_L2TP_ETH From 28c5890a8399c720fab064acaaea675241a076e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 02:47:25 +0200 Subject: [PATCH 08/11] modules: update OpenWrt 81266d9001 openssl: bump to 1.1.1k 6165bb0d60 openssl: sync package download URLs with master c336db7a78 mbedtls: update to 2.16.10 616fff2a94 mwlwifi: add PKG_FLAGS:=nonshared dce6b118eb scripts: bundle-libraries.sh: fix broken SDK compiler afdd5dcd0d build: reduce number of files passed to ipk-remove 1fcd833c9a build: call ipkg-remove using xargs if #args>=512 33df82be36 build: package-ipkg: avoid calling wildcard twice 3402334413 kernel: bump 4.14 to 4.14.224 55e9d87754 kernel: bump 4.14 to 4.14.223 c64742a96e wolfssl: bump to v4.7.0-stable 4b19b2db78 hostapd: P2P: Fix a corner case in peer addition based on PD Request 0a08a9a2b4 build: fix checks for GCC11 a5672f6b96 Revert "base-files: source functions.sh in /lib/functions/system.sh" b4a4d04b91 kernel: bump 4.14 to 4.14.222 86aeac4fc9 base-files: source functions.sh in /lib/functions/system.sh e9c0c5021c hostapd: backport ignoring 4addr mode enabling error a36d2ee310 ramips: remove factory image for TP-Link Archer C20 v1 Fixes: CVE-2021-3450, CVE-2021-3449, CVE-2021-3336, CVE-2021-27803 (cherry picked from commit 87209b9f418ad862ceee4ba276c28c8a482c75b6) --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index cf96b176..2fc099a9 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-19.07 -OPENWRT_COMMIT=6aef4bc7c396d19690ef989143d0bbcbb0fbdde1 +OPENWRT_COMMIT=81266d900104d657275aa5df3fb7629f7892c57a PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 From ef3b7fe6bddda4c1cc38753aafb3eeadfcd4c147 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 02:49:29 +0200 Subject: [PATCH 09/11] modules: update packages fdd4afe6a adblock: fix init status command 5a8a7aeab libreswan: update cu 3.32 7af60cc3e libftdi1: Improve build binary reproducibility aa3e95ac6 https-dns-proxy: bugfix: correct PROCD firewall object abb3c7ede mariadb: update to version 10.2.37 cb6509e88 gnutls: patch security issue 41388ed8a php: add fix for updated ICU 68+ 353063521 https-dns-proxy: support for additional Force DNS ports 44b301125 bind: update to version 9.16.13 612fbeb58 nnn: update to version 3.4 1952a1c2a python-aiohttp: backport fix for CVE-2021-21330 13ab7af3f icu: update to 68.2 2120a3cf5 icu: update to 68.1 10712797f icu: fix compilation under CentOS 7 79ddd0328 icu: update to 67.1 227597c97 haproxy: Update HAProxy to v2.0.21 a8a405928 tmate: add new package 01ab015a9 msgpack-c: add new package 97beb7d36 minidlna: update to 1.3.0 0494d8706 tor: update to version 0.4.4.8 40d56e46b mwan3: remove mwan3 ubus call on mwan3 iface hotplug ACTION b66d262d7 net/mosquitto: bump to 1.6.14 e573dac5f CI: backport GitHub action CI 81fa8cf89 nextdns: Update to version 1.11.0 af02206e2 vpn-policy-routing: better processing of custom user files 5c58de5e6 libpam: update to 1.5.1 86a70892d libpam: update to 1.5.0 ef17e4a30 libpam: update to 1.4.0 85d122fdc nano: update to 5.6.1 a6a27c904 ninja: update to 1.10.2 b4adde587 ninja: fix typo 7fd680224 ninja: use for CMake 1299b07ee ninja: update to 1.10.1 86bb11e97 vpn-policy-routing: update to 0.3.2-18 2faeeb18e python-maho-mqtt: bump to versio 1.5.1 5c95dda73 unbound: update to 1.13.1 3abe9d0ae vpn-policy-routing: bugfix: netflix user file missing redirect 904d911c5 vpn-policy-routing: update user netflix file 2666b3d00 nano: update to version 5.6 7d26130b3 vpn-policy-routing: custom user scripts improvements 7d9d8616c libedit: update to version 20210216-3.1 ca01f389d libedit: update to version 20193112-3.1 855023214 adblock: update blocklist sources 39f3941cd knot: update to version 3.0.4 1662ca26b knot: update to 3.0.3 9389a5dd1 knot: disable embedded xdp 7619ff0df knot: update to 3.0.2 5ddcc2e05 knot: disable libnghttp2 autodetection fb103be86 knot: update to version 3.0.1 523011bf4 screen: backport fix for CVE-2021-26937 8e1b62d4b openvswitch: update to version 2.11.6 (security fix) 5e24f6db6 vpn-policy-routing: update to version 0.3 0d0e4b96b netdata: update to version 1.29.2 2980cb8db netdata: update to version 1.29.1 f05ba1bbc python3: Update to 3.7.10, refresh patches 7be89f1f3 zerotier: bump to 1.6.4 fcf72948a bind: bump to 9.16.12 feb1a188e ksmbd: remove kmod-crypto-arc4 dependency 2f7026e65 htop: update to 3.0.5-1 ad186135a python-paho-mqtt: Update to version 1.5.0 3f0dbcdae isc-dhcp: seeing crashes when attempting to update dynamic dns 95fa96bda ttyd: force enable authentication for login 1a4184c07 https-dns-proxy: support for force DNS/DNS hijacking b1fec2b7b mosquitto: bump to 1.6.13 5954e5695 getdns: disable static linking of getdns utilities db69f0b57 zerotier: update to 1.6.3 1cec6bcfa getdns: Fix TLS V1.3 Ciphersuites option in Stubby d7b42dcaa getdns: fix compilation without deprecated OpenSSL APIs 798c3ba3f keepalived: fix config typo d41a0b75a keepalived: add script security param to fix warning dbc66a08f ksmbd: update to 3.3.4 86c880712 ksmbd-tools: update to 3.3.4 dee2e818b keepalived: set default run directory for pid file on build cf7969564 simple-adblock: remove dependency on jsonfilter & old code bee91a9d8 sudo: backport patches for CVE-2021-3156 46d327a59 samba4: fix for #13758 e8d15424b nextdns: Update to version 1.10.1 11e9a2e17 php7: Fix prepare target incorrectly referencing 'configure.in' instead of 'configure.ac' aae5144e7 msmtp: update to version 1.8.14 8e54decfa youtube-dl: update to version 2021.1.16 3b582ebd3 youtube-dl: update to version 2020.12.7 46253b17d https-dns-proxy: bugfix: high CPU utilization cc38c62ad openwisp-config: update to version 0.5.0 50725c4c8 Revert "libzip: update to 1.7.3" d8f0ebaa3 libzip: update to 1.7.3 9a0a7f928 libzip: update to 1.7.1 (closes #12512) 5fc922043 libzip: update to 1.6.1 9174036e4 libzip: update to 1.6.0 92f095b21 libzip: fix musl-fts failure a0d9d76b2 libzip: add package 93d3bfd08 nano: update to 5.5 1224d6c21 idevicerestore: update to 1.0.0 9cfae98a7 idevicerestore: update to 2020-04-20 23f85f8fa idevicerestore: update to 2020-02-17 cb2d40346 idevicerestore: Update to 2019-12-26 202469750 idevicerestore: Add package 646461e2b libirecovery: update to official tarball 4f3b1aa38 libirecovery: fix version e871dcf6b libirecovery: Update to 1.0.0 4175b8074 libirecovery: Add package 7707d2d78 haproxy: Update HAProxy to v2.0.20 8cc7aef3c nextdns: Update to version 1.9.6 67a324b5e syslog-ng: update to version 3.30.1 9e29bd4de https-dns-proxy: update to 2020-11-25: add HTTP auth and DSCP codepoint support 6d2ea90c3 haveged: update to 1.9.14 64b8dade4 usbmuxd: update to 1.1.1 42f227066 usbmuxd: enable systemd support 13485a4e5 usbmuxd: Update to 2020-01-20 c5aae4a76 usbmuxd: Update to latest master 0d0820d43 usbmuxd: Update to latest git version 46ecb7d58 imobiledevice: backport iOS 14 backup patch. c71f4a82e libimobiledevice: update to 1.3.0 2ca8db427 libimobiledevice: update to 2020-02-19 2e2775dbc libimobiledevice: Update to 2020-01-20 cbda7d908 libimobiledevice: Update to latest master f988eff7a libimobiledevice: Update to 2019-11-29 b856f627b libusbmuxd: update to 2.0.2 d59f1c90d libusbmuxd: Several fixes a17c2aec3 libusbmuxd: Update to 2.0.1 5fc564827 libplist: add missing pkgconfig files in libplist 2.2 7660f6fa2 libplist: update to 2.2.0 8c28123e7 libplist: Several fixes a60434422 libplist: Update to 2.1.0 3645d2876 libplist: Switch to normal releases cafbae712 php7: drop patch for openssl deprecated API (fixes #14357) 4d1e525fc netdata: update to version 1.28.0 0563feebc adblock: backport fixes 40c1005f2 htop: update to 3.0.4-1 6bd3f5c37 mwan3: use ping -I for ipv6 after tunnel kernel fix 2a7bbad22 noddos: remove 182264c5b ulogd: Add back autoreconf 6106d1f28 ulogd2: Build IPFIX module c8730e951 ulogd2: Backport upstream patches 5845691cb net: ulogd2: add myself as maintainer df1c29679 nut: fix _ handling e04535e99 qemu: bump PKG_RELEASE 3eb2e140e simple-adblock: config update dc529c8cd wsdd2: update to git 2020-11-19 adb214338 samba4: update to 4.11.17 304888a37 htop: update to 3.0.3-1 0266f31c9 htop: update to 3.0.2-1 391267fc9 qemu: add patch for qga guest-shutdown command 4626c3bd6 utils/lcd4linux: fix package source dc015ffe2 simple-adblock: bugfix - config update 9ca6bdaa0 https-dns-proxy: update binary to 2020-08-21 13d999882 zerotier: add patch to avoid including sys/auxv.h 061f81ff6 miniupnpd: Don't override ipv6_listening_ip (cherry picked from commit 272e30fda688481ee95143b18f23c0c8ae9e89e0) --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 2fc099a9..ace18c30 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=81266d900104d657275aa5df3fb7629f7892c57a PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 -PACKAGES_PACKAGES_COMMIT=2974079d3db786fe5da00c10f1d80e79b0112093 +PACKAGES_PACKAGES_COMMIT=fdd4afe6ac0c05ba2b25d28700809841aeda643d PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_BRANCH=openwrt-19.07 From b31a57f060858ce3ddca4b1c367d8e5a3ae6bcb4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 01:00:01 +0200 Subject: [PATCH 10/11] contrib/actions: drop version pin on libncurses-dev Fixes unmet dependencies: The following packages have unmet dependencies: libncurses5-dev : Depends: libtinfo5 (= 6.1-1ubuntu1.18.04) but 6.2-0ubuntu2 is to be installed Depends: libncurses5 (= 6.1-1ubuntu1.18.04) but 6.2-0ubuntu2 is to be installed Depends: libtinfo-dev (= 6.1-1ubuntu1.18.04) python : PreDepends: python-minimal (= 2.7.15~rc1-1) but it is not going to be installed Depends: libpython-stdlib (= 2.7.15~rc1-1) but it is not going to be installed E: Unable to correct problems, you have held broken packages. Switch to apt-get, because it has a stable API. Same as ca7a8ff52. --- contrib/actions/install-dependencies.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh index 60e4a9ee..ccf365b9 100755 --- a/contrib/actions/install-dependencies.sh +++ b/contrib/actions/install-dependencies.sh @@ -4,7 +4,7 @@ set -e cp contrib/actions/sources.list /etc/apt/sources.list rm -rf /etc/apt/sources.list.d -apt update -apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time -apt clean +apt-get update +apt-get install git subversion build-essential python gawk unzip libncurses-dev zlib1g-dev libssl-dev wget time +apt-get clean rm -rf /var/lib/apt/lists/* From 1552a15dbe5091267137879a512366fa2a2039c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 04:11:04 +0200 Subject: [PATCH 11/11] contrib/actions: drop custom sources.list (cherry picked from commit 394bc8e6bdf4ae27a8fca3316db483fda5785075) --- contrib/actions/install-dependencies.sh | 2 -- contrib/actions/sources.list | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 contrib/actions/sources.list diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh index ccf365b9..5de21c2f 100755 --- a/contrib/actions/install-dependencies.sh +++ b/contrib/actions/install-dependencies.sh @@ -2,8 +2,6 @@ set -e -cp contrib/actions/sources.list /etc/apt/sources.list -rm -rf /etc/apt/sources.list.d apt-get update apt-get install git subversion build-essential python gawk unzip libncurses-dev zlib1g-dev libssl-dev wget time apt-get clean diff --git a/contrib/actions/sources.list b/contrib/actions/sources.list deleted file mode 100644 index 64c6aae7..00000000 --- a/contrib/actions/sources.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://mirror.netcologne.de/ubuntu/ bionic main restricted -deb http://mirror.netcologne.de/ubuntu/ bionic-updates main restricted