summaryrefslogtreecommitdiff
path: root/pkg/nsd/patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-07-09 22:48:49 -0700
committerMichael Forney <mforney@mforney.org>2019-07-09 22:48:49 -0700
commitb51fbb1033fbe0a33a452e211c8d3d8137d91e0a (patch)
tree22bbd8e2552dd039e8ec17f5d9dc9175b0272a14 /pkg/nsd/patch
parent8e28521c74562a6ced199815e2fc2170c090d426 (diff)
nsd: Update to 4.2.1
Diffstat (limited to 'pkg/nsd/patch')
-rw-r--r--pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch8
-rw-r--r--pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch8
2 files changed, 8 insertions, 8 deletions
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 e4c73854..5b4fa0a4 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 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
index 45c75c99..9aa7153a 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 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