oasis

commit: f4092c5cfa0734b31f3c7b3d92937f176273207c
parent 40cf2e3307a5674eeb309520408b82d9d70d6bab
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 12 Jun 2019 22:07:05 -0700

nsd: Update to 4.1.20

Diffstat:
M
pkg/nsd/.gitignore
2
+-
M
pkg/nsd/config.h
17
+++++++++++++----
M
pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch
8
++++----
M
pkg/nsd/sha256
2
+-
M
pkg/nsd/url
2
+-
M
pkg/nsd/ver
2
+-

6 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.1.27.tar.gz
+/nsd-4.2.0.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -10,8 +10,8 @@
 #define FACILITY LOG_DAEMON
 #define HAVE_ACCEPT4 1
 #define HAVE_ALARM 1
-/* #undef HAVE_ARC4RANDOM */
-/* #undef HAVE_ARC4RANDOM_UNIFORM */
+#define HAVE_ARC4RANDOM 1
+#define HAVE_ARC4RANDOM_UNIFORM 1
 #define HAVE_ARPA_INET_H 1
 #define HAVE_ATTR_FORMAT 1
 #define HAVE_ATTR_NORETURN 1
@@ -23,6 +23,8 @@
 #define HAVE_CHROOT 1
 #define HAVE_CLOCK_GETTIME 1
 #define HAVE_CTIME_R_PROTO 1
+/* #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO */
+/* #undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH */
 #define HAVE_DUP2 1
 #define HAVE_ENDIAN_H 1
 #define HAVE_ENDPWENT 1
@@ -71,6 +73,7 @@
 /* #undef HAVE_OPENSSL_ERR_H */
 /* #undef HAVE_OPENSSL_INIT_CRYPTO */
 /* #undef HAVE_OPENSSL_INIT_SSL */
+/* #undef HAVE_OPENSSL_OCSP_H */
 /* #undef HAVE_OPENSSL_RAND_H */
 /* #undef HAVE_OPENSSL_SSL_H */
 #define HAVE_PPOLL 1
@@ -91,6 +94,7 @@
 #define HAVE_SNPRINTF 1
 #define HAVE_SOCKET 1
 /* #undef HAVE_SSL */
+/* #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL */
 #define HAVE_STDARG_H 1
 #define HAVE_STDDEF_H 1
 #define HAVE_STDINT_H 1
@@ -147,10 +151,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.1.27"
+#define PACKAGE_STRING "NSD 4.2.0"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.1.27"
+#define PACKAGE_VERSION "4.2.0"
 /* #undef PACKED_STRUCTS */
 #define PIDFILE "/run/nsd.pid"
 /* #undef RATELIMIT */
@@ -166,6 +170,7 @@
 #define TCP_MAX_MESSAGE_LEN 65535
 #define TCP_PORT "53"
 #define TCP_TIMEOUT 120
+#define TLS_PORT "853"
 #define UDP_MAX_MESSAGE_LEN 512
 #define UDP_PORT "53"
 #define USER "nsd"
@@ -188,6 +193,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
+/* #undef USE_TCP_FASTOPEN */
 /* #undef USE_ZONE_STATS */
 #define VERSION PACKAGE_STRING
 #define XFRDFILE "/var/db/nsd/xfrd.state"
@@ -243,6 +249,9 @@
 #  ifndef _BSD_SOURCE
 #    define _BSD_SOURCE 1
 #  endif
+#  ifndef _OPENBSD_SOURCE
+#    define _OPENBSD_SOURCE 1
+#  endif
 #  ifndef _DEFAULT_SOURCE
 #    define _DEFAULT_SOURCE 1
 #  endif
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 9dbb1d5207e1f37e43bc2e0b6417b1fa10769203 Mon Sep 17 00:00:00 2001
+From b101b9b320234e04587cc995daedf775fe6cc9ca 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,7 +31,7 @@ index 5e488958..babaa06a 100644
  .B NSD
  database
 diff --git a/nsd.conf.5.in b/nsd.conf.5.in
-index 551db3b2..885375bb 100644
+index 6da0ca57..9e1bf084 100644
 --- a/nsd.conf.5.in
 +++ b/nsd.conf.5.in
 @@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections.  Default yes.
@@ -43,7 +43,7 @@ index 551db3b2..885375bb 100644
  is used. The specified file is used to store the compiled 
  zone information. Same as commandline option 
  .BR \-f.
-@@ -872,7 +872,7 @@ also function as a resolver or cache. The configuration options that
+@@ -909,7 +909,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 551db3b2..885375bb 100644
  .B NSD
  database
 -- 
-2.18.0
+2.22.0
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-1bab5f30406cabac2f2cc95f8af6dfe20581646a75a70c091845e04d325f4eea  nsd-4.1.27.tar.gz
+51df1ca44a00e588c09ff0696e588c13566ce889b50d953896d8b6e507eda74c  nsd-4.2.0.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.27.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.0.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.1.27 r0
+4.2.0 r0