commit: 1bb56420e2e44be4ef5356164aef5613aaaaf968
parent d9c8a3a1347ca45d05c635dfb8f074feb1074c70
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 21 Aug 2018 15:54:07 -0700
nsd: Update to 4.1.24
Diffstat:
7 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.1.20.tar.gz
+/nsd-4.1.24.tar.gz
/src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -6,6 +6,7 @@
#define DBFILE "/var/db/nsd/nsd.db"
#define EDNS_MAX_MESSAGE_LEN 4096
#define FACILITY LOG_DAEMON
+#define HAVE_ACCEPT4 1
#define HAVE_ALARM 1
/* #undef HAVE_ARC4RANDOM */
/* #undef HAVE_ARC4RANDOM_UNIFORM */
@@ -102,6 +103,7 @@
#define HAVE_STRNCASECMP 1
#define HAVE_STRPTIME 1
#define HAVE_STRTOL 1
+/* #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN */
/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
#define HAVE_STRUCT_TIMESPEC 1
@@ -113,6 +115,7 @@
#define HAVE_SYS_SOCKET_H 1
#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_UN_H 1
#define HAVE_SYS_WAIT_H 1
/* #undef HAVE_TCPD_H */
#define HAVE_TIME_H 1
@@ -128,6 +131,7 @@
#define INET6 /**/
/* #undef LEX_DEFINES_YY_CURRENT_BUFFER */
#define MAXSYSLOGMSGLEN 512
+/* #undef MEMCLEAN */
/* #undef MEMCMP_IS_BROKEN */
#define MINIMAL_RESPONSES /**/
/* #undef MKDIR_HAS_ONE_ARG */
@@ -139,10 +143,10 @@
/* #undef NSEC3 */
#define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
#define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.1.20"
+#define PACKAGE_STRING "NSD 4.1.24"
#define PACKAGE_TARNAME "nsd"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.1.20"
+#define PACKAGE_VERSION "4.1.24"
/* #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,7 +1,7 @@
-From 34b5c8009dc61b80a4c270bf630deae45bb156fe Mon Sep 17 00:00:00 2001
+From 3c881bf9f7c67b36ada5b201e6e860d1e9dac52b 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
+Subject: [PATCH 1/2] Remove quotes from @dbfile@ in man pages
---
nsd.8.in | 4 ++--
@@ -31,10 +31,10 @@ index 5e488958..babaa06a 100644
.B NSD
database
diff --git a/nsd.conf.5.in b/nsd.conf.5.in
-index b9ac956b..4f7c9867 100644
+index 74e7c6f8..7825d4f8 100644
--- a/nsd.conf.5.in
+++ b/nsd.conf.5.in
-@@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
+@@ -201,7 +201,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
.TP
.B database:\fR <filename>
By default
@@ -43,7 +43,7 @@ index b9ac956b..4f7c9867 100644
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
+@@ -876,7 +876,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 b9ac956b..4f7c9867 100644
.B NSD
database
--
-2.15.1
+2.18.0
diff --git a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch
@@ -0,0 +1,26 @@
+From 6d764efd8875a0f11a65b08677a1900182b0019e Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Tue, 21 Aug 2018 15:52:34 -0700
+Subject: [PATCH 2/2] Use timingsafe_memcmp instead of CRYPTO_memcmp
+
+We do not build with OpenSSL support, so CRYPTO_memcmp is unavailable.
+---
+ tsig.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tsig.c b/tsig.c
+index b0e40116..ce073ec7 100644
+--- a/tsig.c
++++ b/tsig.c
+@@ -475,7 +475,7 @@ tsig_verify(tsig_record_type *tsig)
+ &tsig->prior_mac_size);
+
+ if (tsig->mac_size != tsig->prior_mac_size
+- || CRYPTO_memcmp(tsig->mac_data,
++ || timingsafe_memcmp(tsig->mac_data,
+ tsig->prior_mac_data,
+ tsig->mac_size) != 0)
+ {
+--
+2.18.0
+
diff --git a/pkg/nsd/rev b/pkg/nsd/rev
@@ -1 +1 @@
-3
+4
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-8a97f61d7bbb98a2ce04dc4425596f9023677a5f1c5ea743ff408d487f82f713 nsd-4.1.20.tar.gz
+4fb687c8e494610ad8692a127ac101ed73df851142a42766c33de06e54449311 nsd-4.1.24.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.20.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.24.tar.gz"
