Merge branch 'next' into master

Author: jedisct1

.github/workflows/prcheck.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-DNSLOOKUP_VERSION=1.10.1
+DNSLOOKUP_VERSION=1.11.2
 
 case "$(uname -ms)" in
 Darwin\ x86_64) DNSLOOKUP_ARCH=darwin-amd64 ;;
@@ -74,7 +74,7 @@ if [ ! -s "$NEW_ENTRIES" ]; then
     exit 0
 fi
 
-curl -qL https://github.com/jedisct1/dnscrypt-proxy/releases/download/2.1.5/dnscrypt-proxy-linux_x86_64-2.1.5.tar.gz | tar xzvf -
+curl -qL https://github.com/jedisct1/dnscrypt-proxy/releases/download/2.1.15/dnscrypt-proxy-linux_x86_64-2.1.15.tar.gz | tar xzvf -
 cd linux-x86_64 || exit 1
 
 exit_code=0

.github/workflows/resolverscheck.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-DNSLOOKUP_VERSION=1.10.1
+DNSLOOKUP_VERSION=1.11.2
 
 case "$(uname -ms)" in
 Darwin\ x86_64) DNSLOOKUP_ARCH=darwin-amd64 ;;

utils/check-stamp.sh

@@ -5,9 +5,11 @@
 # Exit codes: 0 = working, 1 = not working or error
 
 DNSCRYPT_PROXY=~/src/dnscrypt-proxy/dnscrypt-proxy/dnscrypt-proxy
-CONFIG="/tmp/dnscrypt-proxy-check.toml"
-PIDFILE="/tmp/dnscrypt-proxy-check.pid"
-LOGFILE="/tmp/dnscrypt-proxy-check.log"
+WORKDIR=$(mktemp -d /tmp/dnscrypt-proxy-check-XXXXXX)
+CONFIG="$WORKDIR/config.toml"
+PIDFILE="$WORKDIR/pid"
+LOGFILE="$WORKDIR/log"
+PORT="${CHECK_PORT:-5300}"
 
 # Check arguments
 if [ $# -ne 1 ]; then
@@ -34,13 +36,13 @@ cleanup() {
     if [ -f "$PIDFILE" ]; then
         kill $(cat "$PIDFILE") 2>/dev/null
     fi
-    rm -f "$CONFIG" "$PIDFILE" "$LOGFILE"
+    rm -rf "$WORKDIR"
 }
 trap cleanup EXIT
 
 # Create config file
 {
-    echo 'listen_addresses = ["127.0.0.1:5300"]'
+    echo "listen_addresses = [\"127.0.0.1:${PORT}\"]"
     echo 'server_names = ["test-server"]'
     echo 'odoh_servers = true'
     echo 'timeout = 5000'

v1/dnscrypt-resolvers.csv

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i59l+W0zC7pMwQUxGS0A4QHARFJQUDJNlmwmOE3la8IehR3pAVct5qQyugkDxa4B2PC/N5hRsqsiauXn5Ne6Z+Ak=
-trusted comment: timestamp:1771747983	file:dnscrypt-resolvers.csv
-SAZQ+xVaEV11/yvsOcEiQ2KLJ7MELZa0jOxMft/CyCQ+xX0yUSfBZhuTcgoZ9WrN4OtnyDiXtGo8JrLd5pdNBg==
+RWQf6LRCGA9i55GfFgKrSxW/gWEE7aAAK1KBOpBCK++32EFo469EggcGml1T05j/7/SHoRksZRlhUrlsbVK3GDHaukVnzkRLbwY=
+trusted comment: timestamp:1774828545	file:dnscrypt-resolvers.csv
+8sze4VqEN3V6j+/NTBo7kIwNxuARVIL4t1lzlSqsQMGb25rnID5W7MQxWCLQyXTtrO7SQCTQ9PSe0oLsC11uBA==

v1/dnscrypt-resolvers.csv.minisig

@@ -194,7 +194,7 @@ Completely free, no ads or any commercial motive. Operating for 4 years now.
 
 Provided by: https://dnsforfamily.com
 
-sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwNyCdSDK7TI13IHsl3hdZJoLvw8pF9XncZkoO1fJI9ckzmBhkbnMtZG9oLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwNyDWHZbr-z-hkJbiwALjYDv3_arvsicE2oZoBiu-hu1LkxhkbnMtZG9oLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
 
 
 ## dnsforfamily-doh-no-safe-search
@@ -211,7 +211,7 @@ Warning: This server is incompatible with anonymization.
 
 Provided by: https://dnsforfamily.com
 
-sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwNyCdSDK7TI13IHsl3hdZJoLvw8pF9XncZkoO1fJI9ckzmCdkbnMtZG9oLW5vLXNhZmUtc2VhcmNoLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwNyDWHZbr-z-hkJbiwALjYDv3_arvsicE2oZoBiu-hu1LkydkbnMtZG9oLW5vLXNhZmUtc2VhcmNoLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
 
 
 ## dnsforfamily-no-safe-search

v2/parental-control.md

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i55I9VnRMQoXBZW7H0KuGAEOHgNVOGYUgGfnVUKWb5IufHthm8L0dbmkpVZqTFgB5dassKcGWQ7odqoTBhF0cdgk=
-trusted comment: timestamp:1767950189	file:parental-control.md
-7xh4+crM+OIciUK5uj3jXQIsZSbSleR1gyYYZIL1F3TaN1WdpovGtlbzFe/mua3EDo3nmb4/HziJd3A2kwdoDQ==
+RWQf6LRCGA9i51qcFH+SVs5rF4GuF5Ovx4tA0QSvEdFfVwhjiPt0LcJ/K4x1gZkylTm8/xsrW5uWKTSCNCHDKGSugDUiTKtpyw4=
+trusted comment: timestamp:1774793931	file:parental-control.md
+hvkCsMeoXC3diIy+ibsu+6UaKhupmSAeYP5Y3XJFT5fzRQuQN+l3Tpv/THEJK4DmP+5p8Mc8nesQhMCC1tr1Cw==