oasis

commit: d96f51b843531c94cb229d0231814b58e56ddad4
parent 702d18b926c21f5b72ce81777d9f2693affc6b6d
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  6 Sep 2019 13:40:29 -0700

nsd: Update to 4.2.2

Diffstat:
M
pkg/nsd/.gitignore
2
+-
M
pkg/nsd/config.h
4
++--
M
pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch
8
++++----
M
pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch
8
++++----
M
pkg/nsd/sha256
2
+-
M
pkg/nsd/url
2
+-
M
pkg/nsd/ver
2
+-

7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/nsd/.gitignore b/pkg/nsd/.gitignore
@@ -1,2 +1,2 @@
-/nsd-4.2.1.tar.gz
+/nsd-4.2.2.tar.gz
 /src
diff --git a/pkg/nsd/config.h b/pkg/nsd/config.h
@@ -151,10 +151,10 @@
 /* #undef NSEC3 */
 #define PACKAGE_BUGREPORT "nsd-bugs@nlnetlabs.nl"
 #define PACKAGE_NAME "NSD"
-#define PACKAGE_STRING "NSD 4.2.1"
+#define PACKAGE_STRING "NSD 4.2.2"
 #define PACKAGE_TARNAME "nsd"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "4.2.1"
+#define PACKAGE_VERSION "4.2.2"
 /* #undef PACKED_STRUCTS */
 #define PIDFILE "/run/nsd.pid"
 /* #undef RATELIMIT */
diff --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,4 +1,4 @@
-From 47aa5ef27e6fb596fe844369328238bbc656e16c Mon Sep 17 00:00:00 2001
+From 8d5f6f5c73c68ec5189ed626d515927cba700a32 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 instead of CRYPTO_memcmp
@@ -9,10 +9,10 @@ We do not build with OpenSSL support, so CRYPTO_memcmp is unavailable.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tsig.c b/tsig.c
-index b0e40116..ce073ec7 100644
+index a450a8b3..d43ba362 100644
 --- a/tsig.c
 +++ b/tsig.c
-@@ -475,7 +475,7 @@ tsig_verify(tsig_record_type *tsig)
+@@ -530,7 +530,7 @@ tsig_verify(tsig_record_type *tsig)
  				    &tsig->prior_mac_size);
  
  	if (tsig->mac_size != tsig->prior_mac_size
@@ -22,5 +22,5 @@ index b0e40116..ce073ec7 100644
  		      tsig->mac_size) != 0)
  	{
 -- 
-2.18.0
+2.23.0
 
diff --git a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch
@@ -1,4 +1,4 @@
-From 31b2b7afa23a282fb9c960651571802d5779ac6b Mon Sep 17 00:00:00 2001
+From fcfbed8db1c746bd938ac6a548036af95b678341 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 16 Jun 2019 23:17:47 -0700
 Subject: [PATCH] Avoid pointer arithmetic on `void *`
@@ -162,10 +162,10 @@ index 8d7ee137..3ee98648 100644
  /** MAX 2**x exponent of alloced chunks, for 1Mbytes.  The smallest
   * chunk is 16bytes (8preamble+8data), so 0-3 is unused. */
 diff --git a/xfrd.c b/xfrd.c
-index 48339c54..e90dc4f9 100644
+index 3865747a..89713236 100644
 --- a/xfrd.c
 +++ b/xfrd.c
-@@ -2463,7 +2463,7 @@ static void
+@@ -2465,7 +2465,7 @@ static void
  xfrd_process_stat_info_task(xfrd_state_type* xfrd, struct task_list_d* task)
  {
  	size_t i;
@@ -175,5 +175,5 @@ index 48339c54..e90dc4f9 100644
  	for(i=0; i<xfrd->nsd->child_count; i++) {
  		xfrd->nsd->children[i].query_count += *p++;
 -- 
-2.22.0
+2.23.0
 
diff --git a/pkg/nsd/sha256 b/pkg/nsd/sha256
@@ -1 +1 @@
-d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f  nsd-4.2.1.tar.gz
+83b333940a25fe6d453bcac6ea39edfa244612a879117c4a624c97eb250246fb  nsd-4.2.2.tar.gz
diff --git a/pkg/nsd/url b/pkg/nsd/url
@@ -1 +1 @@
-url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.1.tar.gz"
+url = "https://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.2.tar.gz"
diff --git a/pkg/nsd/ver b/pkg/nsd/ver
@@ -1 +1 @@
-4.2.1 r0
+4.2.2 r0