commit: 051fc29dcfe53461822494528b73b4be4c01d026
parent 90637f9ff60130865a3a258048f8df6d06ec2047
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 26 Oct 2020 02:21:32 -0700
nsd: Update to 4.3.3
Diffstat:
7 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.3.2.tar.gz
+/nsd-4.3.3.tar.gz
/src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -8,7 +8,7 @@
/* #undef DARWIN_BROKEN_SETREUID */
#define DBFILE "/var/db/nsd/nsd.db"
/* #undef DNSTAP_SOCKET_PATH */
-#define EDNS_MAX_MESSAGE_LEN 4096
+#define EDNS_MAX_MESSAGE_LEN 1232
#define FACILITY LOG_DAEMON
#define HAVE_ACCEPT4 1
#define HAVE_ALARM 1
@@ -43,6 +43,8 @@
/* #undef HAVE_EVENT_BASE_ONCE */
/* #undef HAVE_EVENT_H */
/* #undef HAVE_EVP_CLEANUP */
+/* #undef HAVE_EVP_MAC_CTX_NEW */
+/* #undef HAVE_EVP_MAC_CTX_SET_PARAMS */
/* #undef HAVE_EV_DEFAULT_LOOP */
/* #undef HAVE_EV_LOOP */
#define HAVE_FCNTL_H 1
@@ -52,6 +54,7 @@
#define HAVE_GAI_STRERROR 1
#define HAVE_GETADDRINFO 1
#define HAVE_GETHOSTNAME 1
+#define HAVE_GETIFADDRS 1
#define HAVE_GETNAMEINFO 1
#define HAVE_GETPWNAM 1
#define HAVE_GETRANDOM 1
@@ -80,6 +83,7 @@
#define HAVE_NETDB_H 1
#define HAVE_NETINET_IN_H 1
#define HAVE_NETINET_TCP_H 1
+/* #undef HAVE_OPENSSL_CORE_NAMES_H */
/* #undef HAVE_OPENSSL_ERR_H */
/* #undef HAVE_OPENSSL_INIT_CRYPTO */
/* #undef HAVE_OPENSSL_INIT_SSL */
@@ -168,10 +172,10 @@
/* #undef NSEC3 */
#define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
#define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.3.2"
+#define PACKAGE_STRING "NSD 4.3.3"
#define PACKAGE_TARNAME "nsd"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.3.2"
+#define PACKAGE_VERSION "4.3.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
@@ -1,4 +1,4 @@
-From 2fd6c5a200fe44a209ffebd11da9a7eebf484b69 Mon Sep 17 00:00:00 2001
+From d3614f9764fe1a3f248eefc4af7e2553809b7ab7 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 851c6de8..249cfa7c 100644
+index 66b90380..27d95322 100644
--- a/nsd.conf.5.in
+++ b/nsd.conf.5.in
-@@ -198,7 +198,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
+@@ -202,7 +202,7 @@ If yes, NSD listens to IPv6 connections. Default yes.
.TP
.B database:\fR <filename>
By default
@@ -43,7 +43,7 @@ index 851c6de8..249cfa7c 100644
is used. The specified file is used to store the compiled
zone information. Same as commandline option
.BR \-f.
-@@ -959,7 +959,7 @@ also function as a resolver or cache. The configuration options that
+@@ -963,7 +963,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 851c6de8..249cfa7c 100644
.B NSD
database
--
-2.28.0
+2.29.0
diff --git a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
@@ -1,4 +1,4 @@
-From 4d74fd369274f100e8aca1332ed59ca3c2eb8063 Mon Sep 17 00:00:00 2001
+From f536f64e20726132db052e6613ccfde0098b762a Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 21 Aug 2018 15:52:34 -0700
Subject: [PATCH] Use timingsafe_memcmp if available
@@ -9,15 +9,15 @@ Subject: [PATCH] Use timingsafe_memcmp if available
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 6c6bb224..f955eb1f 100644
+index a257afae..f230b693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -657,7 +657,7 @@ AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(off_t)
AC_CHECK_FUNCS([getrandom arc4random arc4random_uniform])
AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h])])
--AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4])
-+AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 timingsafe_memcmp])
+-AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 getifaddrs])
++AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 getifaddrs timingsafe_memcmp])
AC_CHECK_TYPE([struct mmsghdr], AC_DEFINE(HAVE_MMSGHDR, 1, [If sys/socket.h has a struct mmsghdr.]), [], [
AC_INCLUDES_DEFAULT
@@ -37,5 +37,5 @@ index 8b24fd1b..e75aa231 100644
#define CRYPTO_memcmp memcmp_fixedtime
int memcmp_fixedtime(const void *s1, const void *s2, size_t n)
--
-2.28.0
+2.29.0
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-5b5cee2f80ed451f19e02dee620c71a98a781bd72a55810e0acc925fecaa8329 nsd-4.3.2.tar.gz
+5fc6d81a977c0246b741da691acaab5c62830a8b38ce696021c26f372d8eed51 nsd-4.3.3.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.2.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.3.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.3.2 r0
+4.3.3 r0
