From 5b73083f59fa34f055d990f8b21924a4f43f8245 Mon Sep 17 00:00:00 2001
From: eleksir <eleksir@exs-elm.ru>
Date: Wed, 15 May 2024 21:33:39 +0300
Subject: [PATCH] unbound: bump 1.19.0 -> 1.20.0

---
 unbound/unbound.SlackBuild | 28 +++++++---------------------
 unbound/unbound.info       |  6 +++---
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/unbound/unbound.SlackBuild b/unbound/unbound.SlackBuild
index 107b4b9..3ae585b 100755
--- a/unbound/unbound.SlackBuild
+++ b/unbound/unbound.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unbound
-VERSION=${VERSION:-1.19.0}
+VERSION=${VERSION:-1.20.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_EXs}
 
@@ -56,23 +56,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-UB_USER=${UB_USER:-unbound}
-UB_GROUP=${UB_GROUP:-unbound}
-
-# Check the system user and group for unbound:
-if ! grep -q ^"$UB_GROUP": /etc/group ; then
-  echo "  You will need a dedicated group to run unbound"
-  echo "    # groupadd -g 304 $UB_GROUP"
-  echo "  should do the job."
-  exit 1
-fi
-
-if ! grep -q ^"$UB_USER": /etc/passwd ; then
-  echo "  You will need a dedicated user to run unbound, something like"
-  echo "    # useradd -r -u 304 -g $UB_GROUP -d /var/lib/unbound/ -s /sbin/nologin -c 'Unbound DNS resolver' $UB_USER"
-  exit 1
-fi
-
 set -e
 
 rm -rf $PKG
@@ -106,10 +89,13 @@ LDFLAGS="-flto -rdynamic -Wl,--export-dynamic -Wl,-E -Wl,--no-as-needed -Wl,-O2"
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-libevent \
   --with-ssl \
-  --with-username=$UB_USER \
-  --with-pidfile=/var/run/unbound/unbound.pid \
+  --with-username=named \
+  --with-pidfile=/run/unbound/unbound.pid \
   --build=$ARCH-slackware-linux \
-  $DNSCRYPT 
+  --enable-tfo-client \
+  --enable-tfo-server \
+  --disable-explicit-port-randomisation \
+  $DNSCRYPT
 
 make -j$(nproc)
 make install DESTDIR=$PKG
diff --git a/unbound/unbound.info b/unbound/unbound.info
index 3be041c..e8b47b7 100644
--- a/unbound/unbound.info
+++ b/unbound/unbound.info
@@ -1,8 +1,8 @@
 PRGNAM="unbound"
-VERSION="1.19.0"
+VERSION="1.20.0"
 HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/"
-DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.19.0.tar.gz"
-MD5SUM="1a8c4a4bca75eadc03e21d43089ef1ee"
+DOWNLOAD="https://www.nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz"
+MD5SUM="970d8a8800e6993d4453d50979b0c657"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ldns"