From cd51b58efdfa689f282e808c14a6f8b054eedb57 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Wed, 21 Dec 2022 17:50:18 +0800 Subject: [PATCH 01/65] natmap: add forward_port option The bind port (-b) can be used with forward port (-p), so expose this option in config file. Signed-off-by: Richard Yu --- net/natmap/Makefile | 2 +- net/natmap/files/natmap.config | 1 + net/natmap/files/natmap.init | 14 ++++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index 7c09f1716..3c2991df8 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natmap PKG_VERSION:=20221203 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) diff --git a/net/natmap/files/natmap.config b/net/natmap/files/natmap.config index 71931f6c5..01328c1bb 100644 --- a/net/natmap/files/natmap.config +++ b/net/natmap/files/natmap.config @@ -8,5 +8,6 @@ config natmap option http_server 'example.com' option port '8080' option forward_target '' + option forward_port '' option notify_script '' diff --git a/net/natmap/files/natmap.init b/net/natmap/files/natmap.init index a9ff90539..3688880b3 100644 --- a/net/natmap/files/natmap.init +++ b/net/natmap/files/natmap.init @@ -26,6 +26,7 @@ validate_section_natmap() { 'http_server:host' \ 'port:port' \ 'forward_target:host' \ + 'forward_port:port' \ 'notify_script:file' } @@ -39,15 +40,16 @@ natmap_instance() { procd_open_instance "$1" procd_set_param command "$PROG" \ - ${interval:+-k $interval} \ + ${interval:+-k "$interval"} \ ${stun_server:+-s "$stun_server"} \ - ${http_server:+-h "$http_server"} + ${http_server:+-h "$http_server"} \ + ${port:+-b "$port"} \ [ "${family}" = ipv4 ] && procd_append_param command -4 [ "${family}" = ipv6 ] && procd_append_param command -6 [ "${udp_mode}" = 1 ] && procd_append_param command -u - [ -n "$interface" ] && { + [ -n "${interface}" ] && { local ifname network_get_device ifname "$interface" || ifname="$interface" @@ -55,11 +57,7 @@ natmap_instance() { procd_append_param netdev "$ifname" } - if [ -n "$forward_target" ]; then - procd_append_param command -t "$forward_target" -p $port - else - procd_append_param command -b $port - fi + [ -n "${forward_target}" ] && procd_append_param command -t "$forward_target" -p "$forward_port" [ -n "${notify_script}" ] && procd_set_param env "NOTIFY_SCRIPT=${notify_script}" procd_append_param command -e /usr/lib/natmap/update.sh From 4ecd9d67e90651a8e93760bf0b5771f7057c74a8 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Tue, 20 Dec 2022 09:20:45 +0100 Subject: [PATCH 02/65] python3: fix ssl support by removing libressl patches Remove libressl specific patches. With commit ("tools/libressl: update to 3.7.0") they are no longer needed, rather they cause python3 to be compiled without working ssl-support. Fixes: #20107 Suggested-by: Andre Heider Signed-off-by: Nick Hainke --- lang/python/python3/Makefile | 2 +- .../patches/026-openssl-feature-flags.patch | 47 ------------------- ...ost-python-support-ssl-with-libressl.patch | 27 ----------- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 lang/python/python3/patches/026-openssl-feature-flags.patch delete mode 100644 lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 37604fd89..816b1f1da 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz diff --git a/lang/python/python3/patches/026-openssl-feature-flags.patch b/lang/python/python3/patches/026-openssl-feature-flags.patch deleted file mode 100644 index b4c15ab80..000000000 --- a/lang/python/python3/patches/026-openssl-feature-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/Modules/_hashopenssl.c -+++ b/Modules/_hashopenssl.c -@@ -45,10 +45,12 @@ - - #define MUNCH_SIZE INT_MAX - -+#if !defined(LIBRESSL_VERSION_NUMBER) - #define PY_OPENSSL_HAS_SCRYPT 1 - #define PY_OPENSSL_HAS_SHA3 1 - #define PY_OPENSSL_HAS_SHAKE 1 - #define PY_OPENSSL_HAS_BLAKE2 1 -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x30000000L - #define PY_EVP_MD EVP_MD -@@ -119,6 +121,7 @@ static const py_hashentry_t py_hashes[] - PY_HASH_ENTRY(Py_hash_sha256, "SHA256", SN_sha256, NID_sha256), - PY_HASH_ENTRY(Py_hash_sha384, "SHA384", SN_sha384, NID_sha384), - PY_HASH_ENTRY(Py_hash_sha512, "SHA512", SN_sha512, NID_sha512), -+#if !defined(LIBRESSL_VERSION_NUMBER) - /* truncated sha2 */ - PY_HASH_ENTRY(Py_hash_sha512_224, "SHA512_224", SN_sha512_224, NID_sha512_224), - PY_HASH_ENTRY(Py_hash_sha512_256, "SHA512_256", SN_sha512_256, NID_sha512_256), -@@ -133,6 +136,7 @@ static const py_hashentry_t py_hashes[] - /* blake2 digest */ - PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256), - PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512), -+#endif - PY_HASH_ENTRY(NULL, NULL, NULL, 0), - }; - -@@ -873,11 +877,15 @@ py_evp_fromname(PyObject *module, const - goto exit; - } - -+#if defined(LIBRESSL_VERSION_NUMBER) -+ type = get_hashlib_state(module)->EVPtype; -+#else - if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) { - type = get_hashlib_state(module)->EVPXOFtype; - } else { - type = get_hashlib_state(module)->EVPtype; - } -+#endif - - self = newEVPobject(type); - if (self == NULL) { diff --git a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch b/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch deleted file mode 100644 index 7b47c111f..000000000 --- a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -67,6 +67,12 @@ - # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" - #endif - -+#ifdef LIBRESSL_VERSION_NUMBER -+static int SSL_CTX_get_security_level(const SSL_CTX *ctx) -+{ -+ return 1; -+} -+#endif - - - struct py_ssl_error_code { -@@ -169,7 +175,11 @@ extern const SSL_METHOD *TLSv1_2_method( - * Based on Hynek's excellent blog post (update 2021-02-11) - * https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/ - */ -+#ifndef LIBRESSL_VERSION_NUMBER - #define PY_SSL_DEFAULT_CIPHER_STRING "@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM" -+#else -+ #define PY_SSL_DEFAULT_CIPHER_STRING "ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM" -+#endif - #ifndef PY_SSL_MIN_PROTOCOL - #define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION - #endif From 4c58d6d288f303a7a729e88d82496d0f1afd5301 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Wed, 21 Dec 2022 20:49:02 +0100 Subject: [PATCH 03/65] docker-compose: Update to version 2.14.2 Signed-off-by: Javier Marcet --- utils/docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 5ea73c5bf..c857615d5 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.14.1 +PKG_VERSION:=2.14.2 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=4e3e92169ad9142718a168b71dc5027f173be4cdb6563f42c60677818efd7509 +PKG_HASH:=72f25596fdaf3bfbb685460c6003acd7ea904b95f12151f892bb199f985fa285 PKG_MAINTAINER:=Javier Marcet From dd00cd04c5b57e3845db75839088edfb0a4c7a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Sepp=C3=A4l=C3=A4?= Date: Tue, 29 Nov 2022 13:41:36 +0200 Subject: [PATCH 04/65] uacme: Use UCI to configure firewall instead of iptables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use UCI to add temporary incoming firewall rule to accept http traffic for challenge verification. This should make uacme compatible with OpenWrt's fw3/4 implementation. Signed-off-by: Antti Seppälä --- net/uacme/files/run.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) mode change 100644 => 100755 net/uacme/files/run.sh diff --git a/net/uacme/files/run.sh b/net/uacme/files/run.sh old mode 100644 new mode 100755 index 556bcc2f9..98871d4ba --- a/net/uacme/files/run.sh +++ b/net/uacme/files/run.sh @@ -37,6 +37,7 @@ NGINX_WEBSERVER=0 UPDATE_NGINX=0 UPDATE_UHTTPD=0 UPDATE_HAPROXY=0 +FW_RULE= USER_CLEANUP= . /lib/functions.sh @@ -135,24 +136,30 @@ pre_checks() esac done - iptables -I input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" || return 1 - debug "v4 input_rule: $(iptables -nvL input_rule)" - if [ -e "/usr/sbin/ip6tables" ]; then - ip6tables -I input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" || return 1 - debug "v6 input_rule: $(ip6tables -nvL input_rule)" - fi + FW_RULE=$(uci add firewall rule) || return 1 + uci set firewall."$FW_RULE".name='uacme: temporarily allow incoming http' + uci set firewall."$FW_RULE".enabled='1' + uci set firewall."$FW_RULE".target='ACCEPT' + uci set firewall."$FW_RULE".src='wan' + uci set firewall."$FW_RULE".proto='tcp' + uci set firewall."$FW_RULE".dest_port='80' + uci commit firewall + /etc/init.d/firewall reload + + debug "added firewall rule: $FW_RULE" return 0 } post_checks() { log "Running post checks (cleanup)." - # The comment ensures we only touch our own rules. If no rules exist, that - # is fine, so hide any errors - iptables -D input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" 2>/dev/null - if [ -e "/usr/sbin/ip6tables" ]; then - ip6tables -D input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" 2>/dev/null + # $FW_RULE contains the string to identify firewall rule created earlier + if [ -n "$FW_RULE" ]; then + uci delete firewall."$FW_RULE" + uci commit firewall + /etc/init.d/firewall reload fi + if [ -e /etc/init.d/uhttpd ] && [ "$UPDATE_UHTTPD" -eq 1 ]; then uci commit uhttpd /etc/init.d/uhttpd reload From 96b2cd70e108d3ca4b9327881b00f1300c7f8cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Sepp=C3=A4l=C3=A4?= Date: Sun, 11 Dec 2022 20:00:38 +0200 Subject: [PATCH 05/65] uacme: Remove deprecated $(AUTORELEASE) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antti Seppälä --- net/uacme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/uacme/Makefile b/net/uacme/Makefile index d7d66cff1..34e9ddcda 100644 --- a/net/uacme/Makefile +++ b/net/uacme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uacme PKG_VERSION:=1.7.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)? From edbcb97b78d36a813e6aa04f6b6ff9bc20be2eb3 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Thu, 22 Dec 2022 18:52:41 +0000 Subject: [PATCH 06/65] pbr: bugfix: Makefile, rt_tables fix Signed-off-by: Stan Grishin --- net/pbr/Makefile | 4 ++-- net/pbr/files/etc/init.d/pbr.init | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/net/pbr/Makefile b/net/pbr/Makefile index e5b967ff0..7ec156ac7 100644 --- a/net/pbr/Makefile +++ b/net/pbr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pbr PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin @@ -20,7 +20,7 @@ define Package/pbr/default URL:=https://docs.openwrt.melmac.net/pbr/ DEPENDS:=+ip-full +jshn +jsonfilter +resolveip CONFLICTS:=vpnbypass vpn-policy-routing - PROVIDES:=pbr vpnbypass vpn-policy-routing + PROVIDES:=vpnbypass vpn-policy-routing PKGARCH:=all endef diff --git a/net/pbr/files/etc/init.d/pbr.init b/net/pbr/files/etc/init.d/pbr.init index 3ee9a9b8c..16aae0596 100755 --- a/net/pbr/files/etc/init.d/pbr.init +++ b/net/pbr/files/etc/init.d/pbr.init @@ -264,8 +264,8 @@ is_service_running_nft() { [ -x "$nft" ] && [ -n "$(get_mark_nft_chains)" ]; } # is_service_running_nft() { [ -x "$nft" ] && [ -s "$nftPermFile" ]; } is_service_running() { if is_nft; then is_service_running_nft; else is_service_running_iptables; fi; } is_netifd_table() { local iface="$1"; [ "$(uci -q get "network.${iface}.ip4table")" = "${packageName}_${iface%6}" ]; } -get_rt_tables_id() { grep "${packageName}_${iface}" /etc/iproute2/rt_tables | awk '{print $1;}'; } -get_rt_tables_next_id() { echo "$(($(sort -r -n /etc/iproute2/rt_tables | grep -o -E -m 1 "^[0-9]+")+1))"; } +get_rt_tables_id() { local iface="$1"; grep "${packageName}_${iface}" '/etc/iproute2/rt_tables' | awk '{print $1;}'; } +get_rt_tables_next_id() { echo "$(($(sort -r -n '/etc/iproute2/rt_tables' | grep -o -E -m 1 "^[0-9]+")+1))"; } _check_config() { local en; config_get_bool en "$1" 'enabled' 1; [ "$en" -gt 0 ] && _cfg_enabled=0; } is_config_enabled() { local cfg="$1" _cfg_enabled=1 @@ -1658,12 +1658,16 @@ interface_routing() { $ip_full -6 rule add fwmark "${mark}/${fw_mask}" table "$tid" priority "$priority" || ipv6_error=1 fi else - sed -i "/${ipTablePrefix}_${iface}/d" /etc/iproute2/rt_tables + if ! grep -q "$tid ${ipTablePrefix}_${iface}" '/etc/iproute2/rt_tables'; then + sed -i "/${ipTablePrefix}_${iface}/d" '/etc/iproute2/rt_tables' + sync + echo "$tid ${ipTablePrefix}_${iface}" >> '/etc/iproute2/rt_tables' + sync + fi $ip_full -4 rule del fwmark "${mark}/${fw_mask}" table "$tid" >/dev/null 2>&1 $ip_full -4 route flush table "$tid" >/dev/null 2>&1 if [ -n "$gw4" ] || [ "$strict_enforcement" -ne 0 ]; then ipv4_error=0 - echo "$tid ${ipTablePrefix}_${iface}" >> /etc/iproute2/rt_tables if [ -z "$gw4" ]; then $ip_full -4 route add unreachable default table "$tid" >/dev/null 2>&1 || ipv4_error=1 else @@ -1754,7 +1758,8 @@ EOF $ip_full rule del fwmark "${mark}/${fw_mask}" table "$tid" >/dev/null 2>&1 if ! is_netifd_table "$iface"; then $ip_full route flush table "$tid" >/dev/null 2>&1 - sed -i "/${ipTablePrefix}_${iface}/d" /etc/iproute2/rt_tables + sed -i "/${ipTablePrefix}_${iface}/d" '/etc/iproute2/rt_tables' + sync fi return "$s" ;; From 20a905383f743126152dff0bf941931a84276e3d Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:14:08 -0600 Subject: [PATCH 07/65] vips: update to 8.13.3 Signed-off-by: W. Michael Petullo --- libs/vips/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vips/Makefile b/libs/vips/Makefile index c6477edb3..f07698dc3 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=8.12.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=8.13.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) -PKG_HASH:=565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b +PKG_HASH:=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 62359925e45c2ae3f4308c45a83ffdb9f3446456 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:17:07 -0600 Subject: [PATCH 08/65] nfdump: update to 1.6.25 Signed-off-by: W. Michael Petullo --- net/nfdump/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index cab9d9707..f1879b984 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfdump -PKG_VERSION:=1.6.24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.6.25 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e +PKG_HASH:=811ffab139078c08d922739d20f487c48870749c74a0cd4b14dd126252c4be88 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause From da806ee091ed86d298b4faf99373f39bb4791983 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:05:13 -0600 Subject: [PATCH 09/65] luaexpat: update to 1.5.1 Signed-off-by: W. Michael Petullo --- lang/luaexpat/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/luaexpat/Makefile b/lang/luaexpat/Makefile index 741366ebe..1a7b077df 100644 --- a/lang/luaexpat/Makefile +++ b/lang/luaexpat/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luaexpat -PKG_VERSION:=1.4.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.5.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lunarmodules/luaexpat/archive/refs/tags -PKG_HASH:=d528060d45865b44bef7215ef8a440165b668f363a4af53358389f0315a8593c +PKG_HASH:=7d455f154de59eb0b073c3620bc8b873f7f697b3f21a112e6ff8dc9fca6d0826 PKG_CPE_ID:=cpe:/a:matthewwild:luaexpat From f8bd5eaa6edcf437130118295380c93f2acdfdc3 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Tue, 20 Dec 2022 10:51:56 +0900 Subject: [PATCH 10/65] node: bump to v16.19.0 Notable Changes *OpenSSL 1.1.1s *Root certificates updated to NSS 3.85 *Time zone update to 2022f Signed-off-by: Hirokazu MORIKAWA --- lang/node/Makefile | 4 ++-- lang/node/patches/003-path.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/node/Makefile b/lang/node/Makefile index b34263a7d..52c513ddc 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node -PKG_VERSION:=v16.18.0 +PKG_VERSION:=v16.19.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION) -PKG_HASH:=fcfe6ad2340f229061d3e81a94df167fe3f77e01712dedc0144a0e7d58e2c69b +PKG_HASH:=4f1fec1aea2392f6eb6d1d040b01e7ee3e51e762a9791dfea590920bc1156706 PKG_MAINTAINER:=Hirokazu MORIKAWA , Adrian Panella PKG_LICENSE:=MIT diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch index cd20f0bf2..42e07f2cd 100644 --- a/lang/node/patches/003-path.patch +++ b/lang/node/patches/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1290,7 +1290,8 @@ Module._initPaths = function() { +@@ -1300,7 +1300,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); From 38f2618c783f59b904abb0a1a9138d915c147782 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:07:44 -0600 Subject: [PATCH 11/65] luasec: update to 1.2.0 Signed-off-by: W. Michael Petullo --- lang/luasec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile index 8cef2c71c..5c1de2e85 100644 --- a/lang/luasec/Makefile +++ b/lang/luasec/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec -PKG_VERSION:=0.9 +PKG_VERSION:=1.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/brunoos/luasec/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6b6b94e8517bf6baf545fad29a2112f9ac7957ad85b4aae8e0727bec77d7a325 +PKG_HASH:=2e86ef8f3486dc1bbecd752d16741a59a01633279facdfe5631f33b6eed1a30a MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT From 7812b7474617c60ea1f4a156d3681f9dea8050c4 Mon Sep 17 00:00:00 2001 From: Robert N Date: Thu, 22 Dec 2022 06:56:59 +0000 Subject: [PATCH 12/65] motion: add gettext as host dependency Signed-off-by: Robert N --- multimedia/motion/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index f865d75be..553be1eae 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -24,6 +24,7 @@ PKG_CPE_ID:=cpe:/a:lavrsen:motion PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=gettext-full/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk From 0c1425f8febc1d2d63f6c1fd44eaca61ac6e6745 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 18 Dec 2022 09:18:42 -0500 Subject: [PATCH 13/65] snort3: minor tweaks to local.lua * Use Boolean true for enable inline mode which is more intuitive that older '' * Add skeleton section for openappid since it has been merged[1] 1. https://github.com/openwrt/packages/commit/2d4e7d5fd343652d0852337184d56522ef5af83d Signed-off-by: John Audia --- net/snort3/files/local.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/snort3/files/local.lua b/net/snort3/files/local.lua index 7929388ba..c48ffd0c8 100644 --- a/net/snort3/files/local.lua +++ b/net/snort3/files/local.lua @@ -2,7 +2,7 @@ -- switch tap to inline in ips and uncomment the below to run snort in inline mode --snort = {} ---snort["-Q"] = '' +--snort["-Q"] = true ips = { mode = tap, @@ -50,3 +50,10 @@ file_policy = { } } } + +-- To use openappid with snort, install the openappid package and uncomment the below +--appid = { +-- app_detector_dir = '/usr/lib/openappid', +-- log_stats = true, +-- app_stats_period = 60, +--} From 34783261d05bf0aa443449d0efc7dd19a450f0cc Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 20 Dec 2022 15:07:11 -0500 Subject: [PATCH 14/65] snort3: update to 3.1.49.0 Upstream bump Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- net/snort3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index b91ebc6bd..cb9a9c78c 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.48.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.1.49.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=65df088a8cac11e59f0b71a7f98fc9d21eeb0e31d35280c470c985172947ebfe +PKG_HASH:=3ad422f27855a73f83483fefa844bdc4ef247f9e0a21d1fa54d6c8ea20105fcb PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 10a170552a833c79e0b4f0137a11612bfcd72c01 Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 20 Dec 2022 15:07:45 -0500 Subject: [PATCH 15/65] snort3: update to 3.1.50.0 Upstream bump Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index cb9a9c78c..698f28c4a 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.49.0 +PKG_VERSION:=3.1.50.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=3ad422f27855a73f83483fefa844bdc4ef247f9e0a21d1fa54d6c8ea20105fcb +PKG_HASH:=983497578587c5b1291994608fef70700d7f251461e79ac897751bba57cc56b5 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From c2edafb66fc0637bc3ed2d47f10d82cb90a4c0d1 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 17 Dec 2022 22:16:14 +0100 Subject: [PATCH 16/65] lxc: Fix compilation with glibc 2.36 Backport patches from upstream lxc master to fix compilation against glibc 2.36. The changes were added in these pull requests: https://github.com/lxc/lxc/pull/4179 https://github.com/lxc/lxc/pull/4181 Signed-off-by: Hauke Mehrtens --- ...-where-struct-mount_attr-is-declared.patch | 173 +++++++++++++++ ...uild-detect-sys-pidfd.h-availability.patch | 47 +++++ ...FS_CONFIG_-header-symbol-in-sys-moun.patch | 143 +++++++++++++ ...irect-or-indirect-linux-mount.h-incl.patch | 197 ++++++++++++++++++ ...-wide-use-struct-clone_args-directly.patch | 99 +++++++++ ...ee-wide-use-struct-open_how-directly.patch | 112 ++++++++++ 6 files changed, 771 insertions(+) create mode 100644 utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch create mode 100644 utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch create mode 100644 utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch create mode 100644 utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch create mode 100644 utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch create mode 100644 utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch diff --git a/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch b/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch new file mode 100644 index 000000000..89b52fc22 --- /dev/null +++ b/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch @@ -0,0 +1,173 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -589,7 +589,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -609,7 +608,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -629,6 +627,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(s + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(s + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lx + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned i + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + } diff --git a/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch b/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch new file mode 100644 index 000000000..677c08fc2 --- /dev/null +++ b/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch @@ -0,0 +1,47 @@ +From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:27:40 +0200 +Subject: build: detect sys/pidfd.h availability + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 1 + + src/lxc/process_utils.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +--- a/meson.build ++++ b/meson.build +@@ -734,6 +734,7 @@ foreach tuple: [ + ['sys/resource.h'], + ['sys/memfd.h'], + ['sys/personality.h'], ++ ['sys/pidfd.h'], + ['sys/signalfd.h'], + ['sys/timerfd.h'], + ['pty.h'], +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -15,6 +15,10 @@ + #include + #include + ++#if HAVE_SYS_PIDFD_H ++#include ++#endif ++ + #include "compiler.h" + #include "syscall_numbers.h" + +@@ -136,9 +140,11 @@ + #endif + + /* waitid */ ++#if !HAVE_SYS_PIDFD_H + #ifndef P_PIDFD + #define P_PIDFD 3 + #endif ++#endif + + #ifndef CLONE_ARGS_SIZE_VER0 + #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch b/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch new file mode 100644 index 000000000..20d406949 --- /dev/null +++ b/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch @@ -0,0 +1,143 @@ +From cbabe8abf11e7e7fb49c123bae31efdd9bc8f1e8 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 17:19:40 +0200 +Subject: build: check for FS_CONFIG_* header symbol in sys/mount.h + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 59 +++++++++++++++++++++++++++++++++++++++++-- + src/lxc/mount_utils.h | 16 ++++++++++++ + 2 files changed, 73 insertions(+), 2 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -638,8 +638,7 @@ if cc.sizeof('struct mount_attr', prefix + found_types += 'struct mount_attr (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) +- missing_types += 'struct mount_attr (sys/mount.h)' +-endif ++ missing_types += 'struct mount_attr (sys/mount.h)' endif + + ## Types. + decl_headers = ''' +@@ -655,6 +654,62 @@ else + missing_types += 'struct mount_attr (linux/mount.h)' + endif + ++if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG') ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true) ++ found_types += 'FSCONFIG_SET_FLAG' ++else ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false) ++ missing_types += 'FSCONFIG_SET_FLAG' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_STRING' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_STRING' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_BINARY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_BINARY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_EMPTY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_EMPTY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_FD' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_FD' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_CREATE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_CREATE' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +--- a/src/lxc/mount_utils.h ++++ b/src/lxc/mount_utils.h +@@ -82,37 +82,53 @@ struct lxc_rootfs; + #endif + + /* fsconfig() commands */ ++#if !HAVE_FSCONFIG_SET_FLAG + #ifndef FSCONFIG_SET_FLAG + #define FSCONFIG_SET_FLAG 0 /* Set parameter, supplying no value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_STRING + #ifndef FSCONFIG_SET_STRING + #define FSCONFIG_SET_STRING 1 /* Set parameter, supplying a string value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_BINARY + #ifndef FSCONFIG_SET_BINARY + #define FSCONFIG_SET_BINARY 2 /* Set parameter, supplying a binary blob value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH + #ifndef FSCONFIG_SET_PATH + #define FSCONFIG_SET_PATH 3 /* Set parameter, supplying an object by path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH_EMPTY + #ifndef FSCONFIG_SET_PATH_EMPTY + #define FSCONFIG_SET_PATH_EMPTY 4 /* Set parameter, supplying an object by (empty) path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_FD + #ifndef FSCONFIG_SET_FD + #define FSCONFIG_SET_FD 5 /* Set parameter, supplying an object by fd */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_CMD_CREATE + #ifndef FSCONFIG_CMD_CREATE + #define FSCONFIG_CMD_CREATE 6 /* Invoke superblock creation */ + #endif ++#endif + ++#if !FSCONFIG_CMD_RECONFIGURE + #ifndef FSCONFIG_CMD_RECONFIGURE + #define FSCONFIG_CMD_RECONFIGURE 7 /* Invoke superblock reconfiguration */ + #endif ++#endif + + /* fsmount() flags */ + #ifndef FSMOUNT_CLOEXEC diff --git a/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch b/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch new file mode 100644 index 000000000..eb190018b --- /dev/null +++ b/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch @@ -0,0 +1,197 @@ +From 4771699fd97b1e9ee7dc4f7cfe01c8ddd698f682 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 11:42:52 +0200 +Subject: tree-wide: wipe direct or indirect linux/mount.h inclusion + +It is incompatible with sys/mount.h and causes massive headaches. + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 44 +++++++++++++------------------------- + src/lxc/macro.h | 13 +++++++++++ + src/lxc/mount_utils.h | 2 +- + src/lxc/syscall_wrappers.h | 9 ++------ + src/lxc/utils.c | 2 -- + 5 files changed, 31 insertions(+), 39 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -627,7 +627,6 @@ foreach tuple: [ + endif + endforeach + +-## Types. + decl_headers = ''' + #include + ''' +@@ -640,74 +639,61 @@ else + srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) + missing_types += 'struct mount_attr (sys/mount.h)' endif + +-## Types. +-decl_headers = ''' +-#include +-''' +- +-# We get -1 if the size cannot be determined +-if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 +- srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) +- found_types += 'struct mount_attr (linux/mount.h)' +-else +- srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) +- missing_types += 'struct mount_attr (linux/mount.h)' +-endif +- ++## Check if sys/mount.h defines the fsconfig commands + if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG') + srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true) +- found_types += 'FSCONFIG_SET_FLAG' ++ found_types += 'FSCONFIG_SET_FLAG (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false) +- missing_types += 'FSCONFIG_SET_FLAG' ++ missing_types += 'FSCONFIG_SET_FLAG (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_STRING' ++ found_types += 'FS_CONFIG_SET_STRING (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_STRING' ++ missing_types += 'FS_CONFIG_SET_STRING (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_BINARY' ++ found_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_BINARY' ++ missing_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_PATH_EMPTY' ++ found_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_PATH_EMPTY' ++ missing_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_PATH_FD' ++ found_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_PATH_FD' ++ missing_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_CMD_CREATE' ++ found_types += 'FS_CONFIG_SET_CMD_CREAT (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_CMD_CREATE' ++ missing_types += 'FS_CONFIG_SET_CMD_CREATE (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++ found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++ missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)' + endif + + ## Headers. +--- a/src/lxc/macro.h ++++ b/src/lxc/macro.h +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -812,4 +813,16 @@ static inline bool is_set(__u32 bit, __u + + #define BIT(nr) (1UL << (nr)) + ++#ifndef FS_IOC_GETFLAGS ++#define FS_IOC_GETFLAGS _IOR('f', 1, long) ++#endif ++ ++#ifndef FS_IOC_SETFLAGS ++#define FS_IOC_SETFLAGS _IOW('f', 2, long) ++#endif ++ ++#ifndef FS_IMMUTABLE_FL ++#define FS_IMMUTABLE_FL 0x00000010 /* Immutable file */ ++#endif ++ + #endif /* __LXC_MACRO_H */ +--- a/src/lxc/mount_utils.h ++++ b/src/lxc/mount_utils.h +@@ -124,7 +124,7 @@ struct lxc_rootfs; + #endif + #endif + +-#if !FSCONFIG_CMD_RECONFIGURE ++#if !HAVE_FSCONFIG_CMD_RECONFIGURE + #ifndef FSCONFIG_CMD_RECONFIGURE + #define FSCONFIG_CMD_RECONFIGURE 7 /* Invoke superblock reconfiguration */ + #endif +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -18,12 +19,6 @@ + #include "macro.h" + #include "syscall_numbers.h" + +-#if HAVE_STRUCT_MOUNT_ATTR +-#include +-#elif HAVE_UAPI_STRUCT_MOUNT_ATTR +-#include +-#endif +- + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -216,7 +211,7 @@ extern int fsmount(int fs_fd, unsigned i + /* + * mount_setattr() + */ +-#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++#if !HAVE_STRUCT_MOUNT_ATTR + struct mount_attr { + __u64 attr_set; + __u64 attr_clr; +--- a/src/lxc/utils.c ++++ b/src/lxc/utils.c +@@ -19,8 +19,6 @@ + #include + #include + #include +-/* Needs to be after sys/mount.h header */ +-#include + #include + #include + #include diff --git a/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch b/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch new file mode 100644 index 000000000..7ab536e9b --- /dev/null +++ b/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch @@ -0,0 +1,99 @@ +From 63468abd3287ebd5cc4ed9205334217031049fb4 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 12:03:54 +0200 +Subject: tree-wide: use struct clone_args directly + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 1 - + src/lxc/process_utils.c | 2 +- + src/lxc/process_utils.h | 7 ++++--- + src/lxc/start.c | 2 +- + src/lxc/start.h | 1 - + src/tests/reboot.c | 2 -- + 6 files changed, 6 insertions(+), 9 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -582,7 +582,6 @@ decl_headers = ''' + #include + #include + #include +-#include + #include + ''' + +--- a/src/lxc/process_utils.c ++++ b/src/lxc/process_utils.c +@@ -90,7 +90,7 @@ __returns_twice pid_t lxc_raw_legacy_clo + __returns_twice pid_t lxc_raw_clone(unsigned long flags, int *pidfd) + { + pid_t pid; +- struct lxc_clone_args args = { ++ struct clone_args args = { + .flags = flags, + .pidfd = ptr_to_u64(pidfd), + }; +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -5,7 +5,6 @@ + + #include "config.h" + +-#include + #include + #include + #include +@@ -165,7 +164,8 @@ + #define u64_to_ptr(x) ((void *)(uintptr_t)x) + #endif + +-struct lxc_clone_args { ++#if !HAVE_STRUCT_CLONE_ARGS ++struct clone_args { + __aligned_u64 flags; + __aligned_u64 pidfd; + __aligned_u64 child_tid; +@@ -178,8 +178,9 @@ struct lxc_clone_args { + __aligned_u64 set_tid_size; + __aligned_u64 cgroup; + }; ++#endif + +-__returns_twice static inline pid_t lxc_clone3(struct lxc_clone_args *args, size_t size) ++__returns_twice static inline pid_t lxc_clone3(struct clone_args *args, size_t size) + { + return syscall(__NR_clone3, args, size); + } +--- a/src/lxc/start.c ++++ b/src/lxc/start.c +@@ -1673,7 +1673,7 @@ static int lxc_spawn(struct lxc_handler + } else { + int cgroup_fd = -EBADF; + +- struct lxc_clone_args clone_args = { ++ struct clone_args clone_args = { + .flags = handler->clone_flags, + .pidfd = ptr_to_u64(&handler->pidfd), + .exit_signal = SIGCHLD, +--- a/src/lxc/start.h ++++ b/src/lxc/start.h +@@ -5,7 +5,6 @@ + + #include "config.h" + +-#include + #include + #include + #include +--- a/src/tests/reboot.c ++++ b/src/tests/reboot.c +@@ -32,8 +32,6 @@ + + #include "namespace.h" + +-#include +-#include + #include + + int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...); diff --git a/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch b/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch new file mode 100644 index 000000000..cbcd08140 --- /dev/null +++ b/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch @@ -0,0 +1,112 @@ +From 133aa416ca2a5996090ec0e697e253646364d274 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 12:18:49 +0200 +Subject: tree-wide: use struct open_how directly + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 2 -- + src/lxc/file_utils.c | 2 +- + src/lxc/mount_utils.c | 8 ++++---- + src/lxc/syscall_wrappers.h | 6 ++++-- + src/lxc/utils.c | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -579,9 +579,7 @@ decl_headers = ''' + #include + #include + #include +-#include + #include +-#include + #include + ''' + +--- a/src/lxc/file_utils.c ++++ b/src/lxc/file_utils.c +@@ -652,7 +652,7 @@ int open_at(int dfd, const char *path, u + unsigned int resolve_flags, mode_t mode) + { + __do_close int fd = -EBADF; +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags, + .mode = mode, + .resolve = resolve_flags, +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -186,7 +186,7 @@ int fs_prepare(const char *fs_name, + int fd_from; + + if (!is_empty_string(path_from)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_from, + .resolve = resolve_flags_from, + }; +@@ -237,7 +237,7 @@ int fs_attach(int fd_fs, + int fd_to, ret; + + if (!is_empty_string(path_to)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_to, + .resolve = resolve_flags_to, + }; +@@ -308,7 +308,7 @@ int move_detached_mount(int dfd_from, in + int fd_to, ret; + + if (!is_empty_string(path_to)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_to, + .resolve = resolve_flags_to, + }; +@@ -348,7 +348,7 @@ int __fd_bind_mount(int dfd_from, const + set_atime(&attr); + + if (!is_empty_string(path_from)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_from, + .resolve = resolve_flags_from, + }; +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -240,11 +240,13 @@ static inline int mount_setattr(int dfd, + * @mode: O_CREAT/O_TMPFILE file mode. + * @resolve: RESOLVE_* flags. + */ +-struct lxc_open_how { ++#if !HAVE_STRUCT_OPEN_HOW ++struct open_how { + __u64 flags; + __u64 mode; + __u64 resolve; + }; ++#endif + + /* how->resolve flags for openat2(2). */ + #ifndef RESOLVE_NO_XDEV +@@ -296,7 +298,7 @@ struct lxc_open_how { + #define PROTECT_OPEN_RW (O_CLOEXEC | O_NOCTTY | O_RDWR | O_NOFOLLOW) + + #if !HAVE_OPENAT2 +-static inline int openat2(int dfd, const char *filename, struct lxc_open_how *how, size_t size) ++static inline int openat2(int dfd, const char *filename, struct open_how *how, size_t size) + { + return syscall(__NR_openat2, dfd, filename, how, size); + } +--- a/src/lxc/utils.c ++++ b/src/lxc/utils.c +@@ -1095,7 +1095,7 @@ int __safe_mount_beneath_at(int beneath_ + unsigned int flags, const void *data) + { + __do_close int source_fd = -EBADF, target_fd = -EBADF; +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = PROTECT_OPATH_DIRECTORY, + .resolve = PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS, + }; From 8e2dcf4d75d01ae5a798197302cff86b336f8867 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 18 Dec 2022 15:16:30 +0100 Subject: [PATCH 17/65] lxc: Remove AUTORELEASE The previous version used PKG_RELEASE:=3. Signed-off-by: Hauke Mehrtens --- utils/lxc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index ba7be6bf6..feafd092e 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=5.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ From 7316c741777b3c468bef80840facaf42912ed9c8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:14:46 -0600 Subject: [PATCH 18/65] pigeonhole: update to 0.5.19 Signed-off-by: W. Michael Petullo --- mail/pigeonhole/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mail/pigeonhole/Makefile b/mail/pigeonhole/Makefile index 04e1b1eb5..7192463ed 100644 --- a/mail/pigeonhole/Makefile +++ b/mail/pigeonhole/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dovecot-pigeonhole -PKG_VERSION_PLUGIN:=0.5.18 +PKG_VERSION_PLUGIN:=0.5.19 PKG_VERSION_DOVECOT:=$(shell make --no-print-directory -C ../dovecot/ val.PKG_VERSION V=s) PKG_VERSION:=$(PKG_VERSION_DOVECOT)-$(PKG_VERSION_PLUGIN) -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 DOVECOT_VERSION:=2.3 PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN).tar.gz PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION) -PKG_HASH:=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 +PKG_HASH:=637709a83fb1338c918e5398049f96b7aeb5ae00696794ed1e5a4d4c0ca3f688 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 72f683ec273c4b24ccf4951c4b408279a60bcdf7 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:10:20 -0600 Subject: [PATCH 19/65] hwloc: update to 2.8.0 Signed-off-by: W. Michael Petullo --- libs/hwloc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/hwloc/Makefile b/libs/hwloc/Makefile index 3b8637815..cc3dc9f20 100644 --- a/libs/hwloc/Makefile +++ b/libs/hwloc/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hwloc -PKG_VERSION:=2.7.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.8.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.7 -PKG_HASH:=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d +PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.8 +PKG_HASH:=348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause From 63816dab84b55ea24728dee5bd05d26b7a70a889 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 19:17:14 -0600 Subject: [PATCH 20/65] quota: update to 4.09 Signed-off-by: W. Michael Petullo --- utils/quota/Makefile | 4 ++-- utils/quota/patches/010-cdefs.patch | 18 ------------------ .../patches/020-remove-reallocarray.patch | 11 ----------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 utils/quota/patches/010-cdefs.patch delete mode 100644 utils/quota/patches/020-remove-reallocarray.patch diff --git a/utils/quota/Makefile b/utils/quota/Makefile index 74b59429c..bb844173a 100644 --- a/utils/quota/Makefile +++ b/utils/quota/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quota -PKG_VERSION:=4.06 +PKG_VERSION:=4.09 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linuxquota -PKG_HASH:=2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d +PKG_HASH:=9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/quota/patches/010-cdefs.patch b/utils/quota/patches/010-cdefs.patch deleted file mode 100644 index a44978e7e..000000000 --- a/utils/quota/patches/010-cdefs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/quota.h -+++ b/quota.h -@@ -1,7 +1,6 @@ - #ifndef GUARD_QUOTA_H - #define GUARD_QUOTA_H - --#include - #include - #include - -@@ -182,6 +181,6 @@ enum { - #endif - #endif - --long quotactl __P((int, const char *, qid_t, caddr_t)); -+long quotactl (int, const char *, qid_t, caddr_t); - - #endif /* _QUOTA_ */ diff --git a/utils/quota/patches/020-remove-reallocarray.patch b/utils/quota/patches/020-remove-reallocarray.patch deleted file mode 100644 index 75c7a5d9b..000000000 --- a/utils/quota/patches/020-remove-reallocarray.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/quota.c -+++ b/quota.c -@@ -385,7 +385,7 @@ int main(int argc, char **argv) - break; - case 259: - fscount++; -- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); -+ fsnames = realloc(fsnames, fscount * sizeof(char *)); - if (!fsnames) - die(1, _("Not enough memory for filesystem names")); - fsnames[fscount - 1] = optarg; From d28c3a295532d88e3b94060e8ad6412b1711067d Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:13:21 -0600 Subject: [PATCH 21/65] openldap: update to 2.6.3 Signed-off-by: W. Michael Petullo --- libs/openldap/Makefile | 6 +++--- libs/openldap/patches/001-automake-compat.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 89f35dfc5..3c5642266 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap -PKG_VERSION:=2.6.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.6.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \ https://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/ -PKG_HASH:=81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 +PKG_HASH:=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46 PKG_LICENSE:=OLDAP-2.8 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openldap:openldap diff --git a/libs/openldap/patches/001-automake-compat.patch b/libs/openldap/patches/001-automake-compat.patch index c1d4e86da..d1e4b2aa9 100644 --- a/libs/openldap/patches/001-automake-compat.patch +++ b/libs/openldap/patches/001-automake-compat.patch @@ -62,7 +62,7 @@ +SHELL = @SHELL@ + SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \ - session.c subst.c var.c xmap.c \ + session.c subst.c var.c xmap.c escapemap.c \ parse.c rewrite.c --- a/libraries/Makefile.in +++ b/libraries/Makefile.in From bd7dd5b7a3f677bf0ee1f13abe30b23c767271a9 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:11:12 -0600 Subject: [PATCH 22/65] libsoup: update to 2.74.3 Signed-off-by: W. Michael Petullo --- libs/libsoup/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index a6c77dc95..6c87fdb11 100644 --- a/libs/libsoup/Makefile +++ b/libs/libsoup/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup -PKG_VERSION:=2.74.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.74.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.74 -PKG_HASH:=f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159 +PKG_HASH:=e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later From 7eb62f460165466fc6559d06fb25dbdf91723736 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:11:44 -0600 Subject: [PATCH 23/65] libsoup3: update to 3.2.2 Signed-off-by: W. Michael Petullo --- libs/libsoup3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile index b911fb788..b322cc876 100644 --- a/libs/libsoup3/Makefile +++ b/libs/libsoup3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup3 -PKG_VERSION:=3.2.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.2.2 +PKG_RELEASE:=1 PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libsoup/3.2 -PKG_HASH:=b1eb3d2c3be49fbbd051a71f6532c9626bcecea69783190690cd7e4dfdf28f29 +PKG_HASH:=83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo From 6957a4275afb3ec8c08dbed3146b42be67984933 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Dec 2022 23:20:06 +0000 Subject: [PATCH 24/65] MarkupSafe: update to version 2.1.1 Version 2.1.1 Released 2022-03-14 Avoid ambiguous regex matches in striptags. pallets/markupsafe#293 Signed-off-by: Daniel Golle --- lang/python/MarkupSafe/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/MarkupSafe/Makefile b/lang/python/MarkupSafe/Makefile index 9a01871f4..177f072e7 100644 --- a/lang/python/MarkupSafe/Makefile +++ b/lang/python/MarkupSafe/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=MarkupSafe -PKG_VERSION:=2.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.1 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f +PKG_HASH:=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause From d99b5473e512ced7097c44c0d60ed6a784284bb2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Dec 2022 23:20:59 +0000 Subject: [PATCH 25/65] Werkzeug: update to version 2.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 2.2.2 Released 2022-08-08 Fix router to restore the 2.1 strict_slashes == False behaviour whereby leaf-requests match branch rules and vice versa. pallets/werkzeug#2489 Fix router to identify invalid rules rather than hang parsing them, and to correctly parse / within converter arguments. pallets/werkzeug#2489 Update subpackage imports in werkzeug.routing to use the import as syntax for explicitly re-exporting public attributes. pallets/werkzeug#2493 Parsing of some invalid header characters is more robust. pallets/werkzeug#2494 When starting the development server, a warning not to use it in a production deployment is always shown. pallets/werkzeug#2480 LocalProxy.__wrapped__ is always set to the wrapped object when the proxy is unbound, fixing an issue in doctest that would cause it to fail. pallets/werkzeug#2485 Address one ResourceWarning related to the socket used by run_simple. pallets/werkzeug#2421 Version 2.2.1 Released 2022-07-27 Fix router so that /path/ will match a rule /path if strict slashes mode is disabled for the rule. pallets/werkzeug#2467 Fix router so that partial part matches are not allowed i.e. /2df does not match /. pallets/werkzeug#2470 Fix router static part weighting, so that simpler routes are matched before more complex ones. pallets/werkzeug#2471 Restore ValidationError to be importable from werkzeug.routing. pallets/werkzeug#2465 Version 2.2.0 Released 2022-07-23 Deprecated get_script_name, get_query_string, peek_path_info, pop_path_info, and extract_path_info. pallets/werkzeug#2461 Remove previously deprecated code. pallets/werkzeug#2461 Add MarkupSafe as a dependency and use it to escape values when rendering HTML. pallets/werkzeug#2419 Added the werkzeug.debug.preserve_context mechanism for restoring context-local data for a request when running code in the debug console. pallets/werkzeug#2439 Fix compatibility with Python 3.11 by ensuring that end_lineno and end_col_offset are present on AST nodes. pallets/werkzeug#2425 Add a new faster matching router based on a state machine. pallets/werkzeug#2433 Fix branch leaf path masking branch paths when strict-slashes is disabled. pallets/werkzeug#1074 Names within options headers are always converted to lowercase. This matches RFC 6266 that the case is not relevant. pallets/werkzeug#2442 AnyConverter validates the value passed for it when building URLs. pallets/werkzeug#2388 The debugger shows enhanced error locations in tracebacks in Python 3.11. pallets/werkzeug#2407 Added Sans-IO is_resource_modified and parse_cookie functions based on WSGI versions. pallets/werkzeug#2408 Added Sans-IO get_content_length function. pallets/werkzeug#2415 Don’t assume a mimetype for test responses. pallets/werkzeug#2450 Type checking FileStorage accepts os.PathLike. pallets/werkzeug#2418 Version 2.1.2 Released 2022-04-28 The development server does not set Transfer-Encoding: chunked for 1xx, 204, 304, and HEAD responses. pallets/werkzeug#2375 Response HTML for exceptions and redirects starts with and . pallets/werkzeug#2390 Fix ability to set some cache_control attributes to False. pallets/werkzeug#2379 Disable keep-alive connections in the development server, which are not supported sufficiently by Python’s http.server. pallets/werkzeug#2397 Version 2.1.1 Released 2022-04-01 ResponseCacheControl.s_maxage converts its value to an int, like max_age. pallets/werkzeug#2364 Version 2.1.0 Released 2022-03-28 Drop support for Python 3.6. pallets/werkzeug#2277 Using gevent or eventlet requires greenlet>=1.0 or PyPy>=7.3.7. werkzeug.locals and contextvars will not work correctly with older versions. pallets/werkzeug#2278 Remove previously deprecated code. pallets/werkzeug#2276 Remove the non-standard shutdown function from the WSGI environ when running the development server. See the docs for alternatives. Request and response mixins have all been merged into the Request and Response classes. The user agent parser and the useragents module is removed. The user_agent module provides an interface that can be subclassed to add a parser, such as ua-parser. By default it only stores the whole string. The test client returns TestResponse instances and can no longer be treated as a tuple. All data is available as properties on the response. Remove locals.get_ident and related thread-local code from locals, it no longer makes sense when moving to a contextvars-based implementation. Remove the python -m werkzeug.serving CLI. The has_key method on some mapping datastructures; use key in data instead. Request.disable_data_descriptor is removed, pass shallow=True instead. Remove the no_etag parameter from Response.freeze(). Remove the HTTPException.wrap class method. Remove the cookie_date function. Use http_date instead. Remove the pbkdf2_hex, pbkdf2_bin, and safe_str_cmp functions. Use equivalents in hashlib and hmac modules instead. Remove the Href class. Remove the HTMLBuilder class. Remove the invalidate_cached_property function. Use del obj.attr instead. Remove bind_arguments and validate_arguments. Use Signature.bind() and inspect.signature() instead. Remove detect_utf_encoding, it’s built-in to json.loads. Remove format_string, use string.Template instead. Remove escape and unescape. Use MarkupSafe instead. The multiple parameter of parse_options_header is deprecated. pallets/werkzeug#2357 Rely on PEP 538 and PEP 540 to handle decoding file names with the correct filesystem encoding. The filesystem module is removed. pallets/werkzeug#1760 Default values passed to Headers are validated the same way values added later are. pallets/werkzeug#1608 Setting CacheControl int properties, such as max_age, will convert the value to an int. pallets/werkzeug#2230 Always use socket.fromfd when restarting the dev server. pallets/werkzeug#2287 When passing a dict of URL values to Map.build, list values do not filter out None or collapse to a single value. Passing a MultiDict does collapse single items. This undoes a previous change that made it difficult to pass a list, or None values in a list, to custom URL converters. pallets/werkzeug#2249 run_simple shows instructions for dealing with “address already in use” errors, including extra instructions for macOS. pallets/werkzeug#2321 Extend list of characters considered always safe in URLs based on RFC 3986. pallets/werkzeug#2319 Optimize the stat reloader to avoid watching unnecessary files in more cases. The watchdog reloader is still recommended for performance and accuracy. pallets/werkzeug#2141 The development server uses Transfer-Encoding: chunked for streaming responses when it is configured for HTTP/1.1. pallets/werkzeug#2090, pallets/werkzeug#1327, pallets/werkzeug#2091 The development server uses HTTP/1.1, which enables keep-alive connections and chunked streaming responses, when threaded or processes is enabled. pallets/werkzeug#2323 cached_property works for classes with __slots__ if a corresponding _cache_{name} slot is added. pallets/werkzeug#2332 Refactor the debugger traceback formatter to use Python’s built-in traceback module as much as possible. pallets/werkzeug#1753 The TestResponse.text property is a shortcut for r.get_data(as_text=True), for convenient testing against text instead of bytes. pallets/werkzeug#2337 safe_join ensures that the path remains relative if the trusted directory is the empty string. pallets/werkzeug#2349 Percent-encoded newlines (%0a), which are decoded by WSGI servers, are considered when routing instead of terminating the match early. pallets/werkzeug#2350 The test client doesn’t set duplicate headers for CONTENT_LENGTH and CONTENT_TYPE. pallets/werkzeug#2348 append_slash_redirect handles PATH_INFO with internal slashes. pallets/werkzeug#1972, pallets/werkzeug#2338 The default status code for append_slash_redirect is 308 instead of 301. This preserves the request body, and matches a previous change to strict_slashes in routing. pallets/werkzeug#2351 Fix ValueError: I/O operation on closed file. with the test client when following more than one redirect. pallets/werkzeug#2353 Response.autocorrect_location_header is disabled by default. The Location header URL will remain relative, and exclude the scheme and domain, by default. pallets/werkzeug#2352 Request.get_json() will raise a 400 BadRequest error if the Content-Type header is not application/json. This makes a very common source of confusion more visible. pallets/werkzeug#2339 Version 2.0.3 Released 2022-02-07 ProxyFix supports IPv6 addresses. pallets/werkzeug#2262 Type annotation for Response.make_conditional, HTTPException.get_response, and Map.bind_to_environ accepts Request in addition to WSGIEnvironment for the first parameter. pallets/werkzeug#2290 Fix type annotation for Request.user_agent_class. pallets/werkzeug#2273 Accessing LocalProxy.__class__ and __doc__ on an unbound proxy returns the fallback value instead of a method object. pallets/werkzeug#2188 Redirects with the test client set RAW_URI and REQUEST_URI correctly. pallets/werkzeug#2151 Signed-off-by: Daniel Golle --- lang/python/Werkzeug/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/Werkzeug/Makefile b/lang/python/Werkzeug/Makefile index dc14af70e..3c2b5df17 100644 --- a/lang/python/Werkzeug/Makefile +++ b/lang/python/Werkzeug/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Werkzeug -PKG_VERSION:=2.0.2 +PKG_VERSION:=2.2.2 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a +PKG_HASH:=7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause From b5880a91a7b41cb839b644c5fd2ff21d329929a6 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Dec 2022 23:20:35 +0000 Subject: [PATCH 26/65] itsdangerous: update to version 2.1.2 Version 2.1.2 Released 2022-03-24 Handle date overflow in timed unsign on 32-bit systems. pallets/itsdangerous#299 Version 2.1.1 Released 2022-03-09 Handle date overflow in timed unsign. pallets/itsdangerous#296 Version 2.1.0 Released 2022-02-17 Drop support for Python 3.6. pallets/itsdangerous#272 Remove previously deprecated code. pallets/itsdangerous#273 JWS functionality: Use a dedicated library such as Authlib instead. import itsdangerous.json: Import json from the standard library instead. Signed-off-by: Daniel Golle --- lang/python/itsdangerous/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/itsdangerous/Makefile b/lang/python/itsdangerous/Makefile index 423d80adc..6a364eb80 100644 --- a/lang/python/itsdangerous/Makefile +++ b/lang/python/itsdangerous/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=itsdangerous -PKG_VERSION:=2.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.2 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 +PKG_HASH:=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause From 2262a023feb545d07a3cbc014d7369d9e0f58032 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Dec 2022 17:43:18 +0000 Subject: [PATCH 27/65] click: update to version 8.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 8.1.3 Released 2022-04-28 Use verbose form of typing.Callable for @command and @group. pallets/click#2255 Show error when attempting to create an option with multiple=True, is_flag=True. Use count instead. pallets/click#2246 Version 8.1.2 Released 2022-03-31 Fix error message for readable path check that was mixed up with the executable check. pallets/click#2236 Restore parameter order for Path, placing the executable parameter at the end. It is recommended to use keyword arguments instead of positional arguments. pallets/click#2235 Version 8.1.1 Released 2022-03-30 Fix an issue with decorator typing that caused type checking to report that a command was not callable. pallets/click#2227 Version 8.1.0 Released 2022-03-28 Drop support for Python 3.6. pallets/click#2129 Remove previously deprecated code. pallets/click#2130 Group.resultcallback is renamed to result_callback. autocompletion parameter to Command is renamed to shell_complete. get_terminal_size is removed, use shutil.get_terminal_size instead. get_os_args is removed, use sys.argv[1:] instead. Rely on PEP 538 and PEP 540 to handle selecting UTF-8 encoding instead of ASCII. Click’s locale encoding detection is removed. pallets/click#2198 Single options boolean flags with show_default=True only show the default if it is True. pallets/click#1971 The command and group decorators can be applied with or without parentheses. pallets/click#1359 The Path type can check whether the target is executable. pallets/click#1961 Command.show_default overrides Context.show_default, instead of the other way around. pallets/click#1963 Parameter decorators and @group handles cls=None the same as not passing cls. @option handles help=None the same as not passing help. pallets/click#1959 A flag option with required=True requires that the flag is passed instead of choosing the implicit default value. pallets/click#1978 Indentation in help text passed to Option and Command is cleaned the same as using the @option and @command decorators does. A command’s epilog and short_help are also processed. pallets/click#1985 Store unprocessed Command.help, epilog and short_help strings. Processing is only done when formatting help text for output. pallets/click#2149 Allow empty str input for prompt() when confirmation_prompt=True and default="". pallets/click#2157 Windows glob pattern expansion doesn’t fail if a value is an invalid pattern. pallets/click#2195 It’s possible to pass a list of params to @command. Any params defined with decorators are appended to the passed params. pallets/click#2131 @command decorator is annotated as returning the correct type if a cls argument is used. pallets/click#2211 A Group with invoke_without_command=True and chain=False will invoke its result callback with the group function’s return value. pallets/click#2124 to_info_dict will not fail if a ParamType doesn’t define a name. pallets/click#2168 Shell completion prioritizes option values with option prefixes over new options. pallets/click#2040 Options that get an environment variable value using autoenvvar_prefix treat an empty value as None, consistent with a direct envvar. pallets/click#2146 Version 8.0.4 Released 2022-02-18 open_file recognizes Path("-") as a standard stream, the same as the string "-". pallets/click#2106 The option and argument decorators preserve the type annotation of the decorated function. pallets/click#2155 A callable default value can customize its help text by overriding __str__ instead of always showing (dynamic). pallets/click#2099 Fix a typo in the Bash completion script that affected file and directory completion. If this script was generated by a previous version, it should be regenerated. pallets/click#2163 Fix typing for echo and secho file argument. pallets/click#2174, pallets/click#2185 Signed-off-by: Daniel Golle --- lang/python/click/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/click/Makefile b/lang/python/click/Makefile index 74223fe5b..7babd28b3 100644 --- a/lang/python/click/Makefile +++ b/lang/python/click/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=click -PKG_VERSION:=8.0.3 +PKG_VERSION:=8.1.3 PKG_RELEASE:=1 PYPI_NAME:=click -PKG_HASH:=410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b +PKG_HASH:=7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause From a54c2caa9c1d33c4accf724f00cb7a601899001e Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:08:38 -0600 Subject: [PATCH 28/65] luasocket: update to 3.1.0 Signed-off-by: W. Michael Petullo --- lang/luasocket/Makefile | 10 +++++----- .../luasocket/patches/0001-Add-interface-support.patch | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile index c0b07e3cb..7125f78c1 100644 --- a/lang/luasocket/Makefile +++ b/lang/luasocket/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasocket -PKG_VERSION:=3.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lunarmodules/luasocket/archive/refs/tags -PKG_HASH:=04d98e40edcee7c7c5f83f0e8ba5503d14b56280e20daceee9e34ed7cf8f1b15 +PKG_HASH:=bf033aeb9e62bcaa8d007df68c119c966418e8c9ef7e4f2d7e96bddeca9cca6e PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT @@ -76,13 +76,13 @@ define Package/luasocket/install $(INSTALL_DIR) $(1)/usr/lib/lua $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime-1.0.3.so $(1)/usr/lib/lua - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket-3.0-rc1.so $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket-3.0.0.so $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/lua/mime ln -sf ../mime-1.0.3.so $(1)/usr/lib/lua/mime/core.so $(INSTALL_DIR) $(1)/usr/lib/lua/socket $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url,headers}.lua $(1)/usr/lib/lua/socket $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/unix.so $(1)/usr/lib/lua/socket - ln -sf ../socket-3.0-rc1.so $(1)/usr/lib/lua/socket/core.so + ln -sf ../socket-3.0.0.so $(1)/usr/lib/lua/socket/core.so endef diff --git a/lang/luasocket/patches/0001-Add-interface-support.patch b/lang/luasocket/patches/0001-Add-interface-support.patch index 43c74e9f5..d7bfe2bb8 100644 --- a/lang/luasocket/patches/0001-Add-interface-support.patch +++ b/lang/luasocket/patches/0001-Add-interface-support.patch @@ -213,7 +213,7 @@ Subject: [PATCH] Add interface resolving /*=========================================================================*\ * Internal functions prototypes \*=========================================================================*/ -@@ -389,6 +392,12 @@ static int opt_ip6_setmembership(lua_Sta +@@ -414,6 +417,12 @@ static int opt_ip6_setmembership(lua_Sta if (!lua_isnil(L, -1)) { if (lua_isnumber(L, -1)) { val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1); From da564ae8cca1d481a991aa28d062a17ca81a4b97 Mon Sep 17 00:00:00 2001 From: Waldemar Konik Date: Tue, 20 Dec 2022 16:44:15 +0100 Subject: [PATCH 29/65] python-curl: update to version 7.45.2 PycURL changeLog: ----------------------------------------------------------------- PycURL 7.45.2 - 2022-12-16 ----------------------------------------------------------------- This release fixes several minor issues and adds support for several libcurl options. ----------------------------------------------------------------- PycURL 7.45.1 - 2022-03-13 ----------------------------------------------------------------- This release fixes build when libcurl < 7.64.1 is used. ----------------------------------------------------------------- PycURL 7.45.0 - 2022-03-09 ----------------------------------------------------------------- This release adds support for SecureTransport SSL backend (MacOS), adds ability to unset a number of multi options, adds ability to duplicate easy handles and permits pycurl classes to be subclassed. ----------------------------------------------------------------- PycURL 7.44.1 - 2021-08-15 ----------------------------------------------------------------- This release repairs incorrect Python thread initialization logic which caused operations to hang. ----------------------------------------------------------------- Signed-off-by: Waldemar Konik Compile tested: x86_64 --- lang/python/python-curl/Makefile | 6 +++--- lang/python/python-curl/patches/100_macos_compat.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/python-curl/Makefile b/lang/python/python-curl/Makefile index 630ccd941..4f46dc5fc 100644 --- a/lang/python/python-curl/Makefile +++ b/lang/python/python-curl/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pycurl -PKG_VERSION:=7.44.0 -PKG_RELEASE:=2 +PKG_VERSION:=7.45.2 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=2ce9905626d8ceafcbadee666e2f45397e29c7618ddcdc63fc22d85e5046c6d6 +PKG_HASH:=5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca PKG_MAINTAINER:=Waldemar Konik PKG_LICENSE:=LGPL-2.1 diff --git a/lang/python/python-curl/patches/100_macos_compat.patch b/lang/python/python-curl/patches/100_macos_compat.patch index fc233da2a..ba5e0b8da 100644 --- a/lang/python/python-curl/patches/100_macos_compat.patch +++ b/lang/python/python-curl/patches/100_macos_compat.patch @@ -3,7 +3,7 @@ This patch should be deleted after resolving https://github.com/pycurl/pycurl/is --- --- a/setup.py +++ b/setup.py -@@ -347,9 +347,6 @@ manually. For other SSL backends please +@@ -341,9 +341,6 @@ ignore this message.''') if not self.libraries: self.libraries.append("curl") From 8e7a31b19edda1117de5a1e1a22c051d6d168626 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:12:40 -0600 Subject: [PATCH 30/65] gst1-libav: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gst1-libav/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 766478916..5ea8a813e 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-libav -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav -PKG_HASH:=b5c531dd8413bf771c79dab66b8e389f20b3991f745115133f0fa0b8e32809f9 +PKG_HASH:=04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ From e059dbf9802ba4d89f7b5f1a211e8131dd967331 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:16:26 -0600 Subject: [PATCH 31/65] gst1-plugins-bad: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gst1-plugins-bad/Makefile | 6 +++--- multimedia/gst1-plugins-bad/patches/010-distutils.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index cc6e29f89..7dace2b53 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -PKG_HASH:=4adc4c05f41051f8136b80cda99b0d049a34e777832f9fea7c5a70347658745b +PKG_HASH:=a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-bad/patches/010-distutils.patch b/multimedia/gst1-plugins-bad/patches/010-distutils.patch index 691362d59..fbea8ae10 100644 --- a/multimedia/gst1-plugins-bad/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-bad/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -468,7 +468,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H +@@ -467,7 +467,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H configinc = include_directories('.') libsinc = include_directories('gst-libs') From 4a11b1b335107e8cb51dbb8a97a107a87d256bbc Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:17:31 -0600 Subject: [PATCH 32/65] gst1-plugins-base: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gst1-plugins-base/Makefile | 6 +++--- multimedia/gst1-plugins-base/patches/010-distutils.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 007b760e1..ce06a0710 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base -PKG_HASH:=ab0656f2ad4d38292a803e0cb4ca090943a9b43c8063f650b4d3e3606c317f17 +PKG_HASH:=8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-base/patches/010-distutils.patch b/multimedia/gst1-plugins-base/patches/010-distutils.patch index 10322a719..388860e0a 100644 --- a/multimedia/gst1-plugins-base/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-base/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -457,7 +457,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] +@@ -456,7 +456,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] meson_pkg_config_file_fixup_script = find_program('scripts/meson-pkg-config-file-fixup.py') From fb3edc1bac451d6c56fd1f5e530d36e0d2ee52c3 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:17:58 -0600 Subject: [PATCH 33/65] gst1-plugins-good: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gst1-plugins-good/Makefile | 6 +++--- multimedia/gst1-plugins-good/patches/010-distutils.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 32d55dc6c..311d8ba3d 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_HASH:=83589007bf002b8f9ef627718f308c16d83351905f0db8e85c3060f304143aae +PKG_HASH:=b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-good/patches/010-distutils.patch b/multimedia/gst1-plugins-good/patches/010-distutils.patch index 0e30a9eee..7092bfcda 100644 --- a/multimedia/gst1-plugins-good/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-good/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -441,7 +441,7 @@ endif +@@ -434,7 +434,7 @@ endif presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets') From 9497dc4214a2703aa41e625ecb753f8b957ee654 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:18:22 -0600 Subject: [PATCH 34/65] gst1-plugins-ugly: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gst1-plugins-ugly/Makefile | 6 +++--- multimedia/gst1-plugins-ugly/patches/010-distutils.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index aacc4aa08..44358fa17 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly -PKG_HASH:=b43fb4df94459afbf67ec22003ca58ffadcd19e763f276dca25b64c848adb7bf +PKG_HASH:=5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch index b0bf4ebce..9f1b2efab 100644 --- a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -279,7 +279,7 @@ endif +@@ -278,7 +278,7 @@ endif gpl_allowed = get_option('gpl').allowed() From 55d521af4bce178b0bf1a5fd8460aa05739ad19b Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 20 Dec 2022 08:18:49 -0600 Subject: [PATCH 35/65] gstreamer1: update to 1.20.4 Removed deprecated use of AUTORELEASE, and refreshed patches. Signed-off-by: W. Michael Petullo --- multimedia/gstreamer1/Makefile | 6 +++--- .../patches/010-gstplugin-use-lazy-symbol-binding.patch | 2 +- multimedia/gstreamer1/patches/020-distutils.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 26da641a5..6fe3a6399 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer -PKG_HASH:=df24e8792691a02dfe003b3833a51f1dbc6c3331ae625d143b17da939ceb5e0a +PKG_HASH:=67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index 8cf5238ab..bdd6f2254 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,6 +1,6 @@ --- a/gst/gstplugin.c +++ b/gst/gstplugin.c -@@ -851,15 +851,8 @@ _priv_gst_plugin_load_file_for_registry +@@ -854,15 +854,8 @@ _priv_gst_plugin_load_file_for_registry } #endif diff --git a/multimedia/gstreamer1/patches/020-distutils.patch b/multimedia/gstreamer1/patches/020-distutils.patch index 7dfbe7d3b..302377854 100644 --- a/multimedia/gstreamer1/patches/020-distutils.patch +++ b/multimedia/gstreamer1/patches/020-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -528,7 +528,7 @@ if get_option('default_library') == 'sta +@@ -527,7 +527,7 @@ if get_option('default_library') == 'sta endif # Used in gst/parse/meson.build and below From 8d638fe83548974d5f3921371920c0c8c0410fec Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Thu, 22 Dec 2022 15:01:37 -0800 Subject: [PATCH 36/65] boost: refresh GCC options in Makefile this Makefile still used `CONFIG_GCC_USE_VERSION_*` to select various compilation options, for GCC versions that are antiquated convert to parsing the major from the `CONFIG_GCC_VERSION` which will always exist and can also be used with range logic intent seemed to be: * `-std=gnu++20` for "=10" (and newer, probably) * `-std=gnu++14` for "=5" * `-std=gnu++17` for "not =10 and not =5" GCC 11 or 12 would likely revert to the default (6 through 9) option with those, because 10 was the newest at the time, and 11 and 12 are "not =10 and not =5" probably the GCC 5 support could be removed, not sure about 9 and 10 Signed-off-by: Tony Butler --- libs/boost/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/boost/Makefile b/libs/boost/Makefile index 4fe77be5c..9180e9ecb 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -384,7 +384,13 @@ TARGET_LDFLAGS += -pthread -lrt -lstdc++ -Wl,--gc-sections,--as-needed,--print-g TARGET_CFLAGS += \ $(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC -ffunction-sections -fdata-sections -flto -EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-std=gnu++20,$(if $(CONFIG_GCC_USE_VERSION_5),-std=gnu++14,-std=gnu++17)) +ifeq ($(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION)))),5) + EXTRA_CXXFLAGS += -std=gnu++14 +else ifneq ($(filter-out 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),) + EXTRA_CXXFLAGS += -std=gnu++17 +else + EXTRA_CXXFLAGS += -std=gnu++20 +endif ifneq ($(findstring mips,$(ARCH)),) BOOST_ABI = o32 From a2effac2623d18581694975b2f6f718b272d3b8d Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Thu, 22 Dec 2022 15:14:40 -0800 Subject: [PATCH 37/65] graphicsmagick: refresh GCC options in Makefile this Makefile still used `CONFIG_GCC_USE_VERSION_*` to select various compilation options, for GCC versions that are antiquated convert to parsing the major from the `CONFIG_GCC_VERSION` which will always exist and can also be used with range logic intent seemed to be: * `-flto` for "not =10" (or newer, probably) * no additional options for "=10" (and newer, probably) GCC 11 or 12 would likely revert to the default (not =10) option, because 10 was the newest at the time, and 11 and 12 are "not 10" unsure of what actually works, perhaps `-flto` works in all versions by now (possibly early gcc 10 bug workaround?) GCC 11 will have been using `-flto` anyway by the current logic and I guess it must be working or there would have been changes Signed-off-by: Tony Butler --- multimedia/graphicsmagick/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/graphicsmagick/Makefile b/multimedia/graphicsmagick/Makefile index ff104fdeb..70a340864 100644 --- a/multimedia/graphicsmagick/Makefile +++ b/multimedia/graphicsmagick/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS += \ --without-zstd \ --without-x -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),,-flto) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),,-flto) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From ac09d1c2f1577a40dcf4eb0e3477a0a6b423ad8b Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Thu, 22 Dec 2022 15:24:45 -0800 Subject: [PATCH 38/65] imagemagick: refresh GCC options in Makefile this Makefile still used `CONFIG_GCC_USE_VERSION_*` to select various compilation options, for GCC versions that are antiquated convert to parsing the major from the `CONFIG_GCC_VERSION` which will always exist and can also be used with range logic intent seemed to be: * `-flto` for "not =10" (or newer, probably) * no additional options for "=10" (and newer, probably) GCC 11 or 12 would likely revert to the default (not =10) option, because 10 was the newest at the time, and 11 and 12 are "not 10" unsure of what actually works, perhaps `-flto` works in all versions by now (possibly early gcc 10 bug workaround?) GCC 11 will have been using `-flto` anyway by the current logic and I guess it must be working or there would have been changes Signed-off-by: Tony Butler --- multimedia/imagemagick/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/imagemagick/Makefile b/multimedia/imagemagick/Makefile index 53f69720e..8c4e97775 100644 --- a/multimedia/imagemagick/Makefile +++ b/multimedia/imagemagick/Makefile @@ -110,7 +110,7 @@ CONFIGURE_ARGS += \ --with-png \ --with-tiff -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),,-flto) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),,-flto) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From ac78a5a21fded24cb3995967b9dc1ec042777e62 Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Thu, 22 Dec 2022 15:26:21 -0800 Subject: [PATCH 39/65] gnupg2: refresh GCC options in Makefile this Makefile still used `CONFIG_GCC_USE_VERSION_*` to select various compilation options, for GCC versions that are antiquated convert to parsing the major from the `CONFIG_GCC_VERSION` which will always exist and can also be used with range logic intent seemed to be: * `-DEXTERN_UNLESS_MAIN_MODULE=static` for "=10" (and newer, probably) * no additional options for "not =10" (or older, probably) GCC 11 or 12 would likely revert to the default (not =10) option, because 10 was the newest at the time, and 11 and 12 are "not 10" Signed-off-by: Tony Butler --- utils/gnupg2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/gnupg2/Makefile b/utils/gnupg2/Makefile index ce81a88b9..5982d3d1d 100644 --- a/utils/gnupg2/Makefile +++ b/utils/gnupg2/Makefile @@ -104,7 +104,7 @@ CONFIGURE_ARGS += \ --disable-tests \ --disable-zip -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-DEXTERN_UNLESS_MAIN_MODULE=static) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),-DEXTERN_UNLESS_MAIN_MODULE=static) define Package/gnupg2/install $(INSTALL_DIR) $(1)/usr/bin From df0b2eedd6d0b7f81851860afdee1b135850c115 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 11:14:39 -0600 Subject: [PATCH 40/65] krb5: update to 1.20.1 Besides updating the package to 1.20.1, this commit removed two patches that the new release made unnecessary. Signed-off-by: W. Michael Petullo --- net/krb5/Makefile | 8 +-- ...001-fix-uninitialized-warning-errors.patch | 55 ------------------- ...move_unnecessary_flag_in_macos_build.patch | 44 --------------- 3 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 net/krb5/patches/001-fix-uninitialized-warning-errors.patch delete mode 100644 net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch diff --git a/net/krb5/Makefile b/net/krb5/Makefile index 0660515f8..bdad2543b 100644 --- a/net/krb5/Makefile +++ b/net/krb5/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=krb5 -PKG_VERSION:=1.19.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -18,8 +18,8 @@ PKG_LICENSE_FILES:=NOTICE PKG_CPE_ID:=cpe:/a:mit:kerberos PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.19 -PKG_HASH:=56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0 +PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.20 +PKG_HASH:=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch deleted file mode 100644 index 6d1e373dd..000000000 --- a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/src/kadmin/ktutil/ktutil_funcs.c -+++ b/src/kadmin/ktutil/ktutil_funcs.c -@@ -65,7 +65,7 @@ krb5_error_code ktutil_delete(context, l - krb5_kt_list *list; - int idx; - { -- krb5_kt_list lp, prev; -+ krb5_kt_list lp, prev = NULL; - int i; - - for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { ---- a/src/lib/kadm5/str_conv.c -+++ b/src/lib/kadm5/str_conv.c -@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int - { - int found = 0, invert = 0; - size_t i; -- krb5_flags flag; -+ krb5_flags flag = 0; - unsigned long ul; - - for (i = 0; !found && i < NFTBL; i++) { ---- a/src/lib/krad/packet.c -+++ b/src/lib/krad/packet.c -@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx - { - krb5_error_code retval; - krad_packet *pkt; -- uchar id; -+ uchar id = 0; - size_t attrset_len; - - pkt = packet_new(); ---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -3646,7 +3646,7 @@ pkinit_open_session(krb5_context context - { - CK_ULONG i, r; - unsigned char *cp; -- size_t label_len; -+ size_t label_len = 0; - CK_ULONG count = 0; - CK_SLOT_ID_PTR slotlist; - CK_TOKEN_INFO tinfo; ---- a/src/util/profile/prof_file.c -+++ b/src/util/profile/prof_file.c -@@ -270,7 +270,7 @@ errcode_t profile_update_file_data_locke - unsigned long frac; - time_t now; - #endif -- FILE *f; -+ FILE *f = NULL; - int isdir = 0; - - if ((data->flags & PROFILE_FILE_NO_RELOAD) && data->root != NULL) diff --git a/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch b/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch deleted file mode 100644 index 55aa7ac1c..000000000 --- a/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 3c66c1fec7ce4edeff284a5e4abe32d0b4398539 -Author: Nikhil Benesch -Date: Wed Dec 22 18:58:17 2021 -0500 - - Remove unnecessary flag in macOS build - - The configuration logic for adding the `-search_paths_first` linker - flag on Darwin does not correctly handle cross compilation. It should - check the value of $krb5_cv_host rather than `uname -s` to detect when - the compilation target is Darwin, rather than the build machine. - - It turns out `-search_paths_first` has been the default behavior of ld - on macOS since XCode 4. So just remove that bit of logic entirely. - (The flag was added in commit acd27af0e845f8b93de2e226cc2ec9ac8af52077 - in 2004; XCode 4 was released in 2010.) - - [ghudson@mit.edu: edited commit message] - ---- a/src/aclocal.m4 -+++ b/src/aclocal.m4 -@@ -585,10 +585,6 @@ if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -fno-common" - ;; - esac -- case "$LD $LDFLAGS" in -- *-Wl,-search_paths_first*) ;; -- *) LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" ;; -- esac - fi - else - if test "`uname -s`" = AIX ; then ---- a/src/configure -+++ b/src/configure -@@ -4978,10 +4978,6 @@ $as_echo "$as_me: disabling the use of c - CFLAGS="$CFLAGS -fno-common" - ;; - esac -- case "$LD $LDFLAGS" in -- *-Wl,-search_paths_first*) ;; -- *) LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" ;; -- esac - fi - else - if test "`uname -s`" = AIX ; then From 4dfb0024f4fcaec0f7eaac5d7abc1126959548e9 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 21 Dec 2022 14:18:47 +0100 Subject: [PATCH 41/65] libgpiod: add missing kernel build options via KCONFIG This library needs the kernel config option 'CONFIG_GPIO_CDEV_V1=y' to be set. If this is not set, the tool 'gpioinfo' produces the error message 'error creating line iterator'. Add the missing kernel config option to build CDEV with API Version 1 fixes this. Signed-off-by: Florian Eckert --- libs/libgpiod/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index a5ece1031..9859dca27 100644 --- a/libs/libgpiod/Makefile +++ b/libs/libgpiod/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpiod PKG_VERSION:=1.6.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/libs/libgpiod/ @@ -43,6 +43,9 @@ define Package/libgpiod CATEGORY:=Libraries URL:=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git TITLE:=Library for interacting with Linux's GPIO character device + KCONFIG:= \ + CONFIG_GPIO_CDEV=y \ + CONFIG_GPIO_CDEV_V1=y DEPENDS:=@GPIO_SUPPORT endef From 85aed680be05e8b9d6f22df793f68079154cdf00 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 22 Dec 2022 12:12:36 +0100 Subject: [PATCH 42/65] libarchive: update to 3.6.2 * fixes CVE-2022-36227 * drop upstreamed patch * removed deprecated AUTORELEASE Signed-off-by: Michal Vasilek --- libs/libarchive/Makefile | 6 +-- ...s-mount.h-when-linux-fs.h-is-present.patch | 39 ------------------- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index ead7b904b..c9db0dcb5 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libarchive -PKG_VERSION:=3.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.6.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libarchive.org/downloads -PKG_HASH:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 +PKG_HASH:=9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=BSD-2-Clause diff --git a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch b/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch deleted file mode 100644 index 812e451c2..000000000 --- a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Jul 2022 10:56:53 -0700 -Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is - present - -These headers are in conflict and only one is needed by -archive_read_disk_posix.c therefore include linux/fs.h if it exists -otherwise include sys/mount.h - -It also helps compiling with glibc 2.36 -where sys/mount.h conflicts with linux/mount.h see [1] - -[1] https://sourceware.org/glibc/wiki/Release/2.36 ---- - libarchive/archive_read_disk_posix.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); - #ifdef HAVE_SYS_PARAM_H - #include - #endif --#ifdef HAVE_SYS_MOUNT_H --#include --#endif - #ifdef HAVE_SYS_STAT_H - #include - #endif -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); - #endif - #ifdef HAVE_LINUX_FS_H - #include -+#elif HAVE_SYS_MOUNT_H -+#include - #endif - /* - * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. From 256f8f76a6c01d9b51dadc278fdf7c9c13165bab Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 22 Dec 2022 13:05:51 +0100 Subject: [PATCH 43/65] libarchive: add missing CONFLICT Signed-off-by: Michal Vasilek --- libs/libarchive/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index c9db0dcb5..95b96a39b 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libarchive PKG_VERSION:=3.6.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libarchive.org/downloads @@ -34,6 +34,7 @@ endef define Package/libarchive $(call Package/libarchive/Default) DEPENDS += +libopenssl + CONFLICTS:=libarchive-noopenssl endef define Package/libarchive-noopenssl From 2f3b939497cbcd0dbedd4544d73ee882d315e0d0 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 19 Dec 2022 20:09:31 -0600 Subject: [PATCH 44/65] python3-networkx: update to 2.8.8 Signed-off-by: W. Michael Petullo --- lang/python/python3-networkx/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python3-networkx/Makefile b/lang/python/python3-networkx/Makefile index 7b7f44b8f..e4d75305b 100644 --- a/lang/python/python3-networkx/Makefile +++ b/lang/python/python3-networkx/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-networkx -PKG_VERSION:=2.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.8.8 +PKG_RELEASE:=1 PYPI_NAME:=networkx -PKG_HASH:=4a52cf66aed221955420e11b3e2e05ca44196b4829aab9576d4d439212b0a14f +PKG_HASH:=230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e PKG_LICENSE:=BSD-3-clause PKG_LICENSE_FILES:=LICENSE.txt From d2f07181bb81779a0ff14b56d252c9d888a9880b Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 25 Dec 2022 02:15:08 +0100 Subject: [PATCH 45/65] zyxel-reset: add package Add the zyxel-reset package. This package allows to trigger a factory-reset for ZyXEL devices by sending a magic LLDP package while the device-to-reset is booting. This is useful for remote-resetting a ZyXEL device running stock firmware connected to a switch using OpenWrt. It also allows to reset devices which do not have a reset-button such as the NWA55AXE. Signed-off-by: David Bauer --- utils/zyxel-reset/Makefile | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 utils/zyxel-reset/Makefile diff --git a/utils/zyxel-reset/Makefile b/utils/zyxel-reset/Makefile new file mode 100644 index 000000000..3839a7102 --- /dev/null +++ b/utils/zyxel-reset/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2022 David Bauer +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=zyxel-reset +PKG_SOURCE_DATE:=2022-12-23 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/blocktrron/zyxel-reset.git +PKG_SOURCE_VERSION:=e1def7b5f117c206afe15aa57ca7433eb972d5d1 +PKG_MIRROR_HASH:=dc02f6afc5d083a7a62ec51b35b352595ef6c99a8192facb1bff7b7f90cec06a + +PKG_MAINTAINER:=David Bauer +PKG_LICENSE:=GPL-2.0-only + +include $(INCLUDE_DIR)/package.mk + +define Package/zyxel-reset + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Trigger factory-reset for ZyXEL APs +endef + +define Package/zyxel-reset/description + This program can trigger a factory-reset on ZyXEL Access Points + running stock-firmware. +endef + +define Package/zyxel-reset/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/zyxel-reset $(1)/usr/bin/zyxel-reset +endef + +$(eval $(call BuildPackage,zyxel-reset)) From f526a1d169eabbeb19e30f7803d08c0607d9107b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Dec 2022 14:57:37 +0800 Subject: [PATCH 46/65] cloudflared: Update to 2022.12.1 Signed-off-by: Tianling Shen --- net/cloudflared/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index cfe971f9b..32680a2ed 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2022.11.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2022.12.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=d4b1133057a721087a0a5387ea6d4d1ebf3b1f5135396da25a1e88e873cd5203 +PKG_HASH:=8cc5c41ea98a9d72687d5f62e733a9033191e834e4fa9b2aecc557f0ccfbda56 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE From 62cc9d2a39d35180f7f98cb7547da06c30795d0b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Dec 2022 14:57:49 +0800 Subject: [PATCH 47/65] dnslookup: Update to 1.8.1 Signed-off-by: Tianling Shen --- net/dnslookup/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/dnslookup/Makefile b/net/dnslookup/Makefile index 4d869cf6f..522e49812 100644 --- a/net/dnslookup/Makefile +++ b/net/dnslookup/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnslookup -PKG_VERSION:=1.8.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ameshkov/dnslookup/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8358291240a27f20f4d635f9a27a9373144b723c4d73ee01374a9ed5c02126bd +PKG_HASH:=51b9cbc626e091eb7a98bc326ad026f36d95f8b5917f71f13011466fcdddb3f9 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT From 4e9c47e5582b69e37c891008a54534ef6627abda Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Dec 2022 14:58:03 +0800 Subject: [PATCH 48/65] dnsproxy: Update to 0.46.5 Signed-off-by: Tianling Shen --- net/dnsproxy/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index a02447e8f..ee6166d68 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.46.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.46.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5c959bd2f08b2304306b8f0b933b20d31a3a3d1ebeb0f349740799e5089fd4ae +PKG_HASH:=604b7e78956ec6d6421807e30ff44d87d85f10203b3d68d397af34ca2013e696 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 From 071e97949f75de5a7dc1d19c48663e01f0c02a00 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Dec 2022 14:58:12 +0800 Subject: [PATCH 49/65] yq: Update to 4.30.6 Signed-off-by: Tianling Shen --- utils/yq/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 4bfa4d96b..980f8bb7a 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.30.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.30.6 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=54706926e44ca8f28c74c0165c4746f372daafd4db885b709fdaf5e8f2e4502c +PKG_HASH:=320d0ce36d1dbe703b4cbdb28e9a927c1e87b157e8c05aeb078d6c9c1b0138ea PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT From 4afc17e6e0784bd507994c0e53e13a5aa21af2d6 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 25 Dec 2022 15:01:03 +0800 Subject: [PATCH 50/65] xray-core: Update to 1.6.6-2 Signed-off-by: Tianling Shen --- net/xray-core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index e231bc796..37549ba53 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=1.6.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.6.6-2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=61956d8d72d086fbf83e6a3aff191d010401aca34f30015f839f8a73bf50914c +PKG_HASH:=228fedbf5b624883ed2b0d1e3acf66842df483aa5a113995a4434314b3e755eb PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 From c67193be6169fec4141b95fafae56a53571b2d47 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 24 Dec 2022 11:18:45 +0800 Subject: [PATCH 51/65] cloudreve: Update to 3.6.2 Signed-off-by: Tianling Shen --- net/cloudreve/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/cloudreve/Makefile b/net/cloudreve/Makefile index 7de8963a4..feee89f34 100644 --- a/net/cloudreve/Makefile +++ b/net/cloudreve/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudreve -PKG_VERSION:=3.5.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.6.2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=c43ec528df19d239b06456e78aae3d9852da5cca372c157b62f1f74b03f5cc0d +PKG_MIRROR_HASH:=134dc707f8befaa9a193a2b0ae2eb2eebd3c5c70c291b5104bed458c63eedbb7 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE From 822d44e8f8637c028b66cdf0ae84869699c24788 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 24 Dec 2022 11:23:26 +0800 Subject: [PATCH 52/65] rclone: Update to 1.61.1 Signed-off-by: Tianling Shen --- net/rclone/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/rclone/Makefile b/net/rclone/Makefile index feb7a39b7..e0b5518fd 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.60.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.61.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b0037124c04fd1c31a1d9ae1c80e25555da3a22d7ab1ae714ed2c02247fbdac5 +PKG_HASH:=f9fb7bae1f19896351db64e3713b67bfd151c49b2b28e6c6233adf67dbc2c899 PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE From e6cc4f9e9eef97873a337549a0297afc680a0ffa Mon Sep 17 00:00:00 2001 From: Robert N Date: Fri, 23 Dec 2022 10:40:03 +0000 Subject: [PATCH 53/65] motion: update to 4.5.0 Signed-off-by: Robert N --- multimedia/motion/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 553be1eae..3800b7543 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion -PKG_VERSION:=4.3.2 +PKG_VERSION:=4.5.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Motion-Project/motion/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 +PKG_HASH:=42320a1c7b54a3f0b5a49cecf34a5d752760b28383bc573b3ca1240581786fe5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_MAINTAINER:=Roger D From 30822cc2fb02c4399109c2d494ff6a9c0184851f Mon Sep 17 00:00:00 2001 From: Robert N Date: Sat, 24 Dec 2022 08:55:17 +0000 Subject: [PATCH 54/65] motion: refresh patches Signed-off-by: Robert N --- multimedia/motion/patches/010-no-po-man.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/motion/patches/010-no-po-man.patch b/multimedia/motion/patches/010-no-po-man.patch index 05b8dc446..d8826be82 100644 --- a/multimedia/motion/patches/010-no-po-man.patch +++ b/multimedia/motion/patches/010-no-po-man.patch @@ -10,7 +10,7 @@ sysconf_DATA = \ --- a/configure.ac +++ b/configure.ac -@@ -472,8 +472,6 @@ AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS") +@@ -492,8 +492,6 @@ AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS") AC_CONFIG_FILES([ Makefile src/Makefile From 39af47f1c08ba161b0320e6d3af02ed19f549911 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Mon, 26 Dec 2022 12:28:36 +0800 Subject: [PATCH 55/65] natmap: add Package/conffiles Signed-off-by: Richard Yu --- net/natmap/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index 3c2991df8..d45b5d257 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -26,6 +26,10 @@ endef MAKE_FLAGS += REV_ID="$(PKG_VERSION)" +define Package/natmap/conffiles +/etc/config/natmap +endef + define Package/natmap/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/natmap $(1)/usr/bin/ From 8111d494749ad1f56218852fb9a587e99c173870 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Mon, 26 Dec 2022 12:28:52 +0800 Subject: [PATCH 56/65] natmap: fix service not stopped when disabled in luci luci removes `enable` option when disabled, fix by setting default value to 0. Signed-off-by: Richard Yu --- net/natmap/files/natmap.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/natmap/files/natmap.init b/net/natmap/files/natmap.init index 3688880b3..a0ec4b26d 100644 --- a/net/natmap/files/natmap.init +++ b/net/natmap/files/natmap.init @@ -17,7 +17,7 @@ load_interfaces() { validate_section_natmap() { uci_load_validate "${NAME}" natmap "$1" "$2" \ - 'enable:bool:1' \ + 'enable:bool:0' \ 'family:string' \ 'udp_mode:bool:0' \ 'interface:string' \ From 6163de4ffa21ad3fdd0df167d2ad926954e4f673 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Mon, 26 Dec 2022 12:29:02 +0800 Subject: [PATCH 57/65] natmap: update to 20221225 Signed-off-by: Richard Yu --- net/natmap/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/natmap/Makefile b/net/natmap/Makefile index d45b5d257..4f79967ac 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natmap -PKG_VERSION:=20221203 -PKG_RELEASE:=2 +PKG_VERSION:=20221225 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) -PKG_HASH:=c7aa0bb1f3e057bf1fa987ad6166ba7c2e80510a89593e04f4fe0f36f1873338 +PKG_HASH:=cc19a5b876fd75424619ae90aa6b0414a438c1f6f55537b9b28f1c23d925f6ff PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=MIT From 9a7926339bba3e5d3830e2674021365f65bc83dd Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 16:42:00 +0800 Subject: [PATCH 58/65] xray-core: Update to 1.7.0 Signed-off-by: Tianling Shen --- net/xray-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index 37549ba53..5fb124f6e 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=1.6.6-2 +PKG_VERSION:=1.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=228fedbf5b624883ed2b0d1e3acf66842df483aa5a113995a4434314b3e755eb +PKG_HASH:=6dbf3d9103e62f9e72b7ac231e1d5a65e2a5c40810500a7e757a4ef71dcc32fd PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 From 7ea1c47c444cda08950b797ee60df5cf7580f6dc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 16:42:33 +0800 Subject: [PATCH 59/65] v2ray-core: Update to 5.2.0 Signed-off-by: Tianling Shen --- net/v2ray-core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/v2ray-core/Makefile b/net/v2ray-core/Makefile index add4616bc..115be3064 100644 --- a/net/v2ray-core/Makefile +++ b/net/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=5.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea +PKG_HASH:=3594fcec033706cbc94ff76ecf86a44f025164baa5da9b2286dea32f2b6029f9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From ea969a117a2a94de81489082f6ef83de438cf313 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 11:46:24 +0800 Subject: [PATCH 60/65] v2ray-geodata: Update to latest version Signed-off-by: Tianling Shen --- net/v2ray-geodata/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index c441ce1f4..c77a14bb7 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202211240054 +GEOIP_VER:=202212220043 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=567c9a1bfe22c2ff7f468f3814aa6bb344b33393cf39507e5cbeb20c78c952b7 + HASH:=2c19f53055777a126a4687feb41dab033180b517de058a0d18b6344c4987f57d endef -GEOSITE_VER:=20221127082021 +GEOSITE_VER:=20221226075817 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=519583c593fada6cf8d629eb428652199ab715d641073f64122c1e2c68b6c43f + HASH:=7651fe111ed789d3508f2d6bfaa547141beb7bf1d392b57207889c5f6df53e19 endef define Package/v2ray-geodata/template From 35f33c99b126cfa3ac51b9d7634340d43458b7db Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 13:18:29 +0800 Subject: [PATCH 61/65] golang: backport an upstream fix for non-retpoline-compatible error This fixes the following build error: ``` Building targets runtime :1: non-retpoline-compatible: 00200 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:915) JMP (R15)(R12*8) :1: non-retpoline-compatible: 00115 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/type.go:614) JMP (AX)(SI*8) :1: non-retpoline-compatible: 00028 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:452) JMP (R11)(R10*8) :1: non-retpoline-compatible: 00021 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/error.go:261) JMP (DX)(CX*8) :1: non-retpoline-compatible: 00050 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:691) JMP (CX)(R12*8) :1: non-retpoline-compatible: 00024 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/debuglog.go:616) JMP (CX)(SI*8) :1: non-retpoline-compatible: 00079 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:617) JMP (R9)(R8*8) :1: non-retpoline-compatible: 00025 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/cgocall.go:453) JMP (R9)(DX*8) :1: non-retpoline-compatible: 00018 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/type.go:66) JMP (DX)(CX*8) :1: non-retpoline-compatible: 00020 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/alg.go:156) JMP (SI)(DX*8) :1: too many errors ``` Fixes: #20026 Signed-off-by: Tianling Shen --- ...jump-tables-when-spectre-retpolines-.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch diff --git a/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch b/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch new file mode 100644 index 000000000..189957178 --- /dev/null +++ b/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch @@ -0,0 +1,67 @@ +From 156578067111742b55718066c91b8ec66d35e03d Mon Sep 17 00:00:00 2001 +From: Keith Randall +Date: Mon, 5 Dec 2022 16:26:26 -0800 +Subject: [PATCH] [release-branch.go1.19] cmd/compile: turn off jump tables + when spectre retpolines are on + +Fixes #57100 + +Change-Id: I6ab659abbca1ae0ac8710674d39aec116fab0baa +Reviewed-on: https://go-review.googlesource.com/c/go/+/455336 +Reviewed-by: Keith Randall +Reviewed-by: Cherry Mui +TryBot-Result: Gopher Robot +Run-TryBot: Keith Randall +(cherry picked from commit 1eb0465fa596a2d6e9c1a632499989544f0d7e68) +Reviewed-on: https://go-review.googlesource.com/c/go/+/455416 +Reviewed-by: Michael Pratt +--- + src/cmd/compile/internal/walk/switch.go | 2 +- + test/codegen/retpoline.go | 28 +++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +--- a/src/cmd/compile/internal/walk/switch.go ++++ b/src/cmd/compile/internal/walk/switch.go +@@ -289,7 +289,7 @@ func (s *exprSwitch) tryJumpTable(cc []e + const minCases = 8 // have at least minCases cases in the switch + const minDensity = 4 // use at least 1 out of every minDensity entries + +- if !go119UseJumpTables || base.Flag.N != 0 || !ssagen.Arch.LinkArch.CanJumpTable { ++ if !go119UseJumpTables || base.Flag.N != 0 || !ssagen.Arch.LinkArch.CanJumpTable || base.Ctxt.Retpoline { + return false + } + if len(cc) < minCases { +--- a/test/codegen/retpoline.go ++++ b/test/codegen/retpoline.go +@@ -12,3 +12,31 @@ func CallInterface(x interface{ M() }) { + // amd64:`CALL\truntime.retpoline` + x.M() + } ++ ++// Check to make sure that jump tables are disabled ++// when retpoline is on. See issue 57097. ++func noJumpTables(x int) int { ++ switch x { ++ case 0: ++ return 0 ++ case 1: ++ return 1 ++ case 2: ++ return 2 ++ case 3: ++ return 3 ++ case 4: ++ return 4 ++ case 5: ++ return 5 ++ case 6: ++ return 6 ++ case 7: ++ return 7 ++ case 8: ++ return 8 ++ case 9: ++ return 9 ++ } ++ return 10 ++} From e6060502e795164f1ab08b61d516bc8aae57faf3 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 28 Dec 2022 02:35:28 +0200 Subject: [PATCH 62/65] strongswan: fix typo in strongswan-mod-nonce description Fixes: #16691 Signed-off-by: Stijn Tintel --- net/strongswan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 2b2d09c84..35cf0fec1 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.8 -PKG_RELEASE:=$(AUTORELEASE).1 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ @@ -691,7 +691,7 @@ $(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,)) $(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap)) $(eval $(call BuildPlugin,led,LED blink on IKE activity,)) $(eval $(call BuildPlugin,load-tester,load testing,)) -$(eval $(call BuildPlugin,nonce,nonce genereation,)) +$(eval $(call BuildPlugin,nonce,nonce generation,)) $(eval $(call BuildPlugin,md4,MD4 crypto,)) $(eval $(call BuildPlugin,md5,MD5 crypto,)) $(eval $(call BuildPlugin,mgf1,MGF1 crypto,)) From 07f528b33121c5b26b868b6a72700e4029fe8f81 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Wed, 28 Dec 2022 01:21:34 -0700 Subject: [PATCH 63/65] bind: update to version 9.18.10 Signed-off-by: Philip Prindeville --- net/bind/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/bind/Makefile b/net/bind/Makefile index bc4a9a877..e53a7e7f8 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind -PKG_VERSION:=9.18.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=9.18.10 +PKG_RELEASE:=1 USERID:=bind=57:bind=57 PKG_MAINTAINER:=Noah Meyerhans @@ -22,7 +22,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:= \ https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \ https://ftp.isc.org/isc/bind9/$(PKG_VERSION) -PKG_HASH:=9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981 +PKG_HASH:=f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libtool.m4 From 842c60e20e67af31eeeb65de2a6afd3f826c63a1 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 28 Dec 2022 08:04:22 -0500 Subject: [PATCH 64/65] tree: bump to 2.1.0 Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- utils/tree/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/tree/Makefile b/utils/tree/Makefile index 2c161c609..88146217a 100644 --- a/utils/tree/Makefile +++ b/utils/tree/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tree -PKG_VERSION:=2.0.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Old-Man-Programmer/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=3ebeaf77a3b3829bcf665329e9d0f3624079c2c4cb4ef14cf6d7129a1a208b59 +PKG_HASH:=e9da64f6bbf894840b76d5fb2d37282076febbc96076fc4e833b08fe42190ad2 PKG_MAINTAINER:=Banglang Huang From ac13ebc68f20c0ca6e3ccf553e67e32bc7d9c933 Mon Sep 17 00:00:00 2001 From: Rudy Andram Date: Wed, 28 Dec 2022 06:10:48 +0000 Subject: [PATCH 65/65] stubby: bump to 0.4.3 Signed-off-by: Rudy Andram --- net/stubby/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/stubby/Makefile b/net/stubby/Makefile index bb0b2be54..25af732c6 100644 --- a/net/stubby/Makefile +++ b/net/stubby/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stubby -PKG_VERSION:=0.4.2 +PKG_VERSION:=0.4.3 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME) PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=0a40e3eec2ef86a83977b69f03bc63f232fe52ca15703273a0d097e64fa3bf05 +PKG_MIRROR_HASH:=2fd0bc4db1d6f08be63e8f092939054a5e4e884db9a521d1033f89a8b3f5d132 PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause