Add nsd 4.1.17

4 files changed, 204 insertions, 0 deletions

diff --git a/pkg/nsd/patch/0001-Fix-writev-compile-warning-on-FreeBSD.patch b/pkg/nsd/patch/0001-Fix-writev-compile-warning-on-FreeBSD.patch
new file mode 100644
index 00000000..8b573bce
--- /dev/null
+++ b/pkg/nsd/patch/0001-Fix-writev-compile-warning-on-FreeBSD.patch
@@ -0,0 +1,54 @@
+From 5e22412c42c546a1e3c5e44adb93ac5e4088419a Mon Sep 17 00:00:00 2001
+From: wouter <wouter@a26ef69c-88ff-0310-839f-98b793d9c207>
+Date: Tue, 29 Aug 2017 12:42:20 +0000
+Subject: [PATCH] - Fix writev compile warning on FreeBSD.
+
+git-svn-id: https://www.nlnetlabs.nl/svn/nsd/trunk@4773 a26ef69c-88ff-0310-839f-98b793d9c207
+---
+ doc/ChangeLog | 3 +++
+ doc/RELNOTES  | 6 ++++++
+ xfrd-tcp.c    | 1 +
+ 3 files changed, 10 insertions(+)
+
+diff --git a/doc/ChangeLog b/doc/ChangeLog
+index ff6d1347..6e52fff4 100644
+--- a/doc/ChangeLog
++++ b/doc/ChangeLog
+@@ -1,3 +1,6 @@
++29 August 2016: Wouter
++	- Fix writev compile warning on FreeBSD.
++
+ 29 June 2016: Wouter
+ 	- make depend.
+ 
+diff --git a/doc/RELNOTES b/doc/RELNOTES
+index 752c468c..c72ed6f8 100644
+--- a/doc/RELNOTES
++++ b/doc/RELNOTES
+@@ -1,5 +1,11 @@
+ NSD RELEASE NOTES
+ 
++4.1.18 (upcoming)
++================
++BUG FIXES:
++	- Fix writev compile warning on FreeBSD.
++
++
+ 4.1.17
+ ================
+ FEATURES:
+diff --git a/xfrd-tcp.c b/xfrd-tcp.c
+index 27156894..167cf1c7 100644
+--- a/xfrd-tcp.c
++++ b/xfrd-tcp.c
+@@ -13,6 +13,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <sys/uio.h>
+ #include "nsd.h"
+ #include "xfrd-tcp.h"
+ #include "buffer.h"
+-- 
+2.14.2
+
diff --git a/pkg/nsd/patch/0002-Fix-1567-Change-crit-to-err-log-level-for-gettimeofd.patch b/pkg/nsd/patch/0002-Fix-1567-Change-crit-to-err-log-level-for-gettimeofd.patch
new file mode 100644
index 00000000..30862dfd
--- /dev/null
+++ b/pkg/nsd/patch/0002-Fix-1567-Change-crit-to-err-log-level-for-gettimeofd.patch
@@ -0,0 +1,39 @@
+From 685eeb1ab71422ce4151dbd803674b33115a1fb3 Mon Sep 17 00:00:00 2001
+From: wouter <wouter@a26ef69c-88ff-0310-839f-98b793d9c207>
+Date: Wed, 11 Oct 2017 06:44:50 +0000
+Subject: [PATCH] - Fix #1567: Change crit to err log level for gettimeofday
+ failure.
+
+git-svn-id: https://www.nlnetlabs.nl/svn/nsd/trunk@4786 a26ef69c-88ff-0310-839f-98b793d9c207
+---
+ doc/ChangeLog | 3 +++
+ netio.c       | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/ChangeLog b/doc/ChangeLog
+index 6e52fff4..f58c71ac 100644
+--- a/doc/ChangeLog
++++ b/doc/ChangeLog
+@@ -1,3 +1,6 @@
++11 October 2016: Wouter
++	- Fix #1567: Change crit to err log level for gettimeofday failure.
++
+ 29 August 2016: Wouter
+ 	- Fix writev compile warning on FreeBSD.
+ 
+diff --git a/netio.c b/netio.c
+index 6c4b395b..58fd2e18 100644
+--- a/netio.c
++++ b/netio.c
+@@ -94,7 +94,7 @@ netio_current_time(netio_type *netio)
+ 	if (!netio->have_current_time) {
+ 		struct timeval current_timeval;
+ 		if (gettimeofday(&current_timeval, NULL) == -1) {
+-			log_msg(LOG_CRIT, "gettimeofday: %s, aborting.", strerror(errno));
++			log_msg(LOG_ERR, "gettimeofday: %s, aborting.", strerror(errno));
+ 			abort();
+ 		}
+ 		timeval_to_timespec(&netio->cached_current_time, &current_timeval);
+-- 
+2.14.2
+
diff --git a/pkg/nsd/patch/0003-Fix-1567-Add-defines-for-compile-without-syslog.patch b/pkg/nsd/patch/0003-Fix-1567-Add-defines-for-compile-without-syslog.patch
new file mode 100644
index 00000000..6600b9b5
--- /dev/null
+++ b/pkg/nsd/patch/0003-Fix-1567-Add-defines-for-compile-without-syslog.patch
@@ -0,0 +1,54 @@
+From 3bd8d49884860c41341565d19541b165265b0d75 Mon Sep 17 00:00:00 2001
+From: wouter <wouter@a26ef69c-88ff-0310-839f-98b793d9c207>
+Date: Wed, 11 Oct 2017 06:47:42 +0000
+Subject: [PATCH] - Fix #1567: Add defines for compile without syslog.
+
+git-svn-id: https://www.nlnetlabs.nl/svn/nsd/trunk@4787 a26ef69c-88ff-0310-839f-98b793d9c207
+---
+ doc/ChangeLog | 1 +
+ doc/RELNOTES  | 2 ++
+ util.h        | 4 ++++
+ 3 files changed, 7 insertions(+)
+
+diff --git a/doc/ChangeLog b/doc/ChangeLog
+index f58c71ac..5d6585a9 100644
+--- a/doc/ChangeLog
++++ b/doc/ChangeLog
+@@ -1,5 +1,6 @@
+ 11 October 2016: Wouter
+ 	- Fix #1567: Change crit to err log level for gettimeofday failure.
++	  Add defines for compile without syslog.
+ 
+ 29 August 2016: Wouter
+ 	- Fix writev compile warning on FreeBSD.
+diff --git a/doc/RELNOTES b/doc/RELNOTES
+index c72ed6f8..4f052745 100644
+--- a/doc/RELNOTES
++++ b/doc/RELNOTES
+@@ -4,6 +4,8 @@ NSD RELEASE NOTES
+ ================
+ BUG FIXES:
+ 	- Fix writev compile warning on FreeBSD.
++	- Fix #1567: Change crit to err log level for gettimeofday failure.
++	  Add defines for compile without syslog.
+ 
+ 
+ 4.1.17
+diff --git a/util.h b/util.h
+index b59b7b69..5f00911d 100644
+--- a/util.h
++++ b/util.h
+@@ -25,6 +25,10 @@ struct region;
+ #  define LOG_WARNING 4
+ #  define LOG_NOTICE 5
+ #  define LOG_INFO 6
++
++/* Unused, but passed to log_open. */
++#  define LOG_PID 0x01
++#  define LOG_DAEMON (3<<3)
+ #endif
+ 
+ #define ALIGN_UP(n, alignment)  \
+-- 
+2.14.2
+
diff --git a/pkg/nsd/patch/0004-Remove-quotes-from-dbfile-in-man-pages.patch b/pkg/nsd/patch/0004-Remove-quotes-from-dbfile-in-man-pages.patch
new file mode 100644
index 00000000..bd7095c0
--- /dev/null
+++ b/pkg/nsd/patch/0004-Remove-quotes-from-dbfile-in-man-pages.patch
@@ -0,0 +1,57 @@
+From 82f72d52236a5642f95b52fb1ed10b16b756eb82 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
+
+---
+ nsd.8.in      | 4 ++--
+ nsd.conf.5.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/nsd.8.in b/nsd.8.in
+index 5e488958..babaa06a 100644
+--- a/nsd.8.in
++++ b/nsd.8.in
+@@ -115,7 +115,7 @@ Do not fork, stay in the foreground.
+ Use the specified
+ .I database
+ instead of the default of
+-.IR '@dbfile@' .
++.IR @dbfile@ .
+ If a 
+ .B zonesdir: 
+ is specified in the config file this path can be relative to that 
+@@ -224,7 +224,7 @@ SIGUSR1
+ Dump BIND8\-style statistics into the log. Ignored otherwise.
+ .SH "FILES"
+ .TP
+-"@dbfile@"
++@dbfile@
+ default
+ .B NSD
+ database
+diff --git a/nsd.conf.5.in b/nsd.conf.5.in
+index b9ac956b..4f7c9867 100644
+--- a/nsd.conf.5.in
++++ b/nsd.conf.5.in
+@@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
+ .TP
+ .B database:\fR <filename>
+ By default 
+-.I '@dbfile@'
++.I @dbfile@
+ is used. The specified file is used to store the compiled 
+ zone information. Same as commandline option 
+ .BR \-f.
+@@ -858,7 +858,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
+-"@dbfile@"
++@dbfile@
+ default
+ .B NSD
+ database
+-- 
+2.14.2
+