nsd: Update to 4.3.2

7 files changed, 16 insertions, 15 deletions

diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
index 57b50992..16bef33a 100644
--- a/pkg/nsd/.gitignore
+++ b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.3.1.tar.gz
+/nsd-4.3.2.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
index feef0750..37ee0b9e 100644
--- a/pkg/nsd/config.h
+++ b/pkg/nsd/config.h
@@ -1,6 +1,7 @@
 #define ATTR_NORETURN __attribute__((__noreturn__))
 #define BIND8_STATS /**/
 /* #undef CHROOTDIR */
+#define CONFCMDLINE "--prefix= --sbindir=/bin --with-zonesdir=/etc/nsd/zone --with-pidfile=/run/nsd.pid --without-ssl --without-libevent"
 #define CONFIGDIR "/etc/nsd"
 #define CONFIGFILE "/etc/nsd/nsd.conf"
 #define CPU_OR_THREE_ARGS 1
@@ -167,10 +168,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.3.1"
+#define PACKAGE_STRING "NSD 4.3.2"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.3.1"
+#define PACKAGE_VERSION "4.3.2"
 /* #undef PACKED_STRUCTS */
 #define PIDFILE "/run/nsd.pid"
 /* #undef RATELIMIT */
diff --git a/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch b/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch
index c996bb47..347deb00 100644
--- a/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch
+++ b/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch
@@ -1,4 +1,4 @@
-From d5b4c0724306c268c8e28c7cebe7cb1e09e8299d Mon Sep 17 00:00:00 2001
+From 2fd6c5a200fe44a209ffebd11da9a7eebf484b69 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 14 Oct 2017 01:00:22 -0700
 Subject: [PATCH] Remove quotes from @dbfile@ in man pages
@@ -31,10 +31,10 @@ index 5e488958..babaa06a 100644
  .B NSD
  database
 diff --git a/nsd.conf.5.in b/nsd.conf.5.in
-index b878cee2..15ad87be 100644
+index 851c6de8..249cfa7c 100644
 --- a/nsd.conf.5.in
 +++ b/nsd.conf.5.in
-@@ -203,7 +203,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
+@@ -198,7 +198,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
  .TP
  .B database:\fR <filename>
  By default 
@@ -43,7 +43,7 @@ index b878cee2..15ad87be 100644
  is used. The specified file is used to store the compiled 
  zone information. Same as commandline option 
  .BR \-f.
-@@ -949,7 +949,7 @@ also function as a resolver or cache. The configuration options that
+@@ -959,7 +959,7 @@ also function as a resolver or cache. The configuration options that
  BIND9 has for the resolver or caching thus have no equivalents for NSD.
  .SH "FILES"
  .TP
@@ -53,5 +53,5 @@ index b878cee2..15ad87be 100644
  .B NSD
  database
 -- 
-2.25.1
+2.28.0
 
diff --git a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
index 4f4bb3f0..e9bdb298 100644
--- a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
+++ b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
@@ -1,4 +1,4 @@
-From b7775ef04a2afebea2d3f98bcbc86454fb316624 Mon Sep 17 00:00:00 2001
+From 4d74fd369274f100e8aca1332ed59ca3c2eb8063 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 21 Aug 2018 15:52:34 -0700
 Subject: [PATCH] Use timingsafe_memcmp if available
@@ -9,10 +9,10 @@ Subject: [PATCH] Use timingsafe_memcmp if available
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index eaa20552..57098aba 100644
+index 6c6bb224..f955eb1f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -654,7 +654,7 @@ AC_CHECK_SIZEOF(void*)
+@@ -657,7 +657,7 @@ AC_CHECK_SIZEOF(void*)
  AC_CHECK_SIZEOF(off_t)
  AC_CHECK_FUNCS([getrandom arc4random arc4random_uniform])
  AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h])])
@@ -37,5 +37,5 @@ index 8b24fd1b..e75aa231 100644
  #define CRYPTO_memcmp memcmp_fixedtime
  int memcmp_fixedtime(const void *s1, const void *s2, size_t n)
 -- 
-2.26.1
+2.28.0
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
index 06f25c4f..9c43f75b 100644
--- a/pkg/nsd/sha256
+++ b/pkg/nsd/sha256
@@ -1 +1 @@
-f4b34ace6651a81386464cc990f046e7328aa2485274fe8743086997129d8987  nsd-4.3.1.tar.gz
+5b5cee2f80ed451f19e02dee620c71a98a781bd72a55810e0acc925fecaa8329  nsd-4.3.2.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
index 9209eca1..26df0259 100644
--- a/pkg/nsd/url
+++ b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.1.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.2.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
index 5625de94..9b46c714 100644
--- a/pkg/nsd/ver
+++ b/pkg/nsd/ver
@@ -1 +1 @@
-4.3.1 r0
+4.3.2 r0