[Midnightbsd-cvs] mports [24218] trunk/dns/bind911: update to bind 9.11.4

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 5 08:59:48 EDT 2018


Revision: 24218
          http://svnweb.midnightbsd.org/mports/?rev=24218
Author:   laffer1
Date:     2018-09-05 08:59:47 -0400 (Wed, 05 Sep 2018)
Log Message:
-----------
update to bind 9.11.4

Modified Paths:
--------------
    trunk/dns/bind911/Makefile
    trunk/dns/bind911/distinfo
    trunk/dns/bind911/files/extrapatch-bind-min-override-ttl
    trunk/dns/bind911/files/patch-bin_named_include_named_globals.h
    trunk/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
    trunk/dns/bind911/files/patch-configure

Modified: trunk/dns/bind911/Makefile
===================================================================
--- trunk/dns/bind911/Makefile	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/Makefile	2018-09-05 12:59:47 UTC (rev 24218)
@@ -15,11 +15,13 @@
 LICENSE=	mpl
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.3
+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.11.4
+
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
 .if ${ISCVERSION:M*-*}
@@ -26,8 +28,6 @@
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
@@ -38,7 +38,7 @@
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind-tools bind99 bind910 bind912 bind9-devel
+CONFLICTS=	bind-tools bind99 bind910 bind912 bind913 bind9-devel
 
 SUB_FILES=	pkg-message named.conf
 USE_RC_SUBR=	named
@@ -135,15 +135,15 @@
 
 GOST_CONFIGURE_ON=	--with-gost
 
-GSSAPI_BASE_CONFIGURE_ON= \
+GSSAPI_BASE_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_BASE_USES=	gssapi
 
-GSSAPI_HEIMDAL_CONFIGURE_ON= \
+GSSAPI_HEIMDAL_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 
-GSSAPI_MIT_CONFIGURE_ON= \
+GSSAPI_MIT_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_MIT_USES=	gssapi:mit
 

Modified: trunk/dns/bind911/distinfo
===================================================================
--- trunk/dns/bind911/distinfo	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/distinfo	2018-09-05 12:59:47 UTC (rev 24218)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521455716
-SHA256 (bind-9.11.3.tar.gz) = 0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5
-SIZE (bind-9.11.3.tar.gz) = 9523375
+TIMESTAMP = 1531290674
+SHA256 (bind-9.11.4.tar.gz) = 595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617
+SIZE (bind-9.11.4.tar.gz) = 9621408

Modified: trunk/dns/bind911/files/extrapatch-bind-min-override-ttl
===================================================================
--- trunk/dns/bind911/files/extrapatch-bind-min-override-ttl	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/files/extrapatch-bind-min-override-ttl	2018-09-05 12:59:47 UTC (rev 24218)
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig	2018-01-24 21:23:16 UTC
+--- bin/named/config.c.orig	2018-06-10 06:06:33 UTC
 +++ bin/named/config.c
-@@ -171,6 +171,8 @@ options {\n\
+@@ -176,6 +176,8 @@ options {\n\
  "	max-acache-size 16M;\n\
  	max-cache-size 90%;\n\
  	max-cache-ttl 604800; /* 1 week */\n\
@@ -9,9 +9,9 @@
  	max-clients-per-query 100;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
  	max-recursion-depth 7;\n\
---- bin/named/server.c.orig	2018-01-24 21:23:16 UTC
+--- bin/named/server.c.orig	2018-06-10 06:06:33 UTC
 +++ bin/named/server.c
-@@ -3699,6 +3699,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3692,6 +3692,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,9 +28,9 @@
  	result = ns_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-01-24 21:23:16 UTC
+--- lib/dns/include/dns/view.h.orig	2018-06-10 06:06:33 UTC
 +++ lib/dns/include/dns/view.h
-@@ -146,6 +146,8 @@ struct dns_view {
+@@ -150,6 +150,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
  	isc_boolean_t			sendcookie;
  	dns_ttl_t			maxcachettl;
@@ -39,9 +39,9 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2018-01-24 21:23:16 UTC
+--- lib/dns/resolver.c.orig	2018-06-10 06:06:33 UTC
 +++ lib/dns/resolver.c
-@@ -5477,6 +5477,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5473,6 +5473,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -60,9 +60,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2018-01-24 21:23:16 UTC
+--- lib/isccfg/namedconf.c.orig	2018-06-10 06:06:33 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1766,6 +1766,8 @@ view_clauses[] = {
+@@ -1770,6 +1770,8 @@ view_clauses[] = {
  #endif
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },

Modified: trunk/dns/bind911/files/patch-bin_named_include_named_globals.h
===================================================================
--- trunk/dns/bind911/files/patch-bin_named_include_named_globals.h	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/files/patch-bin_named_include_named_globals.h	2018-09-05 12:59:47 UTC (rev 24218)
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2018-01-04 05:28:11 UTC
+--- bin/named/include/named/globals.h.orig	2018-06-10 06:06:33 UTC
 +++ bin/named/include/named/globals.h
-@@ -135,7 +135,7 @@ EXTERN isc_boolean_t		ns_g_forcelock		IN
+@@ -138,7 +138,7 @@ EXTERN isc_boolean_t		ns_g_forcelock		IN
  #if NS_RUN_PID_DIR
  EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
  							     "/run/named/"

Modified: trunk/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
===================================================================
--- trunk/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in	2018-09-05 12:59:47 UTC (rev 24218)
@@ -1,6 +1,6 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig	2017-04-14 03:58:25 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2018-06-10 06:06:33 UTC
 +++ bin/tests/system/dlzexternal/Makefile.in
-@@ -31,7 +31,7 @@ OBJS =
+@@ -34,7 +34,7 @@ OBJS =
  @BIND9_MAKE_RULES@
  
  CFLAGS =	@CFLAGS@ @SO_CFLAGS@

Modified: trunk/dns/bind911/files/patch-configure
===================================================================
--- trunk/dns/bind911/files/patch-configure	2018-09-05 12:57:59 UTC (rev 24217)
+++ trunk/dns/bind911/files/patch-configure	2018-09-05 12:59:47 UTC (rev 24218)
@@ -1,6 +1,6 @@
---- configure.orig	2018-03-08 20:55:28 UTC
+--- configure.orig	2018-06-10 06:06:33 UTC
 +++ configure
-@@ -14465,27 +14465,9 @@ done
+@@ -14961,27 +14961,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
-@@ -14528,47 +14510,7 @@ $as_echo "no" >&6; } ;;
+@@ -15024,47 +15006,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
-@@ -23242,7 +23184,7 @@ $as_echo "" >&6; }
+@@ -23847,7 +23789,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  



More information about the Midnightbsd-cvs mailing list