network/nsd: Updated for version 4.2.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 39 insertions, 50 deletions

diff --git a/network/nsd/nsd.SlackBuild b/network/nsd/nsd.SlackBuild
index e1370d03a2..a613e6f211 100644
--- a/network/nsd/nsd.SlackBuild
+++ b/network/nsd/nsd.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for YADIFA, Authoritative DNS server
+# Slackware build script for NSD, Authoritative DNS server
 
-# Copyright (c) 2017, Sergey Fedosov <eleksir@gmail.com>
+# Copyright (c) 2017-2020 Sergey Fedosov <eleksir@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=nsd
 USER=$PRGNAM
 GROUP=$PRGNAM
-VERSION=${VERSION:-4.1.15}
+VERSION=${VERSION:-4.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,25 +88,25 @@ find -L . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
---prefix=/usr \
---bindir=/usr/bin \
---sbindir=/usr/sbin \
---libexecdir=/usr/libexec \
---sysconfdir=/etc \
---localstatedir=/var \
---libdir=/usr/lib \
---enable-ratelimit \
---enable-ratelimit-default-is-off \
---with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \
---with-configdir="/var/lib/$USER" \
---with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \
---with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \
---with-dbfile="/var/lib/$USER/$PRGNAM.db" \
---with-zonesdir="/var/lib/$USER/zones" \
---with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \
---with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \
---with-xfrdir="/var/lib/$USER/xfrd" \
---with-user=$USER
+  --prefix=/usr \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --libexecdir=/usr/libexec \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --libdir=/usr/lib \
+  --enable-ratelimit \
+  --enable-ratelimit-default-is-off \
+  --with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \
+  --with-configdir="/var/lib/$USER" \
+  --with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \
+  --with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \
+  --with-dbfile="/var/lib/$USER/$PRGNAM.db" \
+  --with-zonesdir="/var/lib/$USER/zones" \
+  --with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \
+  --with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \
+  --with-xfrdir="/var/lib/$USER/xfrd" \
+  --with-user=$USER
 
 make
 make install DESTDIR="$PKG"
@@ -115,18 +115,22 @@ find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr/
-find "$PKG/usr/man" -type f -exec gzip -9 {} \;
+find "$PKG/usr/man" -type f -exec gzip -9 {} \+
 for i in $( find $PKG/usr/man -type l ) ; do ln -s "$( readlink $i ).gz" "$i.gz" ; rm "$i" ; done
 
-mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
-install --mode=644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+# remove empty file
+rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample"
 
-mkdir -p "$PKG/install"
-install --mode=644 "$CWD/slack-desc" "$PKG/install/slack-desc"
-install --mode=644 "$CWD/doinst.sh"  "$PKG/install/doinst.sh"
+install -Dpm 0644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+install -Dpm 0644 "$CWD/slack-desc" "$PKG/install/slack-desc"
+install -Dpm 0644 "$CWD/doinst.sh" "$PKG/install/doinst.sh"
+install -Dpm 0644 "$CWD/rc.$PRGNAM" "$PKG/etc/rc.d/rc.$PRGNAM.new"
+install -Dpm 0644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new"
+install -Dpm 0644 "$CWD/nsd.logrotate" "$PKG/etc/logrotate.d/nsd.new"
+# add sample zone
+install -Dpm 0644 "$CWD/localhost.zone" "$PKG/var/lib/$PRGNAM/zones/master/localhost.zone.new"
 
-mkdir -p "$PKG/etc/rc.d"
-install --mode=644 "$CWD/rc.$PRGNAM"  "$PKG/etc/rc.d/rc.$PRGNAM.new"
+chown -R $USER:$GROUP "$PKG/var/lib/$USER"
 
 mkdir -p "$PKG/var/run/$PRGNAM"
 chown $USER:$GROUP "$PKG/var/run/$PRGNAM"
@@ -134,20 +138,5 @@ chown $USER:$GROUP "$PKG/var/run/$PRGNAM"
 mkdir -p "$PKG/var/log/$PRGNAM"
 chown $USER:$GROUP "$PKG/var/log/$PRGNAM"
 
-chown -R $USER:$GROUP "$PKG/var/lib/$USER"
-
-mkdir -p "$PKG/etc/$PRGNAM"
-install --mode=644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new"
-
-mkdir -p $PKG/etc/logrotate.d
-install --mode=644 $CWD/nsd.logrotate $PKG/etc/logrotate.d/nsd.new
-
-# remove empty file
-rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample"
-
-# add sample zone
-mkdir -p "$PKG/var/lib/$USER/zones/master"
-install --mode=644 "$CWD/localhost.zone" "$PKG/var/lib/$USER/zones/master/localhost.zone.new"
-
 cd "$PKG"
 /sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}"
diff --git a/network/nsd/nsd.info b/network/nsd/nsd.info
index 5d43eb4c17..02c33de553 100644
--- a/network/nsd/nsd.info
+++ b/network/nsd/nsd.info
@@ -1,8 +1,8 @@
 PRGNAM="nsd"
-VERSION="4.1.15"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/"
-DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.15.tar.gz"
-MD5SUM="8b13973ae94ea02bd205734af61f3329"
+VERSION="4.2.4"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/about/"
+DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.4.tar.gz"
+MD5SUM="d9e7b2951675af166ebf5003fd6a08b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/nsd/slack-desc b/network/nsd/slack-desc
index 2aec14873a..fce11713a0 100644
--- a/network/nsd/slack-desc
+++ b/network/nsd/slack-desc
@@ -15,5 +15,5 @@ nsd:
 nsd:
 nsd:
 nsd:
-nsd: Website: https://www.nlnetlabs.nl/projects/nsd/
+nsd: Website: https://www.nlnetlabs.nl/projects/nsd/about/
 nsd: