From 12f2d8bc9490cd5e7ec9bfaec1a1b53ef2640b37 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sun, 24 Sep 2023 19:01:59 +0200 Subject: [PATCH 1/3] modules: update openwrt 9349302bca ccache: add missing \ 912eded06c openssl: update to 3.0.11 2d812f0b72 procd: create /dev/fd symlink 4c2f44c859 wireless-regdb: update to 2023.09.01 06ff4dd562 mvebu: cortexa72: enable USB PHY 457a12a834 ipq40xx: ZTE MF287 series: move to gpio-export for modem-reset GPIO a684b512e5 ipq40xx: refactor ZTE MF287 series 2f30dec3cb hostapd: fix patch rebase after a crash fix fe1028e89c hostapd: fix wpa_supplicant bringup with non-nl80211 drivers 43e9cded06 mpc85xx: correct WS-AP3715i eth LED assignment eda1545e6e hostapd: add missing NULL pointer check in uc_hostapd_iface_stop 6019945e96 hostapd: fix a crash when disabling an interface during channel list update 83bf45ea5c package: base-files: turn error into warning 829196e1b1 netifd: update to the latest version 09b9d732ec hostapd: use phy name for hostapd interfaces instead of first-bss ifname 8b385a45a6 mac80211: fix AP reconfiguration on DFS channels in non-ETSI regdomain 0d1859c258 netifd: update to the latest version 5e3f86a101 hostapd: select libopenssl-legacy for openssl variants 90d5961751 hostapd: remove eap-eap192 auth type value 6e09f88d29 netifd: update to the latest version 6798f156f9 hostapd: support eap-eap2 and eap2 auth_type values 98d0ee9dbf hostapd: fix FILS key mgmt type for WPA3 Enterprise 192 bit a701e6e1c2 netifd: update to the latest version 9720b094ae hostapd: backport from master, including ucode based reload support 263583dc1e ubus: update to the latest version 9af2ad5111 ucode: update to the latest version 7e55f20c1f kernel: backport support for renaming netdevs while up 385a50f02d ipq40xx: fix image building for ZTE MF287 series 2dc284a79a ramips: RT1800: fix invalid octal number error c3be832427 ath79: fix packetloss on some WLR-7100 d536f398eb kernel: ensure VFIO related suboptions are disabled 3c8825e5f8 kernel: enable vfio and vfio-pci for armsr-armv8 c79854e9fc kernel: vfio: remove unneeded enable_unsafe_noiommu_mode parameter c90005c58a x86: remove built-in vhost-net driver 5edeb1ee0c kernel: add vhost-net module 6897270491 mvebu: add reset delays of PHYs for Fortinet FortiGate 50E 10aee60361 ipq806x: Correct OnHub sysupgrade config logic 6c60bbbc94 x86: geode: fix hwrng register accesses 6577b550df base-files: sysupgrade: Add 2 sec sleep into process KILL loop 0165daf569 uboot-envtools: ramips: add support for ALFA Network AX1800RM 3cc223243b ramips: add support for ALFA Network AX1800RM a7449e5e95 arm-trusted-firmware-mediatek: fix hang on reboot on MT7622 0cb2ff5d08 uboot-mediatek: sync mtk-snand driver with SDK --- modules | 2 +- ...wake-up-calls-Android-bug-workaround.patch | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules b/modules index 0a18aa008b..3abe784280 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-23.05 -OPENWRT_COMMIT=cdc8470aecd03e6994714af092f030f209951de4 +OPENWRT_COMMIT=9349302bca44330039e1fd6141837fe507a2cf33 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-23.05 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 487d4a9e36..4faee8e612 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 @@ -27,11 +27,11 @@ Signed-off-by: Linus Lüssing diff --git a/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch new file mode 100644 -index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f9640683ae7fa9 +index 0000000000000000000000000000000000000000..a4da1863b313e68a0fefb969f72fbb4de8620518 --- /dev/null +++ b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch @@ -0,0 +1,151 @@ -+From d23a49e6542dc068b12fbc7b6a4520f9fb3626f9 Mon Sep 17 00:00:00 2001 ++From be5641c1c1d2f007ee60f47fc5e45a6f6a7488ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Linus=20L=C3=BCssing?= +Date: Sun, 5 Jul 2020 23:33:51 +0200 +Subject: [PATCH] bridge: Add multicast_wakeupcall option @@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + 3 files changed, 25 insertions(+) + +diff --git a/device.c b/device.c -+index 1e892191d0ec..67111895b0f9 100644 ++index 2417556..e67f792 100644 +--- a/device.c ++++ b/device.c +@@ -47,6 +47,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { @@ -82,7 +82,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL }, -+@@ -261,6 +262,7 @@ device_merge_settings(struct device *dev, struct device_settings *n) ++@@ -267,6 +268,7 @@ device_merge_settings(struct device *dev, struct device_settings *n) + n->multicast = s->flags & DEV_OPT_MULTICAST ? + s->multicast : os->multicast; + n->multicast_to_unicast = s->multicast_to_unicast; @@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + n->multicast_router = s->multicast_router; + n->multicast_fast_leave = s->multicast_fast_leave; + n->learning = s->learning; -+@@ -386,6 +388,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb) ++@@ -438,6 +440,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb) + s->flags |= DEV_OPT_MULTICAST_TO_UNICAST; + } + @@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) { + s->multicast_router = blobmsg_get_u32(cur); + if (s->multicast_router <= 2) -+@@ -1203,6 +1210,8 @@ device_dump_status(struct blob_buf *b, struct device *dev) ++@@ -1281,6 +1288,8 @@ device_dump_status(struct blob_buf *b, struct device *dev) + blobmsg_add_u32(b, "dadtransmits", st.dadtransmits); + if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST) + blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast); @@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + blobmsg_add_u32(b, "multicast_router", st.multicast_router); + if (st.flags & DEV_OPT_MULTICAST_FAST_LEAVE) +diff --git a/device.h b/device.h -+index 6751628b9b33..41583ac3da4f 100644 ++index 14d7486..eb66ed0 100644 +--- a/device.h ++++ b/device.h +@@ -44,6 +44,7 @@ enum { @@ -123,15 +123,15 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + DEV_ATTR_MULTICAST_ROUTER, + DEV_ATTR_MULTICAST_FAST_LEAVE, + DEV_ATTR_MULTICAST, -+@@ -126,6 +127,7 @@ enum { -+ DEV_OPT_ARP_ACCEPT = (1ULL << 29), -+ DEV_OPT_SPEED = (1ULL << 30), -+ DEV_OPT_DUPLEX = (1ULL << 31), ++@@ -137,6 +138,7 @@ enum { ++ DEV_OPT_RXPAUSE = (1ULL << 34), ++ DEV_OPT_TXPAUSE = (1ULL << 35), ++ DEV_OPT_AUTONEG = (1ULL << 36), ++ DEV_OPT_MULTICAST_WAKEUPCALL = (1ULL << 63), + }; + + /* events broadcasted to all users of a device */ -+@@ -187,6 +189,7 @@ struct device_settings { ++@@ -198,6 +200,7 @@ struct device_settings { + int neigh4locktime; + unsigned int dadtransmits; + bool multicast_to_unicast; @@ -140,10 +140,10 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + bool multicast_fast_leave; + bool multicast; +diff --git a/system-linux.c b/system-linux.c -+index cc15537ba3ad..5148a7eacce0 100644 ++index e437377..af3738a 100644 +--- a/system-linux.c ++++ b/system-linux.c -+@@ -534,6 +534,11 @@ static void system_bridge_set_multicast_to_unicast(struct device *dev, const cha ++@@ -536,6 +536,11 @@ static void system_bridge_set_multicast_to_unicast(struct device *dev, const cha + system_set_dev_sysfs("brport/multicast_to_unicast", dev->ifname, val); + } + @@ -155,7 +155,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + static void system_bridge_set_multicast_fast_leave(struct device *dev, const char *val) + { + system_set_dev_sysfs("brport/multicast_fast_leave", dev->ifname, val); -+@@ -913,8 +918,10 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) ++@@ -915,8 +920,10 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) + static void + system_bridge_set_wireless(struct device *bridge, struct device *dev) + { @@ -166,7 +166,7 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + + if (dev->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST) + mcast_to_ucast = dev->settings.multicast_to_unicast; -+@@ -929,6 +936,12 @@ system_bridge_set_wireless(struct device *bridge, struct device *dev) ++@@ -931,6 +938,12 @@ system_bridge_set_wireless(struct device *bridge, struct device *dev) + system_bridge_set_multicast_to_unicast(dev, mcast_to_ucast ? "1" : "0"); + system_bridge_set_hairpin_mode(dev, hairpin ? "1" : "0"); + system_bridge_set_proxyarp_wifi(dev, dev->wireless_proxyarp ? "1" : "0"); @@ -180,10 +180,10 @@ index 0000000000000000000000000000000000000000..a00a60d63d37d94cbba116eaa0f96406 + + int system_bridge_addif(struct device *bridge, struct device *dev) +-- -+2.40.1 ++2.42.0 + diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 -index 6f28147ee3a0af3611fc108d0534207a4334a6de..476f0d1a6a3c3da1458d71b53214d27a276a1fcc 100644 +index 214a1e6ecd83c067b96cb55ad052ae00b82fa8b5..bf6709ae2dbb87a21659558161d4882befd88b49 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -761,6 +761,7 @@ CONFIG_BRIDGE=y From 612f05a790ff659140da866affecbded9c66a550 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sun, 24 Sep 2023 19:02:08 +0200 Subject: [PATCH 2/3] modules: update packages 7972badcf xfrpc: update to version 2.9.644 8a940b9a5 samba4: update to 4.18.6 e55b41847 czmq: drop libpcre dependency 244bc7e8a mg: switch pcre to pcre2 e731fe980 msmtp: update to version 1.8.24 598e079a2 setools: Update to 4.4.3 edc323ba6 rust: Set rustflags by environment variable e32e59baf node: bump to v18.18.0 67ddab34a rust: Update to 1.72.0 9e7f093db fastd: update repository URL 22f22601d libuecc: update repository URL 596d983e0 nextdns: Update to version 1.40.1 d2ede154d rclone: Update to 1.64.0 a7769bf31 alpine: disable parallel build 332e5eaa4 sudo: bump to verison 1.9.14p3 e22448e18 sudo: bump to verison 1.9.14p1 065d953ad knot: update to version 3.3.1 d2f2d7f55 libreswan: update to 4.12 fix CVE-2023-38710, CVE-2023-38711, CVE-2023-38712 b507c937d collectd: remove target dependency from cpufreq plugin 7ed0b22bb transmission: add copy_file_range syscall to seccomp 4a94edb06 transmission: add ftruncate syscall to seccomp 29bf6ffe3 transmission: Fix env variables passing 3202834c2 ffmpeg: update to version 5.1.3 7512e421d python-build: Update to 1.0.3 f0bb5ce09 python-build: Update to 1.0.0 f33c8977a python-setuptools: Update to 68.2.0 93ebbfed0 https-dns-proxy: improve boot up startup 0d6f18a7d adblock-fast: bugfix: remove domains on allow a49722f43 unbound: update to 1.18.0 78434151e Unbound: Silence SSL unexpected eof messages 853109dd6 curl: update to version 8.3.0 51acc2633 treewide: change my no longer used email 02159e6a5 bandwidthd: drop this package d8776fd36 libucontext: Add package 016424fc1 openssh: update to 9.4p1 bb3247d1b openssh: add server config subdirectory 45b07c0b4 openssh: update to 9.3p2 07b04f9d9 syslog-ng: update to version 4.3.1 c5a254c8d rust: Move RUST_ARCH_DEPENDS into rust-values.mk e05cf558f python3: Update to 3.11.5, refresh patches f22b83f67 python-crcmod: Fix package section f2a59c916 python-pyserial: Update to 3.5, update list of dependencies 1d3737dfc python-cryptodomex: Update to 3.18.0, refresh patches 1e5785e16 python-cryptodome: Update to 3.18.0, refresh patches 1c0e4fc27 ruamel-yaml: Update to 0.17.32, rename source package cedbb68a0 python-zipp: Update to 3.16.2, update list of dependencies eb4ab356c python-yaml: Update to 6.0.1 09f044f98 mwan3: fix mwan3_connected ubus output b4aaffc0e python-zeroconf: Update to 0.97.0, update list of dependencies c876fc96b xmltodict: Update to 0.13.0, rename source package ff68c364d slang2: Remove pcre module 7758a2da4 slang2: Avoid building dependencies unless necessary 359a6d511 python-websockets: Update to 11.0.3, update list of dependencies e47c399cb python-wcwidth: Update to 0.2.6 ef04b76dc python-voluptuous-serialize: Update to 2.6.0 9da8115e8 python-ble2mqtt: update to 0.2.0 fe702c9f1 python-dbus-fast: update to 1.94.1 6bb9bdd5d python-voluptuous: Update to 0.13.1, update list of dependencies 646800830 python-urllib3: Update to 2.0.4 08b5fe210 python-ubus: Update to 0.1.2 0daa65093 haproxy: update to v2.8.3 ec9d61450 python3: Restore platform triplet to paths 2438d49f1 python3: Fix/expand platform triplet detection b8d9ad62e python3: Centralize config file adjustments in Build/Install ae845a260 python: Rework filespec install script 147920079 python3: Fix package descriptions dc08776ef python3: Use regular package recipes for python3 package --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 3abe784280..335b6cc913 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=9349302bca44330039e1fd6141837fe507a2cf33 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-23.05 -PACKAGES_PACKAGES_COMMIT=c92b5ece1620b30b577b5bc4b2216c8113ec13c1 +PACKAGES_PACKAGES_COMMIT=7972badcfd9bd79db5c2a973db87b7faa69dbdd0 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-23.05 From ac9530ac6365c77a92bfec12ab999cde734d0127 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sun, 24 Sep 2023 16:11:29 +0200 Subject: [PATCH 3/3] patches: openvswitch: don't do groff manpage check --- ...nvswitch-disable-groff-manpage-check.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/packages/packages/0002-openvswitch-disable-groff-manpage-check.patch diff --git a/patches/packages/packages/0002-openvswitch-disable-groff-manpage-check.patch b/patches/packages/packages/0002-openvswitch-disable-groff-manpage-check.patch new file mode 100644 index 0000000000..58c2476f78 --- /dev/null +++ b/patches/packages/packages/0002-openvswitch-disable-groff-manpage-check.patch @@ -0,0 +1,25 @@ +From: Matthias Schiffer +Date: Sat, 23 Sep 2023 18:10:30 +0200 +Subject: openvswitch: disable groff manpage check + +The openvswitch build trips over a number of warnings during the +manpage-check step if groff 1.23 is installed on the build host, +resulting in a failed build. + +As this check is optional, and we don't even install the manpages, simply +override the groff configure check to never detect groff. + +Signed-off-by: Matthias Schiffer + +diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile +index 7f47c28226d53a850b7c480c092689cfea904f80..43b8bfaf5586f831df704442fdfa1b541312d3b3 100644 +--- a/net/openvswitch/Makefile ++++ b/net/openvswitch/Makefile +@@ -251,6 +251,7 @@ CONFIGURE_ARGS+= \ + CONFIGURE_VARS += \ + $(if $(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),,ac_cv_lib_unbound_ub_ctx_create=no) \ + ovs_cv_flake8=no \ ++ ovs_cv_groff=no \ + ovs_cv_python3=$(PYTHON3) \ + ovs_cv_python3_host=$(HOST_PYTHON3_BIN) \ + SPHINXBUILD=none \