nsd: Update to 4.3.6

7 files changed, 16 insertions, 14 deletions

diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
index e0277348..a3df7476 100644
--- a/pkg/nsd/.gitignore
+++ b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.3.5.tar.gz
+/nsd-4.3.6.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
index 467afae5..f4649e3c 100644
--- a/pkg/nsd/config.h
+++ b/pkg/nsd/config.h
@@ -63,6 +63,7 @@
 #define HAVE_GRP_H 1
 /* #undef HAVE_HMAC_CTX_NEW */
 /* #undef HAVE_HMAC_CTX_RESET */
+#define HAVE_IFADDRS_H 1
 #define HAVE_INET_ATON 1
 #define HAVE_INET_NTOP 1
 #define HAVE_INET_PTON 1
@@ -134,6 +135,7 @@
 #define HAVE_STRUCT_TIMESPEC 1
 #define HAVE_SYSCONF 1
 /* #undef HAVE_SYSLOG_H */
+/* #undef HAVE_SYSTEMD */
 /* #undef HAVE_SYS_BITYPES_H */
 /* #undef HAVE_SYS_CPUSET_H */
 /* #undef HAVE_SYS_MMAN_H */
@@ -172,10 +174,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.3.5"
+#define PACKAGE_STRING "NSD 4.3.6"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.3.5"
+#define PACKAGE_VERSION "4.3.6"
 /* #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 9fdf9c82..5fc79e43 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 d3614f9764fe1a3f248eefc4af7e2553809b7ab7 Mon Sep 17 00:00:00 2001
+From abaf88fc017d36c733a6ecc69f709085abdbed12 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,7 +31,7 @@ index 5e488958..babaa06a 100644
  .B NSD
  database
 diff --git a/nsd.conf.5.in b/nsd.conf.5.in
-index 66b90380..27d95322 100644
+index a873d9f7..91dd77f3 100644
 --- a/nsd.conf.5.in
 +++ b/nsd.conf.5.in
 @@ -202,7 +202,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
@@ -43,7 +43,7 @@ index 66b90380..27d95322 100644
  is used. The specified file is used to store the compiled 
  zone information. Same as commandline option 
  .BR \-f.
-@@ -963,7 +963,7 @@ also function as a resolver or cache. The configuration options that
+@@ -1022,7 +1022,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 66b90380..27d95322 100644
  .B NSD
  database
 -- 
-2.29.0
+2.31.1
 
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 fb627058..ea96aa43 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 32521d09355f1be4eaeabb11baffc86db238bb08 Mon Sep 17 00:00:00 2001
+From 3d154a079c8417779c0c83d4ce73678613ba6026 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,13 +9,13 @@ Subject: [PATCH] Use timingsafe_memcmp if available
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 123e7f3c..8cbc8c96 100644
+index bd64fdb2..0ce02518 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -635,7 +635,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])])
+ AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h],,, [AC_INCLUDES_DEFAULT])])
 -AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 getifaddrs])
 +AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 getifaddrs timingsafe_memcmp])
  
@@ -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.30.0
+2.31.1
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
index 76af8057..09902d83 100644
--- a/pkg/nsd/sha256
+++ b/pkg/nsd/sha256
@@ -1 +1 @@
-7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472  nsd-4.3.5.tar.gz
+bee6c0cf5525acc41dade9ec9e29435299211b0de290059878f7e53249e75f18  nsd-4.3.6.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
index 7df5551d..9e8a5317 100644
--- a/pkg/nsd/url
+++ b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.5.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.6.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
index 361ccfc1..42f57927 100644
--- a/pkg/nsd/ver
+++ b/pkg/nsd/ver
@@ -1 +1 @@
-4.3.5 r0
+4.3.6 r0