oasis

commit: 5612be33b1cf0c0657b77035c34bdb5d88ac09e2
parent 0b52da4754a11986c6fea39e48f97137222ee924
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 23 Apr 2020 00:20:19 -0700

nsd: Update to 4.3.1

Diffstat:
M
pkg/nsd/.gitignore
2
+-
M
pkg/nsd/config.h
11
++++++++---
M
pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
8
++++----
M
pkg/nsd/sha256
2
+-
M
pkg/nsd/url
2
+-
M
pkg/nsd/ver
2
+-

6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.3.0.tar.gz
+/nsd-4.3.1.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -3,6 +3,7 @@
 /* #undef CHROOTDIR */
 #define CONFIGDIR "/etc/nsd"
 #define CONFIGFILE "/etc/nsd/nsd.conf"
+#define CPU_OR_THREE_ARGS 1
 /* #undef DARWIN_BROKEN_SETREUID */
 #define DBFILE "/var/db/nsd/nsd.db"
 /* #undef DNSTAP_SOCKET_PATH */
@@ -27,6 +28,7 @@
 #define HAVE_CPU_SET_T 1
 /* #undef HAVE_CRYPTO_MEMCMP */
 #define HAVE_CTIME_R_PROTO 1
+#define HAVE_DECL_REALLOCARRAY 1
 /* #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO */
 /* #undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH */
 #define HAVE_DUP2 1
@@ -90,6 +92,7 @@
 #define HAVE_REALLOCARRAY 1
 /* #undef HAVE_RECVMMSG */
 #define HAVE_SCHED_H 1
+#define HAVE_SCHED_SETAFFINITY 1
 /* #undef HAVE_SENDMMSG */
 /* #undef HAVE_SETPROCTITLE */
 #define HAVE_SETREGID 1
@@ -124,6 +127,7 @@
 /* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 #define HAVE_STRUCT_TIMESPEC 1
+#define HAVE_SYSCONF 1
 /* #undef HAVE_SYSLOG_H */
 /* #undef HAVE_SYS_BITYPES_H */
 /* #undef HAVE_SYS_CPUSET_H */
@@ -163,14 +167,15 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.3.0"
+#define PACKAGE_STRING "NSD 4.3.1"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.3.0"
+#define PACKAGE_VERSION "4.3.1"
 /* #undef PACKED_STRUCTS */
 #define PIDFILE "/run/nsd.pid"
 /* #undef RATELIMIT */
 /* #undef RATELIMIT_DEFAULT_OFF */
+/* #undef REALLOCARRAY_NEEDS_DEFINES */
 #define RETSIGTYPE void
 /* #undef ROOT_SERVER */
 #define SIZEOF_OFF_T 8
@@ -269,7 +274,7 @@
 #  endif
 #  ifndef __EXTENSIONS__
 #    define __EXTENSIONS__ 1
-#  endif 
+#  endif
 #  ifndef _STDC_C99
 #    define _STDC_C99 1
 #  endif
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 a42ca948ea74b976d2186798ed1023d9db44e983 Mon Sep 17 00:00:00 2001
+From b7775ef04a2afebea2d3f98bcbc86454fb316624 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,10 +9,10 @@ Subject: [PATCH] Use timingsafe_memcmp if available
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 52e410c2..ce0f5b17 100644
+index eaa20552..57098aba 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -628,7 +628,7 @@ AC_CHECK_SIZEOF(void*)
+@@ -654,7 +654,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])])
@@ -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.25.1
+2.26.1
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-7a007d655d30f1edd001206839107e651966e1e519d53ba2c036491044111e97  nsd-4.3.0.tar.gz
+f4b34ace6651a81386464cc990f046e7328aa2485274fe8743086997129d8987  nsd-4.3.1.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.0.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.1.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.3.0 r0
+4.3.1 r0