From 7e9ed3b117ce5fc1dbd46c19ecde14e4de655056 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Fri, 10 Nov 2023 21:40:13 +0800 Subject: [PATCH 01/47] tailscale: Update to 1.52.1 Signed-off-by: Zephyr Lykos --- net/tailscale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index d787ee25d..70f0d4acf 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.50.1 +PKG_VERSION:=1.52.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=183a7d559590a759dd77aa9c2b65486ab6e13c26f3c07fad0b536e318ad5e233 +PKG_HASH:=297d01584104dde7d1e5d2e99ee57c6a60579dc4f494ed9d2306716e031af19a PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From 7421b12e0f88427876c51242ff7f765909dd54dc Mon Sep 17 00:00:00 2001 From: Leo Douglas Date: Sat, 11 Nov 2023 21:15:23 +0800 Subject: [PATCH 02/47] sing-box: update to v1.6.3 see changelog: https://github.com/SagerNet/sing-box/releases/tag/v1.6.3 Signed-off-by: Leo Douglas --- net/sing-box/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 229dc2e67..067dd6d9e 100644 --- a/net/sing-box/Makefile +++ b/net/sing-box/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.6.0 +PKG_VERSION:=1.6.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3272c9ac447d009749429f38d76e9879609c0c321442c3235ba806d995c0838a +PKG_HASH:=3bebd23dd5d4734a90fb8821b3c2c0be0fd34800d10e6a4e0db95e06578cca1c PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE From 45f9302afe21ec98cdd43b37feb46a0408a7aaab Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sat, 11 Nov 2023 16:38:03 +0100 Subject: [PATCH 03/47] gensio: prevent accidental use of dns_sd Buildbots spottet this error that when dns_sd library is available, then gensio's configure will pick it up. This is not desired since we already link to libavahi for the mdns stuff, so let's disable dnssd lookup explicitly. Signed-off-by: Michael Heimpold --- net/gensio/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/gensio/Makefile b/net/gensio/Makefile index 6fca78e9c..500d95817 100644 --- a/net/gensio/Makefile +++ b/net/gensio/Makefile @@ -49,6 +49,7 @@ CONFIGURE_ARGS += \ --without-afskmdm \ --without-ax25 \ --without-alsa \ + --without-dnssd \ --without-go \ --without-ipmisol \ --without-kiss \ From b8298a9b9114b20b1b104e36a40dc5769b26549d Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 12 Nov 2023 22:42:44 +0200 Subject: [PATCH 04/47] irqbalance: update to 1.9.3 Update irqbalance to version 1.9.3. * remove upstreamed patch. Signed-off-by: Hannu Nyman --- utils/irqbalance/Makefile | 6 +- ...001-upstream-fix-aarch64-irq-parsing.patch | 68 ------------------- 2 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch diff --git a/utils/irqbalance/Makefile b/utils/irqbalance/Makefile index 6717c352e..23d4b3899 100644 --- a/utils/irqbalance/Makefile +++ b/utils/irqbalance/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irqbalance -PKG_VERSION:=1.9.2 -PKG_RELEASE:=3 +PKG_VERSION:=1.9.3 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=e2c81725e7b6d711a47d68755a222236d7081726d567aca1c1295e6fe1caa865 +PKG_MIRROR_HASH:=ff2936e9b7486e802206cbf9e16aa6cb7e1501bdf502441d31f409d104e757b8 PKG_MAINTAINER:=Hannu Nyman PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch b/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch deleted file mode 100644 index 33213f067..000000000 --- a/utils/irqbalance/patches/001-upstream-fix-aarch64-irq-parsing.patch +++ /dev/null @@ -1,68 +0,0 @@ -From bbcd9a42c3cec0935b960b7f2046f1fdfab4f7ef Mon Sep 17 00:00:00 2001 -From: Vignesh Raghavendra -Date: Wed, 7 Dec 2022 19:46:19 +0530 -Subject: [PATCH] procinterrupts: Fix IRQ name parsing on certain arm64 SoC - -On arm64 SoCs like TI's K3 SoC and few other SoCs, IRQ names don't get -parsed correct due to which they end up being classified into wrong -class. Fix this by considering last token to contain IRQ name always. - -Eg.: /proc/interrupt - -cat /proc/interrupts - CPU0 CPU1 CPU2 CPU3 - 11: 7155 8882 7235 7791 GICv3 30 Level arch_timer - 14: 0 0 0 0 GICv3 23 Level arm-pmu - 15: 0 0 0 0 GICv3 208 Level 4b00000.spi - 16: 0 0 0 0 GICv3 209 Level 4b10000.spi -116: 0 0 0 0 MSI-INTA 1716234 Level 485c0100.dma-controller chan6 -134: 166 0 0 0 MSI-INTA 1970707 Level 8000000.ethernet-tx0 -224: 149 0 0 0 MSI-INTA 1971731 Level 8000000.ethernet - -W/o patch irqbalance -d -IRQ (11) guessed as class 0 -IRQ (14) guessed as class 0 -IRQ (15) guessed as class 0 -IRQ (16) guessed as class 0 -IRQ 485c0100.dma-controller chan6(116) guessed as class 0 -IRQ (134) guessed as class 0 -IRQ (224) guessed as class 0 - -W/ this patch -IRQ arch_timer(11) guessed as class 0 -IRQ arm-pmu(14) guessed as class 0 -IRQ 4b00000.spi(15) guessed as class 0 -IRQ 4b10000.spi(16) guessed as class 0 -IRQ 485c0100.dma-controller chan6(116) guessed as class 0 -IRQ 8000000.ethernet-tx0(134) guessed as class 5 -IRQ 8000000.ethernet(224) guessed as class 5 -IRQ 8000000.ethernet(257) guessed as class 5 -IRQ -davinci_gpio wl18xx(362) guessed as class - -Signed-off-by: Vignesh Raghavendra ---- - procinterrupts.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - ---- a/procinterrupts.c -+++ b/procinterrupts.c -@@ -178,12 +178,14 @@ void init_irq_class_and_type(char *saved - } - - #ifdef AARCH64 -- if (savedptr && strlen(savedptr) > 0) { -+ if (savedptr && strlen(savedptr) > 0) - snprintf(irq_fullname, PATH_MAX, "%s %s", last_token, savedptr); -- tmp = strchr(irq_fullname, '\n'); -- if (tmp) -- *tmp = 0; -- } -+ else -+ snprintf(irq_fullname, PATH_MAX, "%s", last_token); -+ -+ tmp = strchr(irq_fullname, '\n'); -+ if (tmp) -+ *tmp = 0; - #else - snprintf(irq_fullname, PATH_MAX, "%s", last_token); - #endif From b4a31f92deb8de923d6bc6fb12506e24f4475581 Mon Sep 17 00:00:00 2001 From: Julien Cassette Date: Fri, 3 Nov 2023 18:42:48 +0100 Subject: [PATCH 05/47] unbound: create extra host records from DHCP static leases The "Extra DNS" option allows to create records from the DHCP "Hostnames" configuration entries. This allows to create such records from the DHCP "Static leases" configuration entries too. Fixes: #22593 Signed-off-by: Julien Cassette --- net/unbound/files/dnsmasq.sh | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/net/unbound/files/dnsmasq.sh b/net/unbound/files/dnsmasq.sh index eae8dae98..b507535f3 100644 --- a/net/unbound/files/dnsmasq.sh +++ b/net/unbound/files/dnsmasq.sh @@ -69,7 +69,7 @@ create_local_zone() { ############################################################################## -create_host_record() { +create_host_record_from_domain() { local cfg="$1" local ip name debug_ip @@ -102,6 +102,35 @@ create_host_record() { ############################################################################## +create_host_record_from_host() { + local cfg="$1" + local dns ip name + + # basefiles dhcp "host" clause which means host A and PTR records + config_get dns "$cfg" dns + config_get ip "$cfg" ip + config_get name "$cfg" name + + + if [ -n "$name" ] && [ -n "$ip" ] && [ $dns -eq 1 ] ; then + case $name in + *.*) + # domain present, do nothing + ;; + *) + name="$name.$UB_TXT_DOMAIN" + ;; + esac + + + create_local_zone "$name" + DM_LIST_LOCAL_DATA="$DM_LIST_LOCAL_DATA $name.@@300@@IN@@A@@$ip" + DM_LIST_LOCAL_PTR="$DM_LIST_LOCAL_PTR $ip@@300@@$name" + fi +} + +############################################################################## + create_mx_record() { local cfg="$1" local domain relay pref record @@ -215,7 +244,8 @@ dnsmasq_inactive() { # Parasite from the uci.dhcp.domain clauses DM_LIST_KNOWN_ZONES="$DM_LIST_KNOWN_ZONES $UB_TXT_DOMAIN" config_load dhcp - config_foreach create_host_record domain + config_foreach create_host_record_from_domain domain + config_foreach create_host_record_from_host host if [ $UB_D_EXTRA_DNS -gt 1 ] ; then From 183f1662795930f846e497be7530e0474c7eff0e Mon Sep 17 00:00:00 2001 From: Eric Luehrsen Date: Fri, 10 Nov 2023 15:58:15 -0500 Subject: [PATCH 06/47] unbound: update to 1.19.0 Signed-off-by: Eric Luehrsen --- net/unbound/Makefile | 4 ++-- net/unbound/patches/010-configure-uname.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/unbound/Makefile b/net/unbound/Makefile index d0cb41fac..a2bf99535 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound -PKG_VERSION:=1.18.0 +PKG_VERSION:=1.19.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound -PKG_HASH:=3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712 +PKG_HASH:=a97532468854c61c2de48ca4170de854fd3bc95c8043bb0cfb0fe26605966624 PKG_MAINTAINER:=Eric Luehrsen PKG_LICENSE:=BSD-3-Clause diff --git a/net/unbound/patches/010-configure-uname.patch b/net/unbound/patches/010-configure-uname.patch index f53962fcd..098f2785c 100644 --- a/net/unbound/patches/010-configure-uname.patch +++ b/net/unbound/patches/010-configure-uname.patch @@ -3,7 +3,7 @@ Fix cross compile errors by inserting an environment variable for the target. Use "uname" on host only if "UNAME" variable is empty. --- a/configure.ac +++ b/configure.ac -@@ -840,7 +840,7 @@ if test x_$ub_test_python != x_no; then +@@ -842,7 +842,7 @@ if test x_$ub_test_python != x_no; then fi fi From 0ebc7159818acf40a8eada46058312d2aff0281d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Nov 2023 16:01:30 +0800 Subject: [PATCH 07/47] golang: Update to 1.21.4 Includes fixes for CVE-2023-45283 and CVE-2023-45284 (path/filepath: insecure parsing of Windows paths). Signed-off-by: Jeffery To --- lang/golang/golang/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 094dea2b1..55da6587b 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.21 -GO_VERSION_PATCH:=3 +GO_VERSION_PATCH:=4 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=186f2b6f8c8b704e696821b09ab2041a5c1ee13dcbc3156a13adcf75931ee488 +PKG_HASH:=47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 3787b4135584ad2a6510dbd883406d30575dce5c Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 13 Nov 2023 10:07:46 +0000 Subject: [PATCH 08/47] adblock-fast: bugfix: ensure downloaded block-lists end with newline * ensure downloaded block-lists end with newline * turn free/total RAM checks into functions calls Signed-off-by: Stan Grishin --- net/adblock-fast/Makefile | 2 +- .../files/etc/init.d/adblock-fast | 33 +++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile index 7b14836b2..35d206acb 100644 --- a/net/adblock-fast/Makefile +++ b/net/adblock-fast/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock-fast PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast index 423a14c32..cb16cf5bb 100755 --- a/net/adblock-fast/files/etc/init.d/adblock-fast +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -1,6 +1,6 @@ #!/bin/sh /etc/rc.common # Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca) -# shellcheck disable=SC2015,SC2016,SC2018,SC2019,SC2034,SC3037,SC3043,SC3045,SC3057,SC3060 +# shellcheck disable=SC3043 # shellcheck disable=SC2034 START=94 @@ -81,6 +81,7 @@ blocked_url= # shellcheck disable=SC1091 . /usr/share/libubox/jshn.sh +append_newline() { is_newline_ending "$1" || echo '' >> "$1"; } check_ipset() { { command -v ipset && /usr/sbin/ipset help hash:net; } >/dev/null 2>&1; } check_nft() { command -v nft >/dev/null 2>&1; } check_dnsmasq() { command -v dnsmasq >/dev/null 2>&1; } @@ -104,6 +105,9 @@ dnsmasq_restart() { /etc/init.d/dnsmasq restart >/dev/null 2>&1; } is_enabled() { uci -q get "${1}.config.enabled"; } is_greater() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } is_greater_or_equal() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" = "$2"; } +# shellcheck disable=SC3057 +is_https_url() { [ "${1:0:8}" = "https://" ]; } +is_newline_ending() { [ "$(tail -c1 "$1" | wc -l)" -ne '0' ]; } is_present() { command -v "$1" >/dev/null 2>&1; } is_running() { local i j @@ -117,6 +121,8 @@ is_running() { } ipset() { "$ipset" "$@" >/dev/null 2>&1; } get_version() { grep -m1 -A2 -w "^Package: $1$" /usr/lib/opkg/status | sed -n 's/Version: //p'; } +get_ram_free() { ubus call system info | jsonfilter -e '@.memory.free'; } +get_ram_total() { ubus call system info | jsonfilter -e '@.memory.total'; } led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; } led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; } logger() { /usr/bin/logger -t "$packageName" "$@"; } @@ -131,7 +137,9 @@ print_json_string() { json_init; json_add_string "$1" "$2"; json_dump; json_clea sanitize_dir() { [ -d "$(readlink -fn "$1")" ] && readlink -fn "$1"; } str_contains() { test "$1" != "$(str_replace "$1" "$2" '')"; } str_contains_word() { echo "$1" | grep -q -w "$2"; } +# shellcheck disable=SC2018,SC2019 str_to_lower() { echo "$1" | tr 'A-Z' 'a-z'; } +# shellcheck disable=SC2018,SC2019 str_to_upper() { echo "$1" | tr 'a-z' 'A-Z'; } str_replace() { printf "%b" "$1" | sed -e "s/$(printf "%b" "$2")/$(printf "%b" "$3")/g"; } ubus_get_data() { ubus call service list "{ 'name': '$packageName' }" | jsonfilter -e "@['${packageName}'].instances.main.data.${1}"; } @@ -230,6 +238,7 @@ get_local_filesize() { elif is_present wc; then size="$(wc -c < "$file")" fi +# shellcheck disable=SC3037 echo -en "$size" } @@ -239,6 +248,7 @@ get_url_filesize() { is_present 'curl' || return 0 size_command='curl --silent --insecure --fail --head --request GET' size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')" +# shellcheck disable=SC3037 echo -en "$size" } @@ -262,6 +272,7 @@ output() { fi text="${text:-$*}"; [ -t 1 ] && printf "%b" "$text" +# shellcheck disable=SC3060 msg="${text//$serviceName /service }"; if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then [ -s "$sharedMemoryOutput" ] && memmsg="$(cat "$sharedMemoryOutput")" @@ -900,7 +911,7 @@ process_file_url() { file) type='File'; D_TMP="$B_TMP" ;; esac - if [ "${1:0:5}" = "https" ] && [ -z "$isSSLSupported" ]; then + if is_https_url "$url" && [ -z "$isSSLSupported" ]; then output 1 "$_FAIL_" output 2 "[DL] $type $label $__FAIL__\\n" echo "errorNoSSLSupport|${1}" >> "$sharedMemoryError" @@ -915,6 +926,7 @@ process_file_url() { output 2 "[DL] $type $label $__FAIL__\\n" echo "errorDownloadingList|${url}" >> "$sharedMemoryError" else + append_newline "$R_TMP" [ -n "$cfg" ] && new_size="$(get_local_filesize "$R_TMP")" if [ -n "$new_size" ] && [ "$size" != "$new_size" ]; then uci set "${packageName}.${cfg}.size=$size" @@ -943,6 +955,7 @@ process_file_url() { output 2 "[DL] $type $label ($format) $__FAIL__\\n" echo "errorParsingList|${url}" >> "$sharedMemoryError" else + append_newline "$R_TMP" cat "${R_TMP}" >> "$D_TMP" output 1 "$_OK_" output 2 "[DL] $type $label ($format) $__OK__\\n" @@ -959,7 +972,7 @@ download_dnsmasq_file() { json set status 'statusDownloading' rm -f "$A_TMP" "$B_TMP" "$outputFile" "$outputCache" "$outputGzip" - if [ "$($awk '/^MemFree/ {print int($2/1000)}' "/proc/meminfo")" -lt 32 ]; then + if [ "$(get_ram_free)" -lt 32 ]; then output 3 'Low free memory, restarting resolver ' if resolver 'quiet_restart'; then output_okn @@ -1000,7 +1013,7 @@ download_lists() { [ -n "$size" ] && total_sizes=$((total_sizes+size)) } local i free_mem total_sizes - free_mem="$(ubus call system info | jsonfilter -e '@.memory.free')" + free_mem="$(get_ram_free)" if [ -z "$free_mem" ]; then json add warnning 'warningFreeRamCheckFail' output "${_WARNING_}: $(get_text 'warningFreeRamCheckFail')!\\n" @@ -1024,7 +1037,7 @@ download_lists() { json set status 'statusDownloading' rm -f "$A_TMP" "$B_TMP" "$outputFile" "$outputCache" "$outputGzip" - if [ "$($awk '/^MemFree/ {print int($2/1000)}' "/proc/meminfo")" -lt 32 ]; then + if [ "$(get_ram_total)" -lt 33554432 ]; then output 3 'Low free memory, restarting resolver ' if resolver 'quiet_restart'; then output_okn @@ -1040,7 +1053,7 @@ download_lists() { wait if [ -n "$(uci changes "$packageName")" ]; then output 2 "Saving updated file size(s) " - uci commit "$packageName" && output_okn || output_failn + if uci commit "$packageName"; then output_okn; else output_failn; fi fi output 1 '\n' @@ -1058,7 +1071,10 @@ download_lists() { canaryDomains="${canaryDomains:+$canaryDomains }${canaryDomainsMozilla}" fi - for hf in $blocked_domain $canaryDomains; do echo "$hf" | sed "$domainsFilter" >> $B_TMP; done + append_newline "$B_TMP" + for hf in $blocked_domain $canaryDomains; do + printf "%s\n" "$(echo "$hf" | sed "$domainsFilter")" >> "$B_TMP" + done allowed_domain="${allowed_domain} $(cat $A_TMP)" for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; allow_filter="$allow_filter/(^|\.)${hf}$/d;"; done @@ -1094,6 +1110,7 @@ $(cat $A_TMP)" output 2 'Optimizing combined list ' json set message "$(get_text 'statusProcessing'): optimizing combined list" # sed -E 'G;:t;s/(.*)(\.)(.*)(\n)(.*)/\1\4\5\2\3/;tt;s/(.*)\n(\.)(.*)/\3\2\1/' is actually slower than command below +# shellcheck disable=SC2016 if $awk -F "." '{for(f=NF;f>1;f--)printf "%s.",$f;print $1}' "$A_TMP" > "$B_TMP"; then if sort "$B_TMP" > "$A_TMP"; then if $awk '{if(NR=1){tld=$NF};while(getline){if($NF!~tld"\\."){print tld;tld=$NF}}print tld}' "$A_TMP" > "$B_TMP"; then @@ -1372,6 +1389,7 @@ adb_config_update() { R_TMP="$(mktemp -u -q -t ${packageName}_tmp.XXXXXXXX)" done if ! $dl_command "$config_update_url" "$dl_flag" "$R_TMP" 2>/dev/null || [ ! -s "$R_TMP" ]; then + append_newline "$R_TMP" output 1 "$_FAIL_\\n" output 2 "[DL] Config Update: $label $__FAIL__\\n" json add error 'errorDownloadingConfigUpdate' @@ -1544,6 +1562,7 @@ adb_start() { fi json_add_array firewall if [ "$force_dns" -ne 0 ]; then +# shellcheck disable=SC3060 for c in ${force_dns_port/,/ }; do if netstat -tuln | grep LISTEN | grep ":${c}" >/dev/null 2>&1; then json_add_object "" From c1aae04231c7f1a6d8f3ff1aa3ac421ad8aa8c1f Mon Sep 17 00:00:00 2001 From: Leo Douglas Date: Tue, 14 Nov 2023 11:02:04 +0800 Subject: [PATCH 09/47] sing-box: update to v1.6.4 see changelog: https://github.com/SagerNet/sing-box/releases/tag/v1.6.4 Signed-off-by: Leo Douglas --- net/sing-box/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 067dd6d9e..7f4b9ac4e 100644 --- a/net/sing-box/Makefile +++ b/net/sing-box/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3bebd23dd5d4734a90fb8821b3c2c0be0fd34800d10e6a4e0db95e06578cca1c +PKG_HASH:=3b1008d8a4d0cb0c41841531b1845b9b859a5d8f73af2c9a137fec4c7ad1f18f PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE From 4e1947d9294d261e720867dd820512147df44d2f Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 14 Nov 2023 21:02:55 +0100 Subject: [PATCH 10/47] gensio: disable cm108gpio gensio and prevent using libudev libudev seems to be required only for cm108gpio gensio which is a relatively special one. Let's disable it and also the libudev lookup, so that there is no need to link/use libudev. Signed-off-by: Michael Heimpold --- net/gensio/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/gensio/Makefile b/net/gensio/Makefile index 500d95817..b53d6821d 100644 --- a/net/gensio/Makefile +++ b/net/gensio/Makefile @@ -47,8 +47,9 @@ CONFIGURE_ARGS += \ --$(if $(CONFIG_GENSIO_GLIB),with,without)-glib \ --$(if $(CONFIG_GENSIO_TCL),with,without)-tcl \ --without-afskmdm \ - --without-ax25 \ --without-alsa \ + --without-ax25 \ + --without-cm108gpio \ --without-dnssd \ --without-go \ --without-ipmisol \ @@ -56,6 +57,7 @@ CONFIGURE_ARGS += \ --without-openipmi \ --without-portaudio \ --without-sound \ + --without-udev \ --with-cplusplus \ --with-flock-locking \ --with-uucp-locking \ From c9a9c20793a36d31cba8a7b288d3c67cef727867 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Nov 2023 17:52:30 +0800 Subject: [PATCH 11/47] python-hatch-vcs: Update to 0.4.0 Signed-off-by: Jeffery To --- lang/python/python-hatch-vcs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-hatch-vcs/Makefile b/lang/python/python-hatch-vcs/Makefile index 39f890985..6726a7776 100644 --- a/lang/python/python-hatch-vcs/Makefile +++ b/lang/python/python-hatch-vcs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-hatch-vcs -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.4.0 PKG_RELEASE:=1 PYPI_NAME:=hatch-vcs PYPI_SOURCE_NAME:=hatch_vcs -PKG_HASH:=cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee +PKG_HASH:=093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt From dbbb577956fd419cc4514e090b2220f73d6f336c Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Nov 2023 17:53:49 +0800 Subject: [PATCH 12/47] python-mako: Update to 1.3.0 Signed-off-by: Jeffery To --- lang/python/python-mako/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-mako/Makefile b/lang/python/python-mako/Makefile index 50f828151..514651593 100644 --- a/lang/python/python-mako/Makefile +++ b/lang/python/python-mako/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-mako -PKG_VERSION:=1.2.4 +PKG_VERSION:=1.3.0 PKG_RELEASE:=1 PYPI_NAME:=Mako -PKG_HASH:=d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 +PKG_HASH:=e3a9d388fd00e87043edbe8792f45880ac0114e9c4adc69f6e9bfb2c55e3b11b PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=MIT From 570bbc388516c59d07cf145a3d6fe8b58bd3b5b8 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 13 Nov 2023 17:54:49 +0800 Subject: [PATCH 13/47] python-trove-classifiers: Update to 2023.11.9 Signed-off-by: Jeffery To --- lang/python/python-trove-classifiers/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-trove-classifiers/Makefile b/lang/python/python-trove-classifiers/Makefile index 9691fd159..67f3e8ff9 100644 --- a/lang/python/python-trove-classifiers/Makefile +++ b/lang/python/python-trove-classifiers/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-trove-classifiers -PKG_VERSION:=2023.10.18 +PKG_VERSION:=2023.11.9 PKG_RELEASE:=1 PYPI_NAME:=trove-classifiers -PKG_HASH:=2cdfcc7f31f7ffdd57666a9957296089ac72daad4d11ab5005060e5cd7e29939 +PKG_HASH:=0542bc03d151f8af84f0eb0e74aa931b374b6f9c8ed8fbf7ee41989fb9d40f1d PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE From 496a4f186a35cb132f3541e5b34c4b96cf934610 Mon Sep 17 00:00:00 2001 From: Facundo Acevedo Date: Thu, 2 Nov 2023 16:21:55 -0300 Subject: [PATCH 14/47] Dysk: Add new package Dysk is a command-line tool designed for efficient file and directory management in Unix-like environments Signed-off-by: Facundo Acevedo --- utils/dysk/Makefile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 utils/dysk/Makefile diff --git a/utils/dysk/Makefile b/utils/dysk/Makefile new file mode 100644 index 000000000..cc559b083 --- /dev/null +++ b/utils/dysk/Makefile @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: GPL-3.0-only +# +# Copyright (C) 2023 Facundo Acevedo + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dysk +PKG_VERSION:=2.8.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/Canop/dysk/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=3e0f3a470539721748d7bc1acc867bdddcb824695b2f766e3a1f230ebac28c2c + +PKG_MAINTAINER:=Facundo Acevedo +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENCE + +PKG_BUILD_DEPENDS:=rust/host +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include ../../lang/rust/rust-package.mk + +define Package/dysk + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Utility for efficient file and directory management + DEPENDS:=$(RUST_ARCH_DEPENDS) + URL:=https://dystroy.org/dysk +endef + +define Package/dysk/description + Dysk is a command-line tool designed for efficient file and + directory management in Unix-like environments. It offers a + streamlined approach to organizing and manipulating files, + potentially simplifying various file-related tasks. +endef + +$(eval $(call RustBinPackage,dysk)) +$(eval $(call BuildPackage,dysk)) From 7c68e41ec8a27acef597aa881b509642a54501cc Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Nov 2023 17:03:48 +0800 Subject: [PATCH 15/47] python-poetry-core: Update to 1.8.1 Signed-off-by: Jeffery To --- lang/python/python-poetry-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-poetry-core/Makefile b/lang/python/python-poetry-core/Makefile index 3bcb1d9ca..ab0d12aa4 100644 --- a/lang/python/python-poetry-core/Makefile +++ b/lang/python/python-poetry-core/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-poetry-core -PKG_VERSION:=1.7.0 +PKG_VERSION:=1.8.1 PKG_RELEASE:=1 PYPI_NAME:=poetry-core PYPI_SOURCE_NAME:=poetry_core -PKG_HASH:=8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 +PKG_HASH:=67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From 1e4e35b7656ca85417caf8296117f69fb279eed2 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Nov 2023 17:05:56 +0800 Subject: [PATCH 16/47] python-wheel: Update to 0.41.3 Signed-off-by: Jeffery To --- lang/python/python-wheel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-wheel/Makefile b/lang/python/python-wheel/Makefile index 2b89d569e..76a1b44bb 100644 --- a/lang/python/python-wheel/Makefile +++ b/lang/python/python-wheel/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-wheel -PKG_VERSION:=0.41.2 +PKG_VERSION:=0.41.3 PKG_RELEASE:=1 PYPI_NAME:=wheel -PKG_HASH:=0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985 +PKG_HASH:=4d4987ce51a49370ea65c0bfd2234e8ce80a12780820d9dc462597a6e60d0841 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt From a317ea2831bd910220486ef7d21f4b5b97fcecd8 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 7 Nov 2023 17:08:04 +0800 Subject: [PATCH 17/47] python-twisted: Update to 23.10.0, refresh patches Signed-off-by: Jeffery To --- lang/python/python-twisted/Makefile | 4 ++-- lang/python/python-twisted/patches/001-omit-tkconch.patch | 2 +- lang/python/python-twisted/patches/002-omit-tests.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/python-twisted/Makefile b/lang/python/python-twisted/Makefile index 5befac2b3..79f2f2a23 100644 --- a/lang/python/python-twisted/Makefile +++ b/lang/python/python-twisted/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-twisted -PKG_VERSION:=23.8.0 +PKG_VERSION:=23.10.0 PKG_RELEASE:=1 PYPI_NAME:=Twisted PYPI_SOURCE_NAME:=twisted -PKG_HASH:=3c73360add17336a622c0d811c2a2ce29866b6e59b1125fd6509b17252098a24 +PKG_HASH:=987847a0790a2c597197613686e2784fd54167df3a55d0fb17c8412305d76ce5 PKG_BUILD_DEPENDS:=libtirpc diff --git a/lang/python/python-twisted/patches/001-omit-tkconch.patch b/lang/python/python-twisted/patches/001-omit-tkconch.patch index bf8873f41..d9ad0d59e 100644 --- a/lang/python/python-twisted/patches/001-omit-tkconch.patch +++ b/lang/python/python-twisted/patches/001-omit-tkconch.patch @@ -1,6 +1,6 @@ --- a/pyproject.toml +++ b/pyproject.toml -@@ -150,7 +150,6 @@ ckeygen = "twisted.conch.scripts.ckeygen +@@ -138,7 +138,6 @@ ckeygen = "twisted.conch.scripts.ckeygen conch = "twisted.conch.scripts.conch:run" mailmail = "twisted.mail.scripts.mailmail:run" pyhtmlizer = "twisted.scripts.htmlizer:run" diff --git a/lang/python/python-twisted/patches/002-omit-tests.patch b/lang/python/python-twisted/patches/002-omit-tests.patch index 841b5e09e..ddf8f9e30 100644 --- a/lang/python/python-twisted/patches/002-omit-tests.patch +++ b/lang/python/python-twisted/patches/002-omit-tests.patch @@ -1,6 +1,6 @@ --- a/pyproject.toml +++ b/pyproject.toml -@@ -194,6 +194,7 @@ exclude = [ +@@ -182,6 +182,7 @@ exclude = [ "*.pxi", "*.pyx", "build.bat", From 6ff496d113a69a1a6a55cb0ac0ae46241007dddc Mon Sep 17 00:00:00 2001 From: "S. Brusch" Date: Wed, 15 Nov 2023 13:12:17 +0100 Subject: [PATCH 18/47] crowdsec: new upstream release version 1.5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update crowdsec to latest upstream release version 1.5.5 Signed-off-by: S. Brusch Maintainer: Kerma Gérald Package tested. not able to test run due to limited space (package is big) Description: update to latest version of upstream --- net/crowdsec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/crowdsec/Makefile b/net/crowdsec/Makefile index 554669592..48a0ac9e9 100644 --- a/net/crowdsec/Makefile +++ b/net/crowdsec/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdsec -PKG_VERSION:=1.5.4 +PKG_VERSION:=1.5.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=afa4021f77e9cb87d7fd11cd86146770836dc15cad1ae8a4edce1314b14be98a +PKG_HASH:=ec7b2815405be4c3a1c9c3dcb1110030c29b7408dbf2a82d25537843c8831329 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From b354a7edbe35bf3cbaafb85edf74181ab7810202 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 10 Nov 2023 14:04:55 +0800 Subject: [PATCH 19/47] python-argcomplete: Add new package From the README: Argcomplete provides easy, extensible command line tab completion of arguments for your Python application. Signed-off-by: Jeffery To --- lang/python/python-argcomplete/Makefile | 43 +++++++++++++++++++ .../patches/001-unpin-setuptools.patch | 9 ++++ lang/python/python-argcomplete/test.sh | 5 +++ 3 files changed, 57 insertions(+) create mode 100644 lang/python/python-argcomplete/Makefile create mode 100644 lang/python/python-argcomplete/patches/001-unpin-setuptools.patch create mode 100644 lang/python/python-argcomplete/test.sh diff --git a/lang/python/python-argcomplete/Makefile b/lang/python/python-argcomplete/Makefile new file mode 100644 index 000000000..d977f01a2 --- /dev/null +++ b/lang/python/python-argcomplete/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2023 Jeffery To +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-argcomplete +PKG_VERSION:=3.1.4 +PKG_RELEASE:=1 + +PYPI_NAME:=argcomplete +PKG_HASH:=72558ba729e4c468572609817226fb0a6e7e9a0a7d477b882be168c0b4a62b94 + +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE.rst +PKG_MAINTAINER:=Jeffery To + +PKG_BUILD_DEPENDS:=python-setuptools-scm/host + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-argcomplete + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Bash tab completion for argparse + URL:=https://github.com/kislyuk/argcomplete + DEPENDS:=+python3-light +endef + +define Package/python3-argcomplete/description +Argcomplete provides easy, extensible command line tab completion of +arguments for your Python application. +endef + +$(eval $(call Py3Package,python3-argcomplete)) +$(eval $(call BuildPackage,python3-argcomplete)) +$(eval $(call BuildPackage,python3-argcomplete-src)) diff --git a/lang/python/python-argcomplete/patches/001-unpin-setuptools.patch b/lang/python/python-argcomplete/patches/001-unpin-setuptools.patch new file mode 100644 index 000000000..a85ce857a --- /dev/null +++ b/lang/python/python-argcomplete/patches/001-unpin-setuptools.patch @@ -0,0 +1,9 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools>=67.7.2", "setuptools_scm[toml]>=6.2"] ++requires = ["setuptools", "setuptools_scm[toml]>=6.2"] + build-backend = "setuptools.build_meta" + + [project] diff --git a/lang/python/python-argcomplete/test.sh b/lang/python/python-argcomplete/test.sh new file mode 100644 index 000000000..0ecba3e5b --- /dev/null +++ b/lang/python/python-argcomplete/test.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +[ "$1" = python3-argcomplete ] || exit 0 + +python3 -c 'import argcomplete' From 5b3e4a4b3f3be3f9db6aed6a977a5fd40ca6f203 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 10 Nov 2023 14:14:48 +0800 Subject: [PATCH 20/47] python-userpath: Add new package The patches have been submitted upstream in https://github.com/ofek/userpath/pull/52 and https://github.com/ofek/userpath/pull/53. From the README: This is a tool for modifying a user's PATH. Signed-off-by: Jeffery To --- lang/python/python-userpath/Makefile | 42 +++++++ ...rors-when-running-show-path-commands.patch | 31 +++++ ...se-Sh-as-base-class-for-Bash-and-Zsh.patch | 89 ++++++++++++++ ...2-Add-support-for-ash-Almquist-shell.patch | 112 ++++++++++++++++++ lang/python/python-userpath/test.sh | 5 + 5 files changed, 279 insertions(+) create mode 100644 lang/python/python-userpath/Makefile create mode 100644 lang/python/python-userpath/patches/0001-Handle-OSErrors-when-running-show-path-commands.patch create mode 100644 lang/python/python-userpath/patches/0001-Use-Sh-as-base-class-for-Bash-and-Zsh.patch create mode 100644 lang/python/python-userpath/patches/0002-Add-support-for-ash-Almquist-shell.patch create mode 100644 lang/python/python-userpath/test.sh diff --git a/lang/python/python-userpath/Makefile b/lang/python/python-userpath/Makefile new file mode 100644 index 000000000..969a238b5 --- /dev/null +++ b/lang/python/python-userpath/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2023 Jeffery To +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-userpath +PKG_VERSION:=1.9.1 +PKG_RELEASE:=1 + +PYPI_NAME:=userpath +PKG_HASH:=ce8176728d98c914b6401781bf3b23fccd968d1647539c8788c7010375e02796 + +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE.txt +PKG_MAINTAINER:=Jeffery To + +PKG_BUILD_DEPENDS:=python-hatchling/host + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-userpath + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Cross-platform tool for modifying a user's PATH + URL:=https://github.com/ofek/userpath + DEPENDS:=+python3-light +python3-click +python3-psutil +endef + +define Package/python3-userpath/description +This is a tool for modifying a user's PATH. +endef + +$(eval $(call Py3Package,python3-userpath)) +$(eval $(call BuildPackage,python3-userpath)) +$(eval $(call BuildPackage,python3-userpath-src)) diff --git a/lang/python/python-userpath/patches/0001-Handle-OSErrors-when-running-show-path-commands.patch b/lang/python/python-userpath/patches/0001-Handle-OSErrors-when-running-show-path-commands.patch new file mode 100644 index 000000000..3a412e62f --- /dev/null +++ b/lang/python/python-userpath/patches/0001-Handle-OSErrors-when-running-show-path-commands.patch @@ -0,0 +1,31 @@ +From 9175a0a97c7bc2eeb995e53d50a07be6a7e834f0 Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Thu, 9 Nov 2023 14:20:58 +0800 +Subject: [PATCH] Handle OSErrors when running show path commands + +Bash may not always be installed, for example on OpenWrt, and attempting +to call the show path commands for Bash will cause a FileNotFoundError +to be raised. + +This wraps the subprocess call with a try statement and returns the +empty string in the case of an OSError. +--- + userpath/utils.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/userpath/utils.py ++++ b/userpath/utils.py +@@ -30,8 +30,11 @@ def ensure_parent_dir_exists(path): + + + def get_flat_output(command, sep=os.pathsep, **kwargs): +- process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) +- output = process.communicate()[0].decode(locale.getpreferredencoding(False)).strip() ++ try: ++ process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) ++ output = process.communicate()[0].decode(locale.getpreferredencoding(False)).strip() ++ except OSError: ++ return '' + + # We do this because the output may contain new lines. + lines = [line.strip() for line in output.splitlines()] diff --git a/lang/python/python-userpath/patches/0001-Use-Sh-as-base-class-for-Bash-and-Zsh.patch b/lang/python/python-userpath/patches/0001-Use-Sh-as-base-class-for-Bash-and-Zsh.patch new file mode 100644 index 000000000..69dfde2dd --- /dev/null +++ b/lang/python/python-userpath/patches/0001-Use-Sh-as-base-class-for-Bash-and-Zsh.patch @@ -0,0 +1,89 @@ +From dffcc1c5823bcce10b420467db41e42ec41f4702 Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Thu, 9 Nov 2023 17:48:50 +0800 +Subject: [PATCH 1/2] Use Sh as base class for Bash and Zsh + +--- + userpath/shells.py | 41 ++++++++++++++++++++++++++--------------- + 1 file changed, 26 insertions(+), 15 deletions(-) + +--- a/userpath/shells.py ++++ b/userpath/shells.py +@@ -12,24 +12,36 @@ class Shell(object): + + + class Sh(Shell): +- def config(self, location, front=True): ++ name = 'sh' ++ ++ def _config_contents(self, location, front=True): + head, tail = (location, '$PATH') if front else ('$PATH', location) + new_path = '{}{}{}'.format(head, pathsep, tail) ++ return 'export PATH="{}"'.format(new_path) ++ ++ def config(self, location, front=True): ++ contents = self._config_contents(location, front=front) ++ return {path.join(self.home, '.profile'): contents} + +- return {path.join(self.home, '.profile'): 'PATH="{}"'.format(new_path)} ++ @classmethod ++ def _interactive_show_path_command(cls): ++ return [cls.name, '-i', '-c', 'echo $PATH'] ++ ++ @classmethod ++ def _interactive_login_show_path_command(cls): ++ return [cls.name, '-i', '-l', '-c', 'echo $PATH'] + + @classmethod + def show_path_commands(cls): + # TODO: Find out what file influences non-login shells. The issue may simply be our Docker setup. +- return [['sh', '-i', '-l', '-c', 'echo $PATH']] ++ return [cls._interactive_login_show_path_command()] + + +-class Bash(Shell): +- def config(self, location, front=True): +- head, tail = (location, '$PATH') if front else ('$PATH', location) +- new_path = '{}{}{}'.format(head, pathsep, tail) +- contents = 'export PATH="{}"'.format(new_path) ++class Bash(Sh): ++ name = 'bash' + ++ def config(self, location, front=True): ++ contents = self._config_contents(location, front=front) + configs = {path.join(self.home, '.bashrc'): contents} + + # https://github.com/ofek/userpath/issues/3#issuecomment-492491977 +@@ -50,7 +62,7 @@ class Bash(Shell): + + @classmethod + def show_path_commands(cls): +- return [['bash', '-i', '-c', 'echo $PATH'], ['bash', '-i', '-l', '-c', 'echo $PATH']] ++ return [cls._interactive_show_path_command(), cls._interactive_login_show_path_command()] + + + class Fish(Shell): +@@ -88,18 +100,17 @@ class Xonsh(Shell): + return [['xonsh', '-i', '-c', command], ['xonsh', '-i', '--login', '-c', command]] + + +-class Zsh(Shell): +- def config(self, location, front=True): +- head, tail = (location, '$PATH') if front else ('$PATH', location) +- new_path = '{}{}{}'.format(head, pathsep, tail) +- contents = 'export PATH="{}"'.format(new_path) ++class Zsh(Sh): ++ name = 'zsh' + ++ def config(self, location, front=True): ++ contents = self._config_contents(location, front=front) + zdotdir = environ.get('ZDOTDIR', self.home) + return {path.join(zdotdir, '.zshrc'): contents, path.join(zdotdir, '.zprofile'): contents} + + @classmethod + def show_path_commands(cls): +- return [['zsh', '-i', '-c', 'echo $PATH'], ['zsh', '-i', '-l', '-c', 'echo $PATH']] ++ return [cls._interactive_show_path_command(), cls._interactive_login_show_path_command()] + + + SHELLS = { diff --git a/lang/python/python-userpath/patches/0002-Add-support-for-ash-Almquist-shell.patch b/lang/python/python-userpath/patches/0002-Add-support-for-ash-Almquist-shell.patch new file mode 100644 index 000000000..2c1132eaa --- /dev/null +++ b/lang/python/python-userpath/patches/0002-Add-support-for-ash-Almquist-shell.patch @@ -0,0 +1,112 @@ +From 7823b9b39c486aedf830783329abdc3bd9664ba4 Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Thu, 9 Nov 2023 17:51:21 +0800 +Subject: [PATCH 2/2] Add support for ash (Almquist shell) + +--- + tests/docker/debian | 2 +- + tests/test_ash.py | 65 +++++++++++++++++++++++++++++++++++++++++++++ + userpath/shells.py | 5 ++++ + 3 files changed, 71 insertions(+), 1 deletion(-) + create mode 100644 tests/test_ash.py + +--- a/tests/docker/debian ++++ b/tests/docker/debian +@@ -2,7 +2,7 @@ ARG PYTHON_VERSION + FROM python:${PYTHON_VERSION} + + RUN apt-get update \ +- && apt-get --no-install-recommends -y install fish zsh ++ && apt-get --no-install-recommends -y install ash fish zsh + + COPY requirements.txt / + RUN pip install -r requirements.txt +--- /dev/null ++++ b/tests/test_ash.py +@@ -0,0 +1,65 @@ ++import pytest ++import userpath ++ ++from .utils import SKIP_WINDOWS_CI, get_random_path ++ ++SHELL_NAME = 'ash' ++ ++pytestmark = [SKIP_WINDOWS_CI, pytest.mark.ash] ++ ++ ++@pytest.mark.usefixtures('shell_test') ++class TestDebian(object): ++ DOCKERFILE = 'debian' ++ ++ def test_prepend(self, request, shell_test): ++ if shell_test is None: ++ location = get_random_path() ++ assert not userpath.in_current_path(location) ++ assert userpath.prepend(location, check=True) ++ assert userpath.in_new_path(location) ++ assert userpath.need_shell_restart(location) ++ else: ++ process = shell_test(request.node.name) ++ stdout, stderr = process.communicate() ++ ++ assert process.returncode == 0, (stdout + stderr).decode('utf-8') ++ ++ def test_prepend_multiple(self, request, shell_test): ++ if shell_test is None: ++ locations = [get_random_path(), get_random_path()] ++ assert not userpath.in_current_path(locations) ++ assert userpath.prepend(locations, check=True) ++ assert userpath.in_new_path(locations) ++ assert userpath.need_shell_restart(locations) ++ else: ++ process = shell_test(request.node.name) ++ stdout, stderr = process.communicate() ++ ++ assert process.returncode == 0, (stdout + stderr).decode('utf-8') ++ ++ def test_append(self, request, shell_test): ++ if shell_test is None: ++ location = get_random_path() ++ assert not userpath.in_current_path(location) ++ assert userpath.append(location, check=True) ++ assert userpath.in_new_path(location) ++ assert userpath.need_shell_restart(location) ++ else: ++ process = shell_test(request.node.name) ++ stdout, stderr = process.communicate() ++ ++ assert process.returncode == 0, (stdout + stderr).decode('utf-8') ++ ++ def test_append_multiple(self, request, shell_test): ++ if shell_test is None: ++ locations = [get_random_path(), get_random_path()] ++ assert not userpath.in_current_path(locations) ++ assert userpath.append(locations, check=True) ++ assert userpath.in_new_path(locations) ++ assert userpath.need_shell_restart(locations) ++ else: ++ process = shell_test(request.node.name) ++ stdout, stderr = process.communicate() ++ ++ assert process.returncode == 0, (stdout + stderr).decode('utf-8') +--- a/userpath/shells.py ++++ b/userpath/shells.py +@@ -37,6 +37,10 @@ class Sh(Shell): + return [cls._interactive_login_show_path_command()] + + ++class Ash(Sh): ++ name = 'ash' ++ ++ + class Bash(Sh): + name = 'bash' + +@@ -114,6 +118,7 @@ class Zsh(Sh): + + + SHELLS = { ++ 'ash': Ash, + 'bash': Bash, + 'fish': Fish, + 'sh': Sh, diff --git a/lang/python/python-userpath/test.sh b/lang/python/python-userpath/test.sh new file mode 100644 index 000000000..e87d325ba --- /dev/null +++ b/lang/python/python-userpath/test.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +[ "$1" = python3-userpath ] || exit 0 + +userpath --version | grep -Fx "userpath, version $PKG_VERSION" From 72b0da3d0382ed685939d96a740a1a2c2945a185 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 10 Nov 2023 14:17:35 +0800 Subject: [PATCH 21/47] pipx: Add new package From the README: pipx is a tool to help you install and run end-user applications written in Python. It's roughly similar to macOS's brew, JavaScript's npx, and Linux's apt. It's closely related to pip. In fact, it uses pip, but is focused on installing and managing Python packages that can be run from the command line directly as applications. Signed-off-by: Jeffery To --- lang/python/pipx/Makefile | 55 +++++++++++++++++++++++++++++++++++++++ lang/python/pipx/test.sh | 5 ++++ 2 files changed, 60 insertions(+) create mode 100644 lang/python/pipx/Makefile create mode 100644 lang/python/pipx/test.sh diff --git a/lang/python/pipx/Makefile b/lang/python/pipx/Makefile new file mode 100644 index 000000000..92835b76a --- /dev/null +++ b/lang/python/pipx/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2023 Jeffery To +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pipx +PKG_VERSION:=1.2.1 +PKG_RELEASE:=1 + +PYPI_NAME:=pipx +PKG_HASH:=698777c05a97cca81df4dc6a71d9ca4ece2184c6f91dc7a0e4802ac51d86d32a + +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Jeffery To + +PKG_BUILD_DEPENDS:=python-hatchling/host + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/pipx + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Install/Run Python Applications in Isolated Environments + URL:=https://github.com/pypa/pipx + DEPENDS:= \ + +python3-light \ + +python3-logging \ + +python3-urllib \ + +python3-venv \ + +python3-argcomplete \ + +python3-packaging \ + +python3-userpath +endef + +define Package/pipx/description +pipx is a tool to help you install and run end-user applications written +in Python. It's roughly similar to macOS's brew, JavaScript's npx, and +Linux's apt. + +It's closely related to pip. In fact, it uses pip, but is focused on +installing and managing Python packages that can be run from the command +line directly as applications. +endef + +$(eval $(call Py3Package,pipx)) +$(eval $(call BuildPackage,pipx)) +$(eval $(call BuildPackage,pipx-src)) diff --git a/lang/python/pipx/test.sh b/lang/python/pipx/test.sh new file mode 100644 index 000000000..a4f2348ae --- /dev/null +++ b/lang/python/pipx/test.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +[ "$1" = pipx ] || exit 0 + +pipx --version | grep -Fx "$PKG_VERSION" From 92aadf7e4acfaf89ef83b43244027e10f7f80d1f Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 15 Nov 2023 17:32:22 +0800 Subject: [PATCH 22/47] freeradius3: Fix build when pcre is present If pcre is built before freeradius, then freeradius' configure will detect pcre and freeradius will be built with pcre functionality enabled. This causes a "missing dependencies" error at the end of package build. This passes --without-pcre to configure to disable this autodetection. This also removes the dependency on libpcre2 as freeradius v3 does not have support for pcre2. Fixes: 19ec30255f13 ("freeradius3: switch to pcre2") Fixes: https://github.com/openwrt/packages/issues/22574 Signed-off-by: Jeffery To --- net/freeradius3/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 4a97b8414..6939f85f4 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius3 PKG_VERSION:=3.0.26 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_$(subst .,_,$(PKG_VERSION))/ @@ -63,7 +63,7 @@ endef define Package/freeradius3-common $(call Package/freeradius3/Default) TITLE:=common files - DEPENDS:=+USE_GLIBC:libpthread +USE_GLIBC:libbsd +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +libpcre2 +libreadline +libtalloc +libatomic + DEPENDS:=+USE_GLIBC:libpthread +USE_GLIBC:libbsd +FREERADIUS3_OPENSSL:libopenssl +libcap +libpcap +libncurses +libreadline +libtalloc +libatomic endef define Package/freeradius3-default @@ -499,6 +499,7 @@ CONFIGURE_ARGS+= \ --with-radacctdir=/var/db/radacct \ --with-logdir=/var/log \ --without-edir \ + --without-pcre \ --without-snmp \ --without-rlm_cache \ --without-rlm_cache_memcached \ From 6dc262aa41bffd74a7f46b2bfd2092d683734bf7 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Sun, 12 Nov 2023 17:31:28 +0100 Subject: [PATCH 23/47] dhtd: new package Co-authored-by: Tianling Shen Signed-off-by: Moritz Warning --- net/dhtd/Makefile | 44 ++++++++++++++ net/dhtd/files/dhtd.config | 31 ++++++++++ net/dhtd/files/dhtd.init | 116 +++++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 net/dhtd/Makefile create mode 100644 net/dhtd/files/dhtd.config create mode 100755 net/dhtd/files/dhtd.init diff --git a/net/dhtd/Makefile b/net/dhtd/Makefile new file mode 100644 index 000000000..42cb6e6fd --- /dev/null +++ b/net/dhtd/Makefile @@ -0,0 +1,44 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=dhtd +PKG_VERSION:=0.2.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/mwarning/dhtd/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=044dcdcf760929daba4661bf9eac461d822ad94493aa4d9dc9623625deca72a2 + +PKG_MAINTAINER:=Moritz Warning +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/dhtd + SECTION:=net + CATEGORY:=Network + SUBMENU:=IP Addresses and Names + TITLE:=DHT Daemon + URL:=https://github.com/mwarning/dhtd +endef + +define Package/dhtd/description + Standalone BitTorrent DHT daemon. Lookup and announce + hash identifiers via command line interface. +endef + +MAKE_FLAGS += FEATURES="cli lpd" + +define Package/dhtd/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/dhtd $(1)/usr/bin/ + $(LN) /usr/bin/dhtd $(1)/usr/bin/dhtd-ctl + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) files/dhtd.init $(1)/etc/init.d/dhtd + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_CONF) files/dhtd.config $(1)/etc/config/dhtd +endef + +$(eval $(call BuildPackage,dhtd)) diff --git a/net/dhtd/files/dhtd.config b/net/dhtd/files/dhtd.config new file mode 100644 index 000000000..60b15b8a6 --- /dev/null +++ b/net/dhtd/files/dhtd.config @@ -0,0 +1,31 @@ +## +## DHTd is a distributed hash table daemon that uses the BitTorrent network. +## + +config dhtd + option enabled 1 + +## Add hashes to announce them to the network +# list announce '00112233445566778899aabbcceeff0011223344' + +## Load and store good nodes every 24h and on start/shutdown. +# option peerfile '/etc/dhtd/peers.txt' + +## Add static peer addresses. + list peer 'bttracker.debian.org:6881' + list peer 'router.bittorrent.com:6881' + +## Bind the DHT to this port. +# option port '6881' + +## Limit DHT communication to this interface. +# option ifname 'lan' + +## Verbosity: quiet, verbose or debug +# option verbosity 'quiet' + +## Disable multicast peer discovery on the LAN. +# option lpd_disable '1' + +## Path for dhtd-cli to connect to. +# option cli_path '/tmp/dhtd.sock' diff --git a/net/dhtd/files/dhtd.init b/net/dhtd/files/dhtd.init new file mode 100755 index 000000000..3cd797057 --- /dev/null +++ b/net/dhtd/files/dhtd.init @@ -0,0 +1,116 @@ +#!/bin/sh /etc/rc.common + +START=95 +USE_PROCD=1 +PROG=/usr/bin/dhtd +OPTS="" + + +boot() { + # Wait for the loopback interface to be ready + ubus -t 30 wait_for network.interface network.loopback 2>/dev/null + rc_procd start_service +} + +xappend() { + local name="$2" value="$1" + OPTS="$OPTS\n--${name//_/-} ${value//'/\\'}" +} + +append_opts_list() { + local name cfg="$1"; shift + for name in $*; do + config_list_foreach "$cfg" "$name" xappend "$name" + done +} + +append_opts() { + local name value cfg="$1"; shift + for name in $*; do + config_get value "$cfg" "$name" + [ -n "$value" ] && xappend "$value" "$name" + done +} + +append_opts_boolean() { + local name value cfg="$1"; shift + for name in $*; do + config_get_bool value "$cfg" "$name" 0 + [ $value -gt 0 ] && xappend '' $name + done +} + +section_enabled() { + config_get_bool enabled "$1" 'enabled' 0 + [ $enabled -gt 0 ] +} + +start_instance() { + local cfg="$1" + local CONFIG_FILE=/tmp/dhtd.${cfg}.conf + + section_enabled "$cfg" || return + . /lib/functions/network.sh + + OPTS="" + + append_opts "$cfg" verbosity peerfile port + + config_get ifname "$cfg" "ifname" + if network_get_device IFNAME "$ifname";then + xappend "$IFNAME" "ifname" + else + [ -n "$ifname" ] && xappend "$ifname" "ifname" + fi + + append_opts_list "$cfg" announce peer + + append_opts_boolean "$cfg" lpd_disable ipv4 ipv6 + + # Close stdin when command line interface is present + if [ $($PROG --version | grep -c cli) -eq 1 ]; then + xappend "" "cli_disable_stdin" + fi + + echo -e "$OPTS" > $CONFIG_FILE + + procd_open_instance + procd_set_param command $PROG + procd_set_param file $CONFIG_FILE + procd_set_param stderr 1 + procd_set_param stdout 1 + procd_append_param command --config $CONFIG_FILE + procd_close_instance +} + +stop_instance() { + local cfg="$1" + local CONFIG_FILE=/tmp/dhtd.${cfg}.conf + + rm -f $CONFIG_FILE +} + +add_interface_trigger() { + local ifname + + config_get ifname "$1" ifname + + [ -n "$ifname" ] && procd_add_interface_trigger "interface.*" "$ifname" /etc/init.d/dhtd restart +} + +service_triggers() { + procd_add_reload_trigger "dhtd" + + config_load dhtd + config_foreach add_interface_trigger dhtd +} + +start_service() { + config_load 'dhtd' + config_foreach start_instance 'dhtd' +} + +stop_service() { + config_load 'dhtd' + config_foreach stop_instance 'dhtd' +} From c4c1b93f64969b5a92e59d0cf51c6358a6ed4a60 Mon Sep 17 00:00:00 2001 From: Fabian Lipken Date: Sun, 12 Nov 2023 07:25:06 +0100 Subject: [PATCH 24/47] fx: add new package Signed-off-by: Fabian Lipken --- utils/fx/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 utils/fx/Makefile diff --git a/utils/fx/Makefile b/utils/fx/Makefile new file mode 100644 index 000000000..9642d6070 --- /dev/null +++ b/utils/fx/Makefile @@ -0,0 +1,38 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fx +PKG_VERSION:=31.0.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/antonmedv/fx/tar.gz/$(PKG_VERSION)? +PKG_HASH:=8408047ef42506aac44aa805de209dd64ae4fc084e76bee8e24112ffbdc2d5dc + +PKG_MAINTAINER:=Fabian Lipken +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +GO_PKG:=github.com/antonmedv/fx + +include $(INCLUDE_DIR)/package.mk +include ../../lang/golang/golang-package.mk + +define Package/fx + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Terminal JSON viewer & processor + URL:=https://github.com/antonmedv/fx/ + DEPENDS:=$(GO_ARCH_DEPENDS) +endef + +define Package/fx/description + Fx is a dual-purpose command-line tool tailored for JSON, providing + both a terminal-based JSON viewer and a JSON processing utility. +endef + +$(eval $(call GoBinPackage,fx)) +$(eval $(call BuildPackage,fx)) From af1ad467ae59c3943bdad73ae07b0d16c2fd634f Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 14 Nov 2023 13:37:44 +0100 Subject: [PATCH 25/47] pdns-recursor: update to 4.9.2 and fix conffile path Signed-off-by: Peter van Dijk --- net/pdns-recursor/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile index f0820f378..0642c3459 100644 --- a/net/pdns-recursor/Makefile +++ b/net/pdns-recursor/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns-recursor -PKG_VERSION:=4.9.1 +PKG_VERSION:=4.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=0a1edc13e8f2bd661f39e316387d941e22de6a03b8a7a2fc662fdf8b942ea2be +PKG_HASH:=4cb8180458ecfb528a3d9a34ba2844b6cd2ed69ca1c461dde24a0ebd66829144 PKG_MAINTAINER:=Peter van Dijk PKG_LICENCE:=GPL-2.0-only @@ -35,7 +35,7 @@ define Package/pdns-recursor/description endef define Package/pdns-recursor/conffiles -/etc/powerdns/pdns-recursor.conf +/etc/powerdns/recursor.conf /etc/init.d/pdns-recursor endef From 2a5ad04756e45e6d9d944a14253979e5300f95e3 Mon Sep 17 00:00:00 2001 From: Matt Merhar Date: Wed, 8 Nov 2023 13:19:00 -0500 Subject: [PATCH 26/47] pps-tools: use %lld in printf for 64-bit time_t musl 1.2.0 switched to use 64-bit time_t everywhere, including 32-bit architectures, causing garbage values to be printed from ppswatch and ppstest. Use the correct format string for the affected printf statements and explicitly cast to long long to avoid potential compatibility issues with 32-bit glibc. Signed-off-by: Matt Merhar --- utils/pps-tools/Makefile | 2 +- .../pps-tools/patches/001-time_t_64bit.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 utils/pps-tools/patches/001-time_t_64bit.patch diff --git a/utils/pps-tools/Makefile b/utils/pps-tools/Makefile index 5ac3dc5fe..cbcb82be8 100644 --- a/utils/pps-tools/Makefile +++ b/utils/pps-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pps-tools PKG_VERSION:=1.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://codeload.github.com/redlab-i/pps-tools/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/utils/pps-tools/patches/001-time_t_64bit.patch b/utils/pps-tools/patches/001-time_t_64bit.patch new file mode 100644 index 000000000..aacd8bea5 --- /dev/null +++ b/utils/pps-tools/patches/001-time_t_64bit.patch @@ -0,0 +1,31 @@ +--- a/ppstest.c ++++ b/ppstest.c +@@ -110,13 +110,13 @@ retry: + } + + printf("source %d - " +- "assert %ld.%09ld, sequence: %ld - " +- "clear %ld.%09ld, sequence: %ld\n", ++ "assert %lld.%09ld, sequence: %ld - " ++ "clear %lld.%09ld, sequence: %ld\n", + i, +- infobuf.assert_timestamp.tv_sec, ++ (long long)infobuf.assert_timestamp.tv_sec, + infobuf.assert_timestamp.tv_nsec, + infobuf.assert_sequence, +- infobuf.clear_timestamp.tv_sec, ++ (long long)infobuf.clear_timestamp.tv_sec, + infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence); + fflush(stdout); + +--- a/ppswatch.c ++++ b/ppswatch.c +@@ -145,7 +145,7 @@ int fetch_source(pps_handle_t handle, in + if (max_divergence < div) + max_divergence = div; + if (div >= margin) { +- printf("timestamp: %ld, sequence: %ld, offset: % 6ld\n", ts.tv_sec, seq, ts.tv_nsec); ++ printf("timestamp: %lld, sequence: %ld, offset: % 6ld\n", (long long)ts.tv_sec, seq, ts.tv_nsec); + fflush(stdout); + overflows++; + curr_unsync++; From e957fb560c51a13c7e2441522a31146c468043db Mon Sep 17 00:00:00 2001 From: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> Date: Sun, 29 Oct 2023 19:32:22 +0100 Subject: [PATCH 27/47] pulseaudio: disable compiling against libwrap and (bluez5-)gstreamer problem: libwrap.so.0, libgstapp-1.0.so.0 and libgstreamer-1.0.so.0 not found during compilation of pulseaudio when e.g. libwrap was built before pulseaudio Due to https://github.com/pulseaudio/pulseaudio/commit/156e16f941789c5d53cdb0c46be480c64e3149f1 for libwrap. Fixes: https://github.com/openwrt/packages/commit/aafc57c1ded5450419b9690056163acf3d19d51f (no sepearate issue generated) Signed-off-by: Johnny Vogels <35307256+jmv2009@users.noreply.github.com> --- sound/pulseaudio/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index ed1cfcac3..9c1606dab 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pulseaudio PKG_VERSION:=16.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases @@ -122,7 +122,9 @@ MESON_ARGS += \ -Dx11=disabled \ -Dadrian-aec=true \ -Dwebrtc-aec=disabled \ - -Ddoxygen=false + -Ddoxygen=false \ + -Dtcpwrap=disabled \ + -Dbluez5-gstreamer=disabled ifeq ($(BUILD_VARIANT),avahi) MESON_ARGS += \ From cd5f3d302930a7fa02f3957a362f461e0ffd63c2 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Thu, 16 Nov 2023 21:07:28 +0100 Subject: [PATCH 28/47] dhtd: update to 0.2.1 Signed-off-by: Moritz Warning --- net/dhtd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dhtd/Makefile b/net/dhtd/Makefile index 42cb6e6fd..bb09f8b4a 100644 --- a/net/dhtd/Makefile +++ b/net/dhtd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dhtd -PKG_VERSION:=0.2.0 +PKG_VERSION:=0.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mwarning/dhtd/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=044dcdcf760929daba4661bf9eac461d822ad94493aa4d9dc9623625deca72a2 +PKG_HASH:=65d2e0d6a3648fe3619d9fa4bef34a76c22577b7fe3fe460f96ac10510c3f06a PKG_MAINTAINER:=Moritz Warning PKG_LICENSE:=MIT From 39431ffe2adf4a7f1ac46f9c3252e5ac42cec942 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Thu, 16 Nov 2023 18:49:18 +0100 Subject: [PATCH 29/47] docker-compose: Update to version 2.23.1 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 2f134c300..b92fcc1c6 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.23.0 +PKG_VERSION:=2.23.1 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:=805ff38df265d05c7b0c9d5df1b77e9391f7995ac5ec66bde0325b03563e7b23 +PKG_HASH:=9b4fba785b09d6745c35fff440cf5e2ce80bf7216dcb048535a7761dec492d11 PKG_MAINTAINER:=Javier Marcet From dff178a39303a9f866f08a88c435e32165a246df Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 13:00:38 -0800 Subject: [PATCH 30/47] fuse3: update to 3.16.2 Add PKG_BUILD_DEPENDS to fix potential problems. Signed-off-by: Rosen Penev --- utils/fuse3/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/fuse3/Makefile b/utils/fuse3/Makefile index 3a47a8a76..81541493d 100644 --- a/utils/fuse3/Makefile +++ b/utils/fuse3/Makefile @@ -9,17 +9,19 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse3 -PKG_VERSION:=3.10.5 -PKG_RELEASE:=2 +PKG_VERSION:=3.16.2 +PKG_RELEASE:=1 -PKG_SOURCE:=fuse-$(PKG_VERSION).tar.xz +PKG_SOURCE:=fuse-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libfuse/libfuse/releases/download/fuse-$(PKG_VERSION) -PKG_HASH:=b2e283485d47404ac896dd0bb7f7ba81e1470838e677e45f659804c3a3b69666 +PKG_HASH:=f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87 PKG_BUILD_DIR:=$(BUILD_DIR)/fuse-$(PKG_VERSION) PKG_MAINTAINER:= PKG_CPE_ID:=cpe:/a:fuse_project:fuse +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_fuse3-utils + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/meson.mk From 36360b7406e3fe62b38d45990689bb524c8d5603 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 11:46:09 -0800 Subject: [PATCH 31/47] libnpupnp: update to 5.1.1 Build with meson. Faster. Signed-off-by: Rosen Penev --- libs/libnpupnp/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index 54e7f2b21..b10cb578b 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,23 +1,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=5.0.0 -PKG_RELEASE:=2 +PKG_VERSION:=5.1.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b +PKG_HASH:=a3eeff98b94366232b558798b75f751c808bb5d5fdac6bbc4d11487c9737a1e4 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=libmicrohttpd -PKG_BUILD_FLAGS:=lto include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/meson.mk define Package/libnpupnp SECTION:=libs @@ -33,6 +31,9 @@ venerable pupnp (https://github.com/pupnp/pupnp), based on its 1.6.x branch (around 1.6.25). endef +MESON_OPTIONS += \ + -Db_lto=true + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/npupnp $(CP) $(PKG_INSTALL_DIR)/usr/include/npupnp/* $(1)/usr/include/npupnp/ From f53100b69e775caa01a53e48308e95b823fabfdc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 11:49:27 -0800 Subject: [PATCH 32/47] libupnpp: update to 0.24.0 Signed-off-by: Rosen Penev --- libs/libupnpp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 1690b67e2..133cc215a 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnpp -PKG_VERSION:=0.22.2 +PKG_VERSION:=0.24.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=90338c19383333fd4eeec8a866a8c4add1754ef9a6a720ddd9af97e6754ff849 +PKG_HASH:=dc11e4cfe9f13b2de5e15a6e9f3ceaff3a8db17996d4dbe4e4f87987e3ecfc0f PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later From 303b7b665c5f2aa177d1c4ebbc4346eafd51809b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 13:00:19 -0800 Subject: [PATCH 33/47] upmpdcli: update to 1.8.4 Signed-off-by: Rosen Penev --- sound/upmpdcli/Makefile | 4 ++-- sound/upmpdcli/patches/010-gcc13.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 sound/upmpdcli/patches/010-gcc13.patch diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index 6d7a0626c..e45dcb049 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=upmpdcli -PKG_VERSION:=1.5.19 +PKG_VERSION:=1.8.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=67fa1f5c06fecd404f3414b25a070c9deabe917241ed6881b7a8e41e8379ed09 +PKG_HASH:=91f40093d7465eb26edbc08cb93fbdd277ea83b8dbb753491c53497a4644ee87 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/sound/upmpdcli/patches/010-gcc13.patch b/sound/upmpdcli/patches/010-gcc13.patch new file mode 100644 index 000000000..63e397982 --- /dev/null +++ b/sound/upmpdcli/patches/010-gcc13.patch @@ -0,0 +1,10 @@ +--- a/src/upmpdutils.hxx ++++ b/src/upmpdutils.hxx +@@ -17,6 +17,7 @@ + #ifndef _UPMPDUTILS_H_X_INCLUDED_ + #define _UPMPDUTILS_H_X_INCLUDED_ + ++#include + #include + #include + #include From 96b349be98117573a12939ca637f513a411fa120 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 17:56:26 -0800 Subject: [PATCH 34/47] shairplay: remove This package is not only abandoned upstream, it has not worked with iOS versions since at least 2019: https://github.com/juhovh/shairplay/pull/80 Signed-off-by: Rosen Penev --- sound/shairplay/Makefile | 55 ------------------- sound/shairplay/files/shairplay.config | 10 ---- sound/shairplay/files/shairplay.init | 51 ----------------- .../shairplay/patches/001-key_file_dir.patch | 11 ---- .../patches/003-fix_big-endian.patch | 11 ---- ...heck-for-dns_sd.h-in-case-libdl-was-.patch | 21 ------- 6 files changed, 159 deletions(-) delete mode 100644 sound/shairplay/Makefile delete mode 100644 sound/shairplay/files/shairplay.config delete mode 100644 sound/shairplay/files/shairplay.init delete mode 100644 sound/shairplay/patches/001-key_file_dir.patch delete mode 100644 sound/shairplay/patches/003-fix_big-endian.patch delete mode 100644 sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch diff --git a/sound/shairplay/Makefile b/sound/shairplay/Makefile deleted file mode 100644 index 0b303da3a..000000000 --- a/sound/shairplay/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2014-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=shairplay -PKG_SOURCE_DATE:=2018-08-24 -PKG_SOURCE_VERSION:=096b61ad14c90169f438e690d096e3fcf87e504e -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/juhovh/shairplay/tar.gz/$(PKG_SOURCE_VERSION)? -PKG_HASH:=7e2b013ffe75ea2f13fb12b1aa38b8e2e8b1899ac292d57f05d7b352a3a181cf -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) - -PKG_MAINTAINER:=Álvaro Fernández Rojas -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/shairplay - SECTION:=sound - CATEGORY:=Sound - DEPENDS:=+libao +libavahi-compat-libdnssd +libltdl +libpthread - TITLE:=Shairplay -endef - -define Package/shairplay/description - Free portable AirPlay server implementation similar to ShairPort. -endef - -define Package/shairplay/conffiles -/etc/config/shairplay -endef - -define Package/shairplay/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/shairplay $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/share/shairplay - $(INSTALL_DATA) $(PKG_BUILD_DIR)/airport.key $(1)/usr/share/shairplay/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) files/shairplay.init $(1)/etc/init.d/shairplay - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) files/shairplay.config $(1)/etc/config/shairplay -endef - -$(eval $(call BuildPackage,shairplay)) diff --git a/sound/shairplay/files/shairplay.config b/sound/shairplay/files/shairplay.config deleted file mode 100644 index 6e1f93937..000000000 --- a/sound/shairplay/files/shairplay.config +++ /dev/null @@ -1,10 +0,0 @@ -config shairplay main - option disabled '1' - option respawn '1' - option apname 'AirPlay' - option port '5000' - option password '' - option hwaddr '' - option ao_driver 'oss' - option ao_devicename '' - option ao_deviceid '' diff --git a/sound/shairplay/files/shairplay.init b/sound/shairplay/files/shairplay.init deleted file mode 100644 index 093a16805..000000000 --- a/sound/shairplay/files/shairplay.init +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2014 OpenWrt.org - -START=90 -USE_PROCD=1 - -append_arg() { - local cfg="$1" - local var="$2" - local opt="$3" - local def="$4" - local val - - config_get val "$cfg" "$var" - [ -n "$val" -o -n "$def" ] && procd_append_param command $opt="${val:-$def}" -} - -start_instance() { - local cfg="$1" - local aux - - config_get_bool aux "$cfg" 'disabled' '0' - [ "$aux" = 1 ] && return 1 - - procd_open_instance - - procd_set_param command /usr/bin/shairplay - - append_arg "$cfg" apname "--apname" "AirPlay" - append_arg "$cfg" port "--server_port" - append_arg "$cfg" password "--password" - append_arg "$cfg" hwaddr "--hwaddr" - - append_arg "$cfg" ao_driver "--ao_driver" - append_arg "$cfg" ao_devicename "--ao_devicename" - append_arg "$cfg" ao_deviceid "--ao_deviceid" - - config_get_bool aux "$cfg" 'respawn' '0' - [ "$aux" = 1 ] && procd_set_param respawn - - procd_close_instance -} - -service_triggers() { - procd_add_reload_trigger "shairplay" -} - -start_service() { - config_load shairplay - config_foreach start_instance shairplay -} diff --git a/sound/shairplay/patches/001-key_file_dir.patch b/sound/shairplay/patches/001-key_file_dir.patch deleted file mode 100644 index af9bd8448..000000000 --- a/sound/shairplay/patches/001-key_file_dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/shairplay.c -+++ b/src/shairplay.c -@@ -350,7 +350,7 @@ main(int argc, char *argv[]) - raop_cbs.audio_destroy = audio_destroy; - raop_cbs.audio_set_volume = audio_set_volume; - -- raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL); -+ raop = raop_init_from_keyfile(10, &raop_cbs, "/usr/share/shairplay/airport.key", NULL); - if (raop == NULL) { - fprintf(stderr, "Could not initialize the RAOP service\n"); - fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n"); diff --git a/sound/shairplay/patches/003-fix_big-endian.patch b/sound/shairplay/patches/003-fix_big-endian.patch deleted file mode 100644 index 4db204eb7..000000000 --- a/sound/shairplay/patches/003-fix_big-endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/lib/alac/alac.c -+++ b/src/lib/alac/alac.c -@@ -29,7 +29,7 @@ - * - */ - --static const int host_bigendian = 0; -+#define host_bigendian (htonl(42) == 42) - - #include - #include diff --git a/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch b/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch deleted file mode 100644 index 84db6b8c6..000000000 --- a/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 031c3d802e51bbc233b1044f812402a66bfcf237 Mon Sep 17 00:00:00 2001 -From: Memphiz -Date: Fri, 21 Dec 2018 20:39:11 +0100 -Subject: [PATCH] [configure] - only check for dns_sd.h in case libdl was not - found - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,7 @@ LT_LIB_DLLOAD - - # Checks for header files. - AC_HEADER_STDC --if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen" -+if test no = "$libltdl_cv_func_dlopen" && test no = "$libltdl_cv_lib_dl_dlopen" - then - AC_CHECK_HEADERS([dns_sd.h], [], - [AC_MSG_ERROR([Could not find dns_sd.h header, please install libavahi-compat-libdnssd-dev or equivalent.])]) From 5ae88c48b79da0732f90ae1cb54eea9212b486e5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 5 Nov 2023 17:25:44 -0800 Subject: [PATCH 35/47] avahi: remove compat library It seems this is meant for distributions that lack mdnsresponder. It's heavier than it as dbus is required. Since this happens to conflict with mdnsresponder, just remove it. Signed-off-by: Rosen Penev --- libs/avahi/Makefile | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index 1ea497c56..88b51c32b 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -217,23 +217,6 @@ $(call Package/avahi/Default/description) For more information please see the avahi documentation. endef -define Package/libavahi-compat-libdnssd - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - VARIANT:=dbus - DEPENDS:=+libavahi-client - TITLE+= (libdnssd) -endef - -define Package/libavahi-compat-libdnssd/description -$(call Package/avahi/Default/description) - . - This packages adds the libavahi-compat-libdnssd library. - It also automatically adds the required libavahi-client package. - For more information please see the avahi documentation. -endef - define Package/avahi-utils $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names @@ -294,10 +277,6 @@ CONFIGURE_ARGS += \ --with-autoipd-group=nogroup ifeq ($(BUILD_VARIANT),dbus) -ifneq ($(CONFIG_PACKAGE_libavahi-compat-libdnssd),) -CONFIGURE_ARGS += \ - --enable-compat-libdns_sd -endif CONFIGURE_ARGS += \ --enable-dbus else @@ -314,11 +293,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-* $(1)/usr/lib/ -ifneq ($(CONFIG_PACKAGE_libavahi-compat-libdnssd),) -ifeq ($(BUILD_VARIANT),dbus) - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd* $(1)/usr/lib/ -endif -endif $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef @@ -341,11 +315,6 @@ define Package/libavahi-client/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-client.so.* $(1)/usr/lib/ endef -define Package/libavahi-compat-libdnssd/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so* $(1)/usr/lib/ -endef - define Package/avahi-utils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ @@ -393,7 +362,6 @@ define Package/avahi-dnsconfd/install endef $(eval $(call BuildPackage,libavahi-client)) -$(eval $(call BuildPackage,libavahi-compat-libdnssd)) $(eval $(call BuildPackage,avahi-utils)) $(eval $(call BuildPackage,libavahi-dbus-support)) $(eval $(call BuildPackage,libavahi-nodbus-support)) From facf954779284217c1d82f6344d7fa695972bb2e Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Fri, 17 Nov 2023 14:15:08 +0800 Subject: [PATCH 36/47] tailscale: Update to 1.54.0 Signed-off-by: Zephyr Lykos --- net/tailscale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile index 70f0d4acf..a1efec686 100644 --- a/net/tailscale/Makefile +++ b/net/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.52.1 +PKG_VERSION:=1.54.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=297d01584104dde7d1e5d2e99ee57c6a60579dc4f494ed9d2306716e031af19a +PKG_HASH:=c895a0f489706535ed400b0599d7d932d9eebc5f1bad2c236408a1e4b86620e7 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause From a7c7265e1bf4eda278a5e1fb0b26ab418a71466c Mon Sep 17 00:00:00 2001 From: Tiago Gaspar Date: Fri, 17 Nov 2023 09:25:36 +0000 Subject: [PATCH 37/47] strongswan: swanctl: add support for replay window Add support for replay window configuration in UCI. Signed-off-by: Tiago Gaspar --- net/strongswan/Makefile | 2 +- net/strongswan/files/swanctl.init | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index d175b4c4b..877e5c3cc 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.11 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init index dcc065d2e..289e7ff56 100644 --- a/net/strongswan/files/swanctl.init +++ b/net/strongswan/files/swanctl.init @@ -244,6 +244,7 @@ config_child() { local lifebytes local rekeypackets local lifepackets + local replay_window config_get startaction "$conf" startaction "route" config_get local_nat "$conf" local_nat "" @@ -262,6 +263,7 @@ config_child() { config_get lifebytes "$conf" lifebytes "" config_get rekeypackets "$conf" rekeypackets "" config_get lifepackets "$conf" lifepackets "" + config_get replay_window "$conf" replay_window "" config_list_foreach "$conf" local_subnet append_var local_subnet "," config_list_foreach "$conf" remote_subnet append_var remote_subnet "," @@ -370,6 +372,7 @@ config_child() { [ -n "$updown" ] && swanctl_xappend4 "updown = $updown" [ -n "$dpdaction" ] && swanctl_xappend4 "dpd_action = $dpdaction" + [ -n "$replay_window" ] && swanctl_xappend4 "replay_window = $replay_window" swanctl_xappend3 "}" } From 24b751bcf0842381688f80d3303ca736c479912c Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Thu, 9 Nov 2023 06:31:29 +0100 Subject: [PATCH 38/47] liburing: Update to v2.5 - Updated download URL and hash Signed-off-by: Christian Lachner --- libs/liburing/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 08403d527..1896c6188 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburing -PKG_VERSION:=2.4 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://git.kernel.dk/cgit/liburing/snapshot -PKG_HASH:=ca260e7a5820c2d0e737ec1e9b999f10776dbe84a169a02a0eff10c8eeaf3394 +PKG_HASH:=319ff9096a5655362a9741c5145b45494db810e38679a1de82e2f440c17181a6 PKG_MAINTAINER:=Christian Lachner PKG_LICENSE:=MIT From c990f18f4c233eabcd4e3981ade615d480aea093 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 13:08:33 -0800 Subject: [PATCH 39/47] snort3: fix compilation with gcc13 Missing header. Signed-off-by: Rosen Penev --- net/snort3/Makefile | 2 +- net/snort3/patches/010-gcc13.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 net/snort3/patches/010-gcc13.patch diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 2849135b2..5e452d180 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 PKG_VERSION:=3.1.74.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ diff --git a/net/snort3/patches/010-gcc13.patch b/net/snort3/patches/010-gcc13.patch new file mode 100644 index 000000000..4bfaee1db --- /dev/null +++ b/net/snort3/patches/010-gcc13.patch @@ -0,0 +1,14 @@ +--- a/src/network_inspectors/packet_capture/packet_capture.h ++++ b/src/network_inspectors/packet_capture/packet_capture.h +@@ -20,9 +20,10 @@ + #ifndef PACKET_CAPTURE_H + #define PACKET_CAPTURE_H + ++#include + #include + +-void packet_capture_enable(const std::string&, const int16_t g = -1); ++void packet_capture_enable(const std::string&, const std::int16_t g = -1); + void packet_capture_disable(); + + #endif From 6386d1e9becc69d98d6a68dd9d003d54e4ac6363 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Nov 2023 16:34:06 -0800 Subject: [PATCH 40/47] elektra: fix compilation with GCC13 Upstream backport. Signed-off-by: Rosen Penev --- libs/elektra/Makefile | 2 +- libs/elektra/patches/010-gcc13.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 libs/elektra/patches/010-gcc13.patch diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index d2a0e9601..975882226 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -15,7 +15,7 @@ PKG_NAME:=elektra PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md PKG_VERSION:=0.9.7 -PKG_RELEASE:=4 +PKG_RELEASE:=5 # Use this for official releasees PKG_HASH:=12b7b046004db29317b7b937dc794abf719c400ba3115af8d41849127b562681 diff --git a/libs/elektra/patches/010-gcc13.patch b/libs/elektra/patches/010-gcc13.patch new file mode 100644 index 000000000..35195de2f --- /dev/null +++ b/libs/elektra/patches/010-gcc13.patch @@ -0,0 +1,19 @@ +From 19fe46ecb796c0d30d66dd7e7038fd7f2d6f9bf4 Mon Sep 17 00:00:00 2001 +From: Florian Lindner +Date: Thu, 8 Jun 2023 16:55:34 +0200 +Subject: [PATCH] bindings: include in key.hpp for uint8_t + +--- + src/bindings/cpp/include/key.hpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/bindings/cpp/include/key.hpp ++++ b/src/bindings/cpp/include/key.hpp +@@ -10,6 +10,7 @@ + #define ELEKTRA_KEY_HPP + + #include ++#include + #include + #include + #include From c5de8c00044ce5d514ec220291b83a85e5e49ab3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 17 Aug 2023 16:27:19 -0700 Subject: [PATCH 41/47] hcxdmptool: update to 6.3.2 Signed-off-by: Rosen Penev --- net/hcxdumptool/Makefile | 4 +-- net/hcxdumptool/patches/010-openssl.patch | 39 ----------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 net/hcxdumptool/patches/010-openssl.patch diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile index 022f03c52..c05bd5fda 100644 --- a/net/hcxdumptool/Makefile +++ b/net/hcxdumptool/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hcxdumptool -PKG_VERSION:=6.2.4 +PKG_VERSION:=6.3.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxdumptool/tar.gz/$(PKG_VERSION)? -PKG_HASH:=cadeb4b2f00da3a1df65cb53080e134f201ef73825d35049110764faf699028d +PKG_HASH:=1f6fe2b4757a5f20adeb6cc469693b4d0e8c49ba290450e10a37699d9f9a2a42 PKG_MAINTAINER:=Andreas Nilsen PKG_LICENSE:=MIT diff --git a/net/hcxdumptool/patches/010-openssl.patch b/net/hcxdumptool/patches/010-openssl.patch deleted file mode 100644 index 6e2b04f73..000000000 --- a/net/hcxdumptool/patches/010-openssl.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/hcxdumptool.c -+++ b/hcxdumptool.c -@@ -571,10 +571,6 @@ if(rebootflag == true) - } - } - --EVP_cleanup(); --CRYPTO_cleanup_all_ex_data(); --ERR_free_strings(); -- - if(errorcount != 0) exit(EXIT_FAILURE); - if(totflag == true) exit(USER_EXIT_TOT); - exit(EXIT_SUCCESS); -@@ -7777,8 +7773,6 @@ return true; - /*===========================================================================*/ - static inline bool tlsinit() - { --SSL_load_error_strings(); --OpenSSL_add_ssl_algorithms(); - if((tlsctx = SSL_CTX_new(SSLv23_server_method())) == NULL) - { - fprintf(stderr, "OpenSSl can't create SSL context\n"); -@@ -7797,7 +7791,6 @@ if(SSL_CTX_use_PrivateKey_file(tlsctx, e - if((eaptlsctx = (eaptlsctx_t*)malloc(EAPTLSCTX_SIZE)) == NULL) return false; - memset(eaptlsctx, 0, EAPTLSCTX_SIZE); - SSL_CTX_set_session_cache_mode(tlsctx, SSL_SESS_CACHE_OFF); --SSL_CTX_set_ecdh_auto(tlsctx, 1); - SSL_CTX_set_verify(tlsctx, (SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE), eap_tls_clientverify_cb); - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - SSL_CTX_set_min_proto_version(tlsctx, TLS1_VERSION); -@@ -7872,8 +7865,6 @@ if(gpiostatusled > 0) - } - - --ERR_load_crypto_strings(); --OpenSSL_add_all_algorithms(); - opensslversion = OpenSSL_version_num(); - opensslversionmajor = (opensslversion & 0x10000000L) >> 28; - opensslversionminor = (opensslversion & 0x01100000L) >> 20; From 64b00f33dba8877408752dac00e6ccbb197102f4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 17 Aug 2023 16:33:08 -0700 Subject: [PATCH 42/47] hcxtools: update to 6.3.2 Signed-off-by: Rosen Penev --- net/hcxtools/Makefile | 35 ++++------- net/hcxtools/patches/010-openssl.patch | 85 -------------------------- 2 files changed, 13 insertions(+), 107 deletions(-) delete mode 100644 net/hcxtools/patches/010-openssl.patch diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile index 36e7d9501..c829806e9 100644 --- a/net/hcxtools/Makefile +++ b/net/hcxtools/Makefile @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hcxtools -PKG_VERSION:=6.2.4 +PKG_VERSION:=6.3.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxtools/tar.gz/$(PKG_VERSION)? -PKG_HASH:=74299313dd15ed38f07b42201903ab85ebbc3ad220a01fff1bd5c967cfea817d +PKG_HASH:=555e46a59df6a77c5aa73b99ffa8c1e84fa79e24ffaf5180de1d3a7f4ab7a470 PKG_MAINTAINER:=Andreas Nilsen PKG_LICENSE:=MIT PKG_LICENSE_FILES:=license.txt include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/meson.mk define Package/hcxtools SECTION:=net @@ -35,27 +36,17 @@ define Package/hcxtools/description for the use with latest hashcat or John the Ripper. endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/ \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" -endef - define Package/hcxtools/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxeiutool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxessidtool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxhash2cap $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxhashcattool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxhashtool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxmactool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpcapngtool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpmkidtool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpmktool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpsktool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxwltool $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/whoismac $(1)/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxeiutool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxhash2cap $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxhashtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxpcapngtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxpmktool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxpsktool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hcxwltool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/whoismac $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wlancap2wpasec $(1)/usr/bin/ endef $(eval $(call BuildPackage,hcxtools)) diff --git a/net/hcxtools/patches/010-openssl.patch b/net/hcxtools/patches/010-openssl.patch deleted file mode 100644 index 912236806..000000000 --- a/net/hcxtools/patches/010-openssl.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/hcxhashtool.c -+++ b/hcxhashtool.c -@@ -107,9 +107,6 @@ static void closelists() - { - if(hashlist != NULL) free(hashlist); - if(ouilist != NULL) free(ouilist); --EVP_cleanup(); --CRYPTO_cleanup_all_ex_data(); --ERR_free_strings(); - return; - } - /*===========================================================================*/ -@@ -128,8 +125,6 @@ eapolwrittencount = 0; - essidwrittencount = 0; - hccapxwrittencount = 0; - hccapwrittencount = 0; --ERR_load_crypto_strings(); --OpenSSL_add_all_algorithms(); - if((hashlist = (hashlist_t*)calloc(hashlistcount, HASHLIST_SIZE)) == NULL) return false; - if((ouilist = (ouilist_t*)calloc(ouilistcount, OUILIST_SIZE)) == NULL) return false; - return true; ---- a/hcxpcapngtool.c -+++ b/hcxpcapngtool.c -@@ -366,9 +366,6 @@ if(eapmschapv2msglist != NULL) free(eapm - if(eapmschapv2hashlist != NULL) free(eapmschapv2hashlist); - if(tacacsplist != NULL) free(tacacsplist); - --EVP_cleanup(); --CRYPTO_cleanup_all_ex_data(); --ERR_free_strings(); - return; - } - /*===========================================================================*/ -@@ -377,8 +374,6 @@ static bool initlists() - static unsigned long opensslversion; - static const char nastring[] = { "N/A" }; - --ERR_load_crypto_strings(); --OpenSSL_add_all_algorithms(); - opensslversion = OpenSSL_version_num(); - opensslversionmajor = (opensslversion & 0x10000000L) >> 28; - opensslversionminor = (opensslversion & 0x01100000L) >> 20; ---- a/hcxpmktool.c -+++ b/hcxpmktool.c -@@ -923,8 +923,6 @@ while((auswahl = getopt_long(argc, argv, - } - } - --ERR_load_crypto_strings(); --OpenSSL_add_all_algorithms(); - printf("\n"); - if((essidstring != NULL) && (pskstring != NULL) && (pmkstring == NULL) && (hashlinestring == NULL)) - { -@@ -956,9 +954,6 @@ else if((essidstring != NULL) && (pskstr - } - - printf("\n"); --EVP_cleanup(); --CRYPTO_cleanup_all_ex_data(); --ERR_free_strings(); - return EXIT_SUCCESS; - } - /*===========================================================================*/ ---- a/hcxpsktool.c -+++ b/hcxpsktool.c -@@ -63,8 +63,6 @@ essidglen = 32; - t = time(NULL); - tm = localtime(&t); - thisyear = tm->tm_year +1900; --ERR_load_crypto_strings(); --OpenSSL_add_all_algorithms(); - return; - } - /*===========================================================================*/ -@@ -2832,10 +2830,6 @@ if(pskname != NULL) - fclose(fhpsk); - } - --EVP_cleanup(); --CRYPTO_cleanup_all_ex_data(); --ERR_free_strings(); -- - return EXIT_SUCCESS; - } - /*===========================================================================*/ From 7b0db88b44cbc18a7929ea186993ede3c1b8c237 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 7 Nov 2023 15:54:27 +0100 Subject: [PATCH 43/47] libzip: update to 1.10.1 Signed-off-by: Michael Heimpold --- libs/libzip/Makefile | 4 ++-- libs/libzip/patches/010-nossl.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 libs/libzip/patches/010-nossl.patch diff --git a/libs/libzip/Makefile b/libs/libzip/Makefile index c48138728..656becde6 100644 --- a/libs/libzip/Makefile +++ b/libs/libzip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libzip -PKG_VERSION:=1.9.2 +PKG_VERSION:=1.10.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://libzip.org/download/ -PKG_HASH:=c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 +PKG_HASH:=dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318 PKG_MAINTAINER:=Michael Heimpold diff --git a/libs/libzip/patches/010-nossl.patch b/libs/libzip/patches/010-nossl.patch deleted file mode 100644 index 6a6875211..000000000 --- a/libs/libzip/patches/010-nossl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/lib/zipint.h -+++ b/lib/zipint.h -@@ -180,8 +180,10 @@ zip_source_t *zip_source_pkware_decode(z - zip_source_t *zip_source_pkware_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); - int zip_source_remove(zip_source_t *); - zip_int64_t zip_source_supports(zip_source_t *src); -+#ifdef HAVE_CRYPTO - zip_source_t *zip_source_winzip_aes_decode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); - zip_source_t *zip_source_winzip_aes_encode(zip_t *, zip_source_t *, zip_uint16_t, int, const char *); -+#endif - zip_source_t *zip_source_buffer_with_attributes(zip_t *za, const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes); - zip_source_t *zip_source_buffer_with_attributes_create(const void *data, zip_uint64_t len, int freep, zip_file_attributes_t *attributes, zip_error_t *error); - From 7b3d033ab651dd11e0db5fb099d106c9e09a2dc6 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 19 Nov 2023 05:36:51 +0200 Subject: [PATCH 44/47] netbird: update to version 0.24.2 Release notes: https://github.com/netbirdio/netbird/releases/tag/v0.24.2 Also fixes issue of not being able to build with musl (>1.2.4) Signed-off-by: Oskari Rauta --- net/netbird/Makefile | 14 ++++++++++---- net/netbird/files/netbird.init | 8 ++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/net/netbird/Makefile b/net/netbird/Makefile index 729564d42..606f16c51 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netbird -PKG_VERSION:=0.23.9 +PKG_VERSION:=0.24.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=1b037f35d3e426d8cbeba17e4d89d12265cd7e6fbd7c975ce552293e468db35a +PKG_HASH:=7fd90c6004c7fde6393bd618e106410e708f2d84f7884055acda6b016be42858 PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=BSD-3-Clause @@ -33,10 +33,10 @@ define Package/netbird endef define Package/netbird/description - NetBird is an open-source VPN management platform built on top of WireGuard® making it easy to create + NetBird is an open-source VPN management platform built on top of WireGuard® making it easy to create secure private networks for your organization or home. - It requires zero configuration effort leaving behind the hassle of opening ports, complex firewall rules, VPN + It requires zero configuration effort leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. endef @@ -44,6 +44,12 @@ define Package/netbird/conffiles /etc/netbird/config.json endef +# Workaround for musl 1.2.4 compability in mattn/go-sqlite3 +# https://github.com/mattn/go-sqlite3/issues/1164 +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Package/netbird/install $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d diff --git a/net/netbird/files/netbird.init b/net/netbird/files/netbird.init index b7ccd2d4b..87427c406 100755 --- a/net/netbird/files/netbird.init +++ b/net/netbird/files/netbird.init @@ -1,11 +1,19 @@ #!/bin/sh /etc/rc.common +. /lib/netifd/netifd-proto.sh + START=99 STOP=10 USE_PROCD=1 +service_triggers() { + procd_add_interface_trigger "interface.*" "wan" /etc/init.d/netbird restart +} + start_service() { + local device + procd_open_instance procd_set_param command /usr/bin/netbird procd_append_param command service run From 339360045328a3338c08dfe39e6105dac886bf4f Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sat, 18 Nov 2023 12:03:38 +0200 Subject: [PATCH 45/47] gummiboot: release bump Changes: - fixes conflicts with EFI headers mentioned in issue #22433 Signed-off-by: Oskari Rauta --- utils/gummiboot/Makefile | 2 +- .../patches/030-fix-efi-conflicts.patch | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 utils/gummiboot/patches/030-fix-efi-conflicts.patch diff --git a/utils/gummiboot/Makefile b/utils/gummiboot/Makefile index b1e6d052e..688764e43 100644 --- a/utils/gummiboot/Makefile +++ b/utils/gummiboot/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gummiboot PKG_VERSION:=48.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dev.alpinelinux.org/archive/gummiboot/ diff --git a/utils/gummiboot/patches/030-fix-efi-conflicts.patch b/utils/gummiboot/patches/030-fix-efi-conflicts.patch new file mode 100644 index 000000000..51b28d473 --- /dev/null +++ b/utils/gummiboot/patches/030-fix-efi-conflicts.patch @@ -0,0 +1,66 @@ +--- a/src/efi/console.c ++++ b/src/efi/console.c +@@ -21,63 +21,10 @@ + #include "util.h" + #include "console.h" + +-#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ +- { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } +- + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; + +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- BOOLEAN ExtendedVerification; +-); +- + typedef UINT8 EFI_KEY_TOGGLE_STATE; + +-typedef struct { +- UINT32 KeyShiftState; +- EFI_KEY_TOGGLE_STATE KeyToggleState; +-} EFI_KEY_STATE; +- +-typedef struct { +- EFI_INPUT_KEY Key; +- EFI_KEY_STATE KeyState; +-} EFI_KEY_DATA; +- +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA *KeyData; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_TOGGLE_STATE *KeyToggleState; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( +- EFI_KEY_DATA *KeyData; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA KeyData; +- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction; +- VOID **NotifyHandle; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- VOID *NotificationHandle; +-); +- +-typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { +- EFI_INPUT_RESET_EX Reset; +- EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; +- EFI_EVENT WaitForKeyEx; +- EFI_SET_STATE SetState; +- EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; +- EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; +-} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; +- + EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) { + EFI_GUID EfiSimpleTextInputExProtocolGuid = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; + static EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx; From 1ce0e4c14bb4b0eb95a8ae0b07fc28b3591d47e3 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 19 Nov 2023 14:38:30 +0800 Subject: [PATCH 46/47] dnsproxy: Update to 0.59.0 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 10dd9316c..5e92052a4 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.56.2 -PKG_RELEASE:=2 +PKG_VERSION:=0.59.0 +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:=b20a77e88567fbcb80a07faa0f47aee7446b4d32ee7c17036fbdf07c03f05e3a +PKG_HASH:=fe94a1113d9edd60bdad6075068c38cdfec2449a3e0d5a158ded53444aa2aae0 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 From 0b9c8c0a6f71356e65c4f22bf4902dbcebcc1ba3 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sat, 18 Nov 2023 21:53:56 +0100 Subject: [PATCH 47/47] gensio: add patch to fix python detection Upstream PR: https://github.com/cminyard/gensio/pull/69 Signed-off-by: Michael Heimpold --- ...hat-ax_python_devel_found-is-defined.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 net/gensio/patches/0001-Ensure-that-ax_python_devel_found-is-defined.patch diff --git a/net/gensio/patches/0001-Ensure-that-ax_python_devel_found-is-defined.patch b/net/gensio/patches/0001-Ensure-that-ax_python_devel_found-is-defined.patch new file mode 100644 index 000000000..b3654ce02 --- /dev/null +++ b/net/gensio/patches/0001-Ensure-that-ax_python_devel_found-is-defined.patch @@ -0,0 +1,29 @@ +From 6bbc3056c4b9192010d888672d97810609ee23f9 Mon Sep 17 00:00:00 2001 +From: Michael Heimpold +Date: Sat, 18 Nov 2023 21:46:15 +0100 +Subject: [PATCH] Ensure that $ax_python_devel_found is defined + +Otherwise in case of --without-python, it triggers an error like: +-snip- +... +checking consistency of all components of python development environment... yes +./configure: line 23729: test: =: unary operator expected +... +-snap- + +Signed-off-by: Michael Heimpold +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -1997,6 +1997,8 @@ if test "x$trypython" = "xyes"; then + PYTHON_CPPFLAGS="$pythoncflags" + fi + AX_PYTHON_DEVEL([], [true]) ++else ++ ax_python_devel_found=no + fi + if test $ax_python_devel_found = yes; then + AX_PROG_PYTHON_VERSION([3.0.0],