commit: b51fbb1033fbe0a33a452e211c8d3d8137d91e0a
parent 8e28521c74562a6ced199815e2fc2170c090d426
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 9 Jul 2019 22:48:49 -0700
nsd: Update to 4.2.1
Diffstat:
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.2.0.tar.gz
+/nsd-4.2.1.tar.gz
/src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -151,10 +151,10 @@
/* #undef NSEC3 */
#define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
#define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.2.0"
+#define PACKAGE_STRING "NSD 4.2.1"
#define PACKAGE_TARNAME "nsd"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.2.0"
+#define PACKAGE_VERSION "4.2.1"
/* #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
@@ -1,4 +1,4 @@
-From b101b9b320234e04587cc995daedf775fe6cc9ca Mon Sep 17 00:00:00 2001
+From 2519680d304faf08d324b1bf599e3305abece87e 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 6da0ca57..9e1bf084 100644
+index df26a9ad..6a5fdee0 100644
--- a/nsd.conf.5.in
+++ b/nsd.conf.5.in
-@@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
+@@ -203,7 +203,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
.TP
.B database:\fR <filename>
By default
@@ -43,7 +43,7 @@ index 6da0ca57..9e1bf084 100644
is used. The specified file is used to store the compiled
zone information. Same as commandline option
.BR \-f.
-@@ -909,7 +909,7 @@ also function as a resolver or cache. The configuration options that
+@@ -919,7 +919,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
diff --git 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 832067946e71d1d09e47beb328c70f56c097adeb Mon Sep 17 00:00:00 2001
+From 31b2b7afa23a282fb9c960651571802d5779ac6b 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 c2eeff8a..2d261089 100644
+index 48339c54..e90dc4f9 100644
--- a/xfrd.c
+++ b/xfrd.c
-@@ -2455,7 +2455,7 @@ static void
+@@ -2463,7 +2463,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 c2eeff8a..2d261089 100644
for(i=0; i<xfrd->nsd->child_count; i++) {
xfrd->nsd->children[i].query_count += *p++;
--
-2.20.1
+2.22.0
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-51df1ca44a00e588c09ff0696e588c13566ce889b50d953896d8b6e507eda74c nsd-4.2.0.tar.gz
+d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f nsd-4.2.1.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.0.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.1.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.2.0 r1
+4.2.1 r0
