Merge pull request #22746 from stangri/master-https-dns-proxy

https-dns-proxy: fix unintentional call of service_stopped in boot()

diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile
index b10cb578b18aa29754926c13b843a3b9bf5d74ba..f4ce5117ceeaa604e025dadc1a7dff7fa4eb9fe7 100644 (file)
--- a/libs/libnpupnp/Makefile
+++ b/libs/libnpupnp/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnpupnp
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=a3eeff98b94366232b558798b75f751c808bb5d5fdac6bbc4d11487c9737a1e4
+PKG_HASH:=c1be8b2f654ef520791fbfaf13006fdd84522e6480a3126006e40caceea23552
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile
index 133cc215a29e6acbc97c0e3ba46956483c7e4c41..1d76e81169cb11ecb18da4f0f36a77e57f47e498 100644 (file)
--- a/libs/libupnpp/Makefile
+++ b/libs/libupnpp/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupnpp
-PKG_VERSION:=0.24.0
+PKG_VERSION:=0.24.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=dc11e4cfe9f13b2de5e15a6e9f3ceaff3a8db17996d4dbe4e4f87987e3ecfc0f
+PKG_HASH:=f09d5162f237bcb971ef4bbd45de9e93a073d96555cd691374eb1a3f338b2d0b
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index 51824a3318d4d33f7de087d9a95336cbdde4e437..39800026b8d95f0b026bc2814d694f343380f021 100644 (file)
--- 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:=5
+PKG_RELEASE:=6
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 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 ea7b3416cd1b3c19cf5543eaade788738a2134e8..4837b7a3383e901d015995be608b1a2261866cdb 100755 (executable)
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -1764,7 +1764,7 @@ adb_pause() {
        local validation_result="$3"
        adb_stop 'on_pause' '' "$validation_result"
        output "Sleeping for $timeout seconds... "
-       if is_number "$timeout" && sleep "$timeout"; then
+       if is_integer "$timeout" && sleep "$timeout"; then
                output_okn
        else
                output_failn
@@ -1779,8 +1779,8 @@ boot() {
        config_load "$packageName"
        config_get procd_boot_delay 'config' 'procd_boot_delay' '0'
 # shellcheck disable=SC2154
-       { is_integer "$procd_boot_delay" && sleep "$procd_boot_delay" || true; } && \
-               rc_procd start_service 'on_boot' && service_started 'on_boot' &
+       { is_integer "$procd_boot_delay" && sleep "$procd_boot_delay"; \
+               rc_procd start_service 'on_boot' && service_started 'on_boot'; } &
 }
 check() { load_validate_config 'config' adb_check "'$*'"; }
 check_lists() { load_validate_config 'config' adb_check_lists "'$*'"; }

diff --git a/net/banip/Makefile b/net/banip/Makefile
index 7c559458f2435485e9b07ecaa463033abb07d1d5..28b76bc86aa0de6bbfc18afe59cbe9763af18c52 100644 (file)
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.9.2
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/banip/files/banip-functions.sh b/net/banip/files/banip-functions.sh
index db2c15f6bb4cf75ca2c9dec2fae7e254d04b2935..1a1266d03554897813d0fe15110bb9825de9a2b6 100644 (file)
--- a/net/banip/files/banip-functions.sh
+++ b/net/banip/files/banip-functions.sh
@@ -194,10 +194,10 @@ f_rmpid() {
                for pid in ${pids}; do
                        pids="${pids} $(pgrep -P "${pid}" 2>/dev/null)"
                done
+               for pid in ${pids}; do
+                       kill -INT "${pid}" >/dev/null 2>&1
+               done
        fi
-       for pid in ${pids}; do
-               kill -INT "${pid}" >/dev/null 2>&1
-       done
        : >"${ban_rdapfile}"
        : >"${ban_pidfile}"
 }

diff --git a/net/banip/files/banip.feeds b/net/banip/files/banip.feeds
index cfe1a70cc690f4ed7f89433f4def2ec9226b5dfc..1adb11eb59adb6f481e10dd1dcb26a24469938ad 100644 (file)
--- a/net/banip/files/banip.feeds
+++ b/net/banip/files/banip.feeds
@@ -256,7 +256,7 @@
        },
        "urlhaus":{
                "url_4": "https://urlhaus.abuse.ch/downloads/ids/",
-               "rule_4": "match($0,/(([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5]))/){printf \"%s,\\n\",substr($0,RSTART,RLENGTH)}",
+               "rule_4": "match($0,/(content:\"([0-9]{1,3}\\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5]))/){printf \"%s,\\n\",substr($0,RSTART+9,RLENGTH-9)}",
                "descr": "urlhaus IDS IPs"
        },
        "urlvir":{

diff --git a/net/banip/files/banip.init b/net/banip/files/banip.init
index a934b4a9196708cebca58da85abebd74c800dad8..4ef70e3d0c0071a83194b403f9fd01b53b223cb7 100755 (executable)
--- a/net/banip/files/banip.init
+++ b/net/banip/files/banip.init
@@ -22,6 +22,7 @@ ban_lock="/var/run/banip.lock"
 
 [ "${action}" = "boot" ] && "${ban_init}" running && exit 0
 { [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "survey" ] || [ "${action}" = "lookup" ]; } && ! "${ban_init}" running && exit 0
+[ ! -r "${ban_funlib}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "lookup" ] || [ "${action}" = "status" ]; } && exit 1
 [ -d "${ban_lock}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "lookup" ]; } && exit 1
 [ ! -d "${ban_lock}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "lookup" ]; } && mkdir -p "${ban_lock}"
 
@@ -31,8 +32,8 @@ boot() {
 }
 
 start_service() {
+       [ -z "$(command -v "f_system")" ] && . "${ban_funlib}"
        if "${ban_init}" enabled; then
-               [ -z "$(command -v "f_system")" ] && . "${ban_funlib}"
                f_rmpid
                procd_open_instance "banip-service"
                procd_set_param command "${ban_service}" "${@:-"${action}"}"
@@ -43,7 +44,6 @@ start_service() {
                procd_set_param stderr 1
                procd_close_instance
        else
-               [ -z "$(command -v "f_system")" ] && . "${ban_funlib}"
                f_log "err" "banIP service autostart is disabled"
                rm -rf "${ban_lock}"
        fi

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 61ceef8632f2a26c5e76efc3d25414c59542ca26..607152a1c7d863297a56575751b5958d39960926 100644 (file)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=2.8.2
-PKG_RELEASE:=41
+PKG_RELEASE:=42
 
 PKG_LICENSE:=GPL-2.0
 

diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh b/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
index 499f272031600aeea61ab2b184f860dba4188cdb..0d474051eed323380031de020d8cf33bfd4723b7 100644 (file)
--- a/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
+++ b/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
@@ -11,9 +11,10 @@
 ENDPOINT="route53.amazonaws.com"
 RECORD_TTL=300
 RECORD_NAME="${lookup_host}."
+RECORD_VALUE="${__IP}"
 [ ${use_ipv6} -eq 0 ] && RECORD_TYPE="A"
 [ ${use_ipv6} -eq 1 ] && RECORD_TYPE="AAAA"
-RECORD_VALUE="${LOCAL_IP}"
+
 HOSTED_ZONE_ID="${domain}"
 API_PATH="/2013-04-01/hostedzone/${HOSTED_ZONE_ID}/rrset/"
 

diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile
index e45dcb049ccd7f0f25130af4bed9042709fbc181..b46318513220cf8ef9101c1ac8b8641425ca8f00 100644 (file)
--- a/sound/upmpdcli/Makefile
+++ b/sound/upmpdcli/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=upmpdcli
-PKG_VERSION:=1.8.4
+PKG_VERSION:=1.8.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=91f40093d7465eb26edbc08cb93fbdd277ea83b8dbb753491c53497a4644ee87
+PKG_HASH:=55e3d27bea5bef4560f319137f1a5c7d08abbba5a9aae90ee3240903fdb8c3e4
 
 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
deleted file mode 100644 (file)
index 63e3979..0000000
--- a/sound/upmpdcli/patches/010-gcc13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/upmpdutils.hxx
-+++ b/src/upmpdutils.hxx
-@@ -17,6 +17,7 @@
- #ifndef _UPMPDUTILS_H_X_INCLUDED_
- #define _UPMPDUTILS_H_X_INCLUDED_
- 
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>