Update to 9.12.3.

5 files changed, 24 insertions, 24 deletions

diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile
index f64b8affb185..469d84efed7d 100644
--- a/dns/bind912/Makefile
+++ b/dns/bind912/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=	cpe libedit
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.12.2-P2
+ISCVERSION=	9.12.3
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind912/distinfo b/dns/bind912/distinfo
index 101faa99562a..1b7837d72911 100644
--- a/dns/bind912/distinfo
+++ b/dns/bind912/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537447540
-SHA256 (bind-9.12.2-P2.tar.gz) = 87027826e98bab90ead31f45ce7653cb3116ebe64ab8202a08b6b64531df693e
-SIZE (bind-9.12.2-P2.tar.gz) = 9422128
+TIMESTAMP = 1540325569
+SHA256 (bind-9.12.3.tar.gz) = 0e80762631258e1c193552efa7c56c05ec5e8c2f98e4b2a3b91a61fd8d96b938
+SIZE (bind-9.12.3.tar.gz) = 8616664
diff --git a/dns/bind912/files/extrapatch-bind-min-override-ttl b/dns/bind912/files/extrapatch-bind-min-override-ttl
index ed0321c86738..3fff715061b6 100644
--- a/dns/bind912/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind912/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig	2018-07-03 07:08:14 UTC
+--- bin/named/config.c.orig	2018-10-06 05:51:22 UTC
 +++ bin/named/config.c
-@@ -182,12 +182,14 @@ options {\n\
+@@ -183,12 +183,14 @@ options {\n\
  	max-recursion-queries 75;\n\
  	max-stale-ttl 604800; /* 1 week */\n\
  	message-compression yes;\n\
@@ -15,9 +15,9 @@
  	provide-ixfr true;\n\
  	query-source address *;\n\
  	query-source-v6 address *;\n\
---- bin/named/server.c.orig	2018-07-03 07:08:14 UTC
+--- bin/named/server.c.orig	2018-10-06 05:51:22 UTC
 +++ bin/named/server.c
-@@ -4072,6 +4072,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4075,6 +4075,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -34,20 +34,20 @@
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2018-07-03 07:08:14 UTC
+--- lib/dns/include/dns/view.h.orig	2018-10-06 05:51:22 UTC
 +++ lib/dns/include/dns/view.h
-@@ -149,6 +149,8 @@ struct dns_view {
- 	isc_boolean_t			requestnsid;
- 	isc_boolean_t			sendcookie;
+@@ -151,6 +151,8 @@ struct dns_view {
+ 	bool			requestnsid;
+ 	bool			sendcookie;
  	dns_ttl_t			maxcachettl;
 +	dns_ttl_t			mincachettl;
 +	dns_ttl_t			overridecachettl;
  	dns_ttl_t			maxncachettl;
- 	isc_uint32_t			nta_lifetime;
- 	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2018-07-03 07:08:14 UTC
+ 	uint32_t			nta_lifetime;
+ 	uint32_t			nta_recheck;
+--- lib/dns/resolver.c.orig	2018-10-06 05:51:22 UTC
 +++ lib/dns/resolver.c
-@@ -5756,6 +5756,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5757,6 +5757,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -66,9 +66,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2018-07-03 07:08:14 UTC
+--- lib/isccfg/namedconf.c.orig	2018-10-06 05:51:22 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1914,6 +1914,8 @@ view_clauses[] = {
+@@ -1917,6 +1917,8 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,
  	  CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind912/files/patch-bin_named_include_named_globals.h b/dns/bind912/files/patch-bin_named_include_named_globals.h
index 8f2f8d44b88a..d562a5f79230 100644
--- a/dns/bind912/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind912/files/patch-bin_named_include_named_globals.h
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2018-06-10 06:06:19 UTC
+--- bin/named/include/named/globals.h.orig	2018-10-06 05:51:22 UTC
 +++ bin/named/include/named/globals.h
-@@ -128,7 +128,7 @@ EXTERN isc_boolean_t		named_g_forcelock	
+@@ -129,7 +129,7 @@ EXTERN bool		named_g_forcelock	INIT(fals
  #if NAMED_RUN_PID_DIR
  EXTERN const char *		named_g_defaultpidfile 	INIT(NAMED_LOCALSTATEDIR
  							     "/run/named/"
diff --git a/dns/bind912/files/patch-configure b/dns/bind912/files/patch-configure
index 9e481f106d58..3626238d4f9d 100644
--- a/dns/bind912/files/patch-configure
+++ b/dns/bind912/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2018-06-10 06:06:19 UTC
+--- configure.orig	2018-10-06 05:51:22 UTC
 +++ configure
-@@ -14939,27 +14939,9 @@ done
+@@ -15085,27 +15085,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $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
-@@ -15002,47 +14984,7 @@ $as_echo "no" >&6; } ;;
+@@ -15148,47 +15130,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23790,7 +23732,7 @@ $as_echo "" >&6; }
+@@ -23886,7 +23828,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).