commit: 2f54f77fe7a22b3257d70646f24ed5f84efdd2e7 parent 9ac0bf12e31feba49ac9c9752c6986ba95e5029e Author: Michael Forney <mforney@mforney.org> Date: Sat, 29 Sep 2018 18:13:13 -0700 nsd: Update to 4.1.25Diffstat:
7 files changed, 15 insertions(+), 13 deletions(-)diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore@@ -1,2 +1,2 @@ -/nsd-4.1.24.tar.gz +/nsd-4.1.25.tar.gz /srcdiff --git a/pkg/nsd/config.h b/pkg/nsd/config.h@@ -1,3 +1,4 @@ +#define ATTR_NORETURN __attribute__((__noreturn__)) #define BIND8_STATS /**/ /* #undef CHROOTDIR */ #define CONFIGDIR "/etc/nsd" @@ -12,6 +13,7 @@ /* #undef HAVE_ARC4RANDOM_UNIFORM */ #define HAVE_ARPA_INET_H 1 #define HAVE_ATTR_FORMAT 1 +#define HAVE_ATTR_NORETURN 1 #define HAVE_ATTR_UNUSED 1 /* #undef HAVE_B64_NTOP */ /* #undef HAVE_B64_PTON */ @@ -143,10 +145,10 @@ /* #undef NSEC3 */ #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl" #define PACKAGE_NAME "NSD" -#define PACKAGE_STRING "NSD 4.1.24" +#define PACKAGE_STRING "NSD 4.1.25" #define PACKAGE_TARNAME "nsd" #define PACKAGE_URL "" -#define PACKAGE_VERSION "4.1.24" +#define PACKAGE_VERSION "4.1.25" /* #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 3c881bf9f7c67b36ada5b201e6e860d1e9dac52b Mon Sep 17 00:00:00 2001 +From 9dbb1d5207e1f37e43bc2e0b6417b1fa10769203 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 14 Oct 2017 01:00:22 -0700 -Subject: [PATCH 1/2] Remove quotes from @dbfile@ in man pages +Subject: [PATCH] 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 74e7c6f8..7825d4f8 100644 +index 551db3b2..885375bb 100644 --- a/nsd.conf.5.in +++ b/nsd.conf.5.in -@@ -201,7 +201,7 @@ If yes, NSD listens to IPv6 connections. Default yes. +@@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections. Default yes. .TP .B database:\fR <filename> By default @@ -43,7 +43,7 @@ index 74e7c6f8..7825d4f8 100644 is used. The specified file is used to store the compiled zone information. Same as commandline option .BR \-f. -@@ -876,7 +876,7 @@ also function as a resolver or cache. The configuration options that +@@ -872,7 +872,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" .TPdiff --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@@ -1,7 +1,7 @@ -From 6d764efd8875a0f11a65b08677a1900182b0019e Mon Sep 17 00:00:00 2001 +From 47aa5ef27e6fb596fe844369328238bbc656e16c 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 +Subject: [PATCH] Use timingsafe_memcmp instead of CRYPTO_memcmp We do not build with OpenSSL support, so CRYPTO_memcmp is unavailable. ---diff --git a/pkg/nsd/rev b/pkg/nsd/rev@@ -1 +1 @@ -4 +5diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256@@ -1 +1 @@ -4fb687c8e494610ad8692a127ac101ed73df851142a42766c33de06e54449311 nsd-4.1.24.tar.gz +8f5bff5abbbb03c396afd7be575806cde1217e884c189fa34445e0ca4793df7f nsd-4.1.25.tar.gzdiff --git a/pkg/nsd/url b/pkg/nsd/url@@ -1 +1 @@ -url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.24.tar.gz" +url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.25.tar.gz"