nsd: Update to 4.2.3

7 files changed, 16 insertions, 15 deletions

diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
index 4f93e091..451c2b1d 100644
--- a/pkg/nsd/.gitignore
+++ b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.2.2.tar.gz
+/nsd-4.2.3.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
index 09ac98c0..5ff3c351 100644
--- a/pkg/nsd/config.h
+++ b/pkg/nsd/config.h
@@ -66,6 +66,7 @@
 #define HAVE_MEMORY_H 1
 #define HAVE_MEMSET 1
 #define HAVE_MMAP 1
+#define HAVE_MMSGHDR 1
 /* #undef HAVE_MUNMAP */
 #define HAVE_NETDB_H 1
 #define HAVE_NETINET_IN_H 1
@@ -151,10 +152,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.2.2"
+#define PACKAGE_STRING "NSD 4.2.3"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.2.2"
+#define PACKAGE_VERSION "4.2.3"
 /* #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 5b4fa0a4..57b668f5 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 2519680d304faf08d324b1bf599e3305abece87e Mon Sep 17 00:00:00 2001
+From 9eea05a128090e9466cc76755e4ae9d0859c0e26 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 df26a9ad..6a5fdee0 100644
+index c7af7bec..c790e803 100644
 --- a/nsd.conf.5.in
 +++ b/nsd.conf.5.in
-@@ -203,7 +203,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
+@@ -193,7 +193,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
  .TP
  .B database:\fR <filename>
  By default 
@@ -43,7 +43,7 @@ index df26a9ad..6a5fdee0 100644
  is used. The specified file is used to store the compiled 
  zone information. Same as commandline option 
  .BR \-f.
-@@ -919,7 +919,7 @@ also function as a resolver or cache. The configuration options that
+@@ -916,7 +916,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 df26a9ad..6a5fdee0 100644
  .B NSD
  database
 -- 
-2.22.0
+2.24.0
 
diff --git a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch
index dfd635b6..5a8e77c3 100644
--- a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch
+++ b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch
@@ -1,4 +1,4 @@
-From fcfbed8db1c746bd938ac6a548036af95b678341 Mon Sep 17 00:00:00 2001
+From ecde6ced1a7d7649510c5428646e2a96477f6c6f Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 16 Jun 2019 23:17:47 -0700
 Subject: [PATCH] Avoid pointer arithmetic on `void *`
@@ -162,10 +162,10 @@ index 8d7ee137..3ee98648 100644
  /** MAX 2**x exponent of alloced chunks, for 1Mbytes.  The smallest
   * chunk is 16bytes (8preamble+8data), so 0-3 is unused. */
 diff --git a/xfrd.c b/xfrd.c
-index 3865747a..89713236 100644
+index bd07d797..82551907 100644
 --- a/xfrd.c
 +++ b/xfrd.c
-@@ -2465,7 +2465,7 @@ static void
+@@ -2466,7 +2466,7 @@ static void
  xfrd_process_stat_info_task(xfrd_state_type* xfrd, struct task_list_d* task)
  {
  	size_t i;
@@ -175,5 +175,5 @@ index 3865747a..89713236 100644
  	for(i=0; i<xfrd->nsd->child_count; i++) {
  		xfrd->nsd->children[i].query_count += *p++;
 -- 
-2.23.0
+2.24.0
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
index 172560b1..154f2a87 100644
--- a/pkg/nsd/sha256
+++ b/pkg/nsd/sha256
@@ -1 +1 @@
-83b333940a25fe6d453bcac6ea39edfa244612a879117c4a624c97eb250246fb  nsd-4.2.2.tar.gz
+817d963b39d2af982f6a523f905cfd5b14a3707220a8da8f3013f34cdfe5c498  nsd-4.2.3.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
index a47e6e78..82f3f83b 100644
--- a/pkg/nsd/url
+++ b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.2.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.3.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
index b0fabde5..1d99f29e 100644
--- a/pkg/nsd/ver
+++ b/pkg/nsd/ver
@@ -1 +1 @@
-4.2.2 r0
+4.2.3 r0