oasis

commit: ac2b23c50f58fbb66fb77c45c2301a63e15cc927
parent dc63af981235b08ae356883069445e4954dcb9f6
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 28 Jan 2021 15:46:04 -0800

nsd: Update to 4.3.5

Diffstat:
M
pkg/nsd/.gitignore
2
+-
M
pkg/nsd/config.h
8
+++-----
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, 11 insertions(+), 13 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.3.4.tar.gz
+/nsd-4.3.5.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -172,10 +172,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.3.4"
+#define PACKAGE_STRING "NSD 4.3.5"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.3.4"
+#define PACKAGE_VERSION "4.3.5"
 /* #undef PACKED_STRUCTS */
 #define PIDFILE "/run/nsd.pid"
 /* #undef RATELIMIT */
@@ -261,7 +261,7 @@
 /* #undef vfork */
 #if (defined(HAVE_PSELECT) && !defined (HAVE_PSELECT_PROTO)) \
 	|| !defined (HAVE_CTIME_R_PROTO) \
-	|| defined (STRPTIME_NEEDS_DEFINES)
+	|| defined (STRPTIME_NEEDS_DEFINES) || defined(REALLOCARRAY_NEEDS_DEFINES)
 #  ifndef _XOPEN_SOURCE
 #    define _XOPEN_SOURCE 600
 #  endif
@@ -293,10 +293,8 @@
 #  endif
 #endif
 #include <sys/types.h>
-#if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
-#endif
 #ifdef HAVE_TIME_H
 #include <time.h>
 #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 f536f64e20726132db052e6613ccfde0098b762a Mon Sep 17 00:00:00 2001
+From 32521d09355f1be4eaeabb11baffc86db238bb08 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 a257afae..f230b693 100644
+index 123e7f3c..8cbc8c96 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -657,7 +657,7 @@ AC_CHECK_SIZEOF(void*)
+@@ -635,7 +635,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.29.0
+2.30.0
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-3be834a97151a7ba8185e46bc37ff12c2f25f399755ae8a2d0e3711801528b50  nsd-4.3.4.tar.gz
+7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472  nsd-4.3.5.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.4.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.5.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.3.4 r0
+4.3.5 r0