svn commit: r535849 - in head/dns/bind916: . files

[Mathieu Arnold]

Author: mat
Date: Tue May 19 09:27:34 2020
New Revision: 535849
URL: https://svnweb.freebsd.org/changeset/ports/535849

Log:
  Update to 9.16.3.
  
  MFH:		2020Q2
  Security:	CVE-2020-8616, CVE-2020-8617

Modified:
  head/dns/bind916/Makefile   (contents, props changed)
  head/dns/bind916/distinfo   (contents, props changed)
  head/dns/bind916/files/extrapatch-bind-min-override-ttl   (contents, props changed)
  head/dns/bind916/files/patch-configure   (contents, props changed)
  head/dns/bind916/pkg-plist   (contents, props changed)

Modified: head/dns/bind916/Makefile
==============================================================================
--- head/dns/bind916/Makefile	Tue May 19 09:27:08 2020	(r535848)
+++ head/dns/bind916/Makefile	Tue May 19 09:27:34 2020	(r535849)
@@ -41,7 +41,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		compiler:c11 cpe libedit pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.16.2
+ISCVERSION=	9.16.3
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}

Modified: head/dns/bind916/distinfo
==============================================================================
--- head/dns/bind916/distinfo	Tue May 19 09:27:08 2020	(r535848)
+++ head/dns/bind916/distinfo	Tue May 19 09:27:34 2020	(r535849)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586982482
-SHA256 (bind-9.16.2.tar.xz) = d9e5b77cfca5ccad97f19cddc87128758ec15c16e6585000c6b2f84fc225993f
-SIZE (bind-9.16.2.tar.xz) = 4559216
+TIMESTAMP = 1589559917
+SHA256 (bind-9.16.3.tar.xz) = 27ac6513de5f8d0db34b9f241da53baa15a14b2ad21338d0cde0826eaf564f7e
+SIZE (bind-9.16.3.tar.xz) = 4573044

Modified: head/dns/bind916/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind916/files/extrapatch-bind-min-override-ttl	Tue May 19 09:27:08 2020	(r535848)
+++ head/dns/bind916/files/extrapatch-bind-min-override-ttl	Tue May 19 09:27:34 2020	(r535849)
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2020-03-11 16:46:53 UTC
+--- bin/named/config.c.orig	2020-05-06 09:59:35 UTC
 +++ bin/named/config.c
 @@ -179,6 +179,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-03-11 16:46:53 UTC
+--- bin/named/server.c.orig	2020-05-06 09:59:35 UTC
 +++ bin/named/server.c
-@@ -4324,6 +4324,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4328,6 +4328,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig	2020-03-11 16:46:53 UTC
+--- lib/dns/include/dns/view.h.orig	2020-05-06 09:59:35 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2020-03-11 16:46:53 UTC
+--- lib/dns/resolver.c.orig	2020-05-06 09:59:35 UTC
 +++ lib/dns/resolver.c
-@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6248,6 +6248,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2020-03-11 16:46:53 UTC
+--- lib/isccfg/namedconf.c.orig	2020-05-06 09:59:35 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */

Modified: head/dns/bind916/files/patch-configure
==============================================================================
--- head/dns/bind916/files/patch-configure	Tue May 19 09:27:08 2020	(r535848)
+++ head/dns/bind916/files/patch-configure	Tue May 19 09:27:34 2020	(r535849)
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2020-03-11 16:46:53 UTC
+--- configure.orig	2020-05-06 09:59:35 UTC
 +++ configure
-@@ -17437,27 +17437,9 @@ done
+@@ -17491,27 +17491,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17500,47 +17482,7 @@ $as_echo "no" >&6; } ;;
+@@ -17554,47 +17536,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23049,7 +22991,7 @@ $as_echo "" >&6; }
+@@ -23103,7 +23045,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Modified: head/dns/bind916/pkg-plist
==============================================================================
--- head/dns/bind916/pkg-plist	Tue May 19 09:27:08 2020	(r535848)
+++ head/dns/bind916/pkg-plist	Tue May 19 09:27:34 2020	(r535849)
@@ -262,7 +262,6 @@ include/pk11/internal.h
 include/pk11/pk11.h
 include/pk11/result.h
 include/pk11/site.h
-include/pkcs11/eddsa.h
 include/pkcs11/pkcs11.h
 lib/libbind9.a
 lib/libdns.a