svn commit: r418010 - in head/dns: . bind9-devel bind910 bind911 bind911/files bind99

Mathieu Arnold mat at FreeBSD.org
Mon Jul 4 09:47:27 UTC 2016 

Author: mat
Date: Mon Jul  4 09:47:25 2016
New Revision: 418010
URL: https://svnweb.freebsd.org/changeset/ports/418010

Log:
  Introduce BIND9 9.11.0b1. (beta1)
  
  BIND 9.11 brings many changes to BIND, including a new license
  (the Mozilla Public License 2.0 -- you can read about it here:
  https://www.isc.org/blogs/bind9-adopts-the-mpl-2-0-license-with-bind-9-11-0/)
  and many new features, including:
  
  -  Catalog zones, a new way to provision zones on slave servers
  -  dyndb api, a fast new api enabling BIND to serve zones stored
     in a database (Developed by Petr Spacek of RedHat)
  -  RNDC showzone, view-only mode and other improvements
  -  dnstap query and response logging (Robert Edmonds is the author
     of dnstap, see www.dnstap.info)
  -  EDNS Client-subnet (authoritative server functions)
  -  DNSSEC key manager, a new utility (Thanks to Sebastián Castro
     for helping with development.)
  -  Automatic CDS/CDSKEY generation
  -  Negative Trust Anchors for DNSSEC validators
  -  IPv6 bias to encourage use of IPv6 DNS servers
  -  Minimal response to “any” queries (Thanks to Tony Finch for
     the contribution)
  -  DNS Cookies are now enabled by default, using the standardized code point
  
  Changes:	https://lists.isc.org/pipermail/bind-announce/2016-June/000994.html
  Sponsored by:	Absolight

Added:
  head/dns/bind911/
     - copied from r418009, head/dns/bind910/
Modified:
  head/dns/Makefile
  head/dns/bind9-devel/Makefile
  head/dns/bind910/Makefile
  head/dns/bind911/Makefile
  head/dns/bind911/distinfo
  head/dns/bind911/files/extrapatch-bind-min-override-ttl
  head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
  head/dns/bind911/files/patch-configure
  head/dns/bind911/pkg-plist
  head/dns/bind99/Makefile

Modified: head/dns/Makefile
==============================================================================
--- head/dns/Makefile	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/Makefile	Mon Jul  4 09:47:25 2016	(r418010)
@@ -11,6 +11,7 @@
     SUBDIR += bind-tools
     SUBDIR += bind9-devel
     SUBDIR += bind910
+    SUBDIR += bind911
     SUBDIR += bind99
     SUBDIR += bindgraph
     SUBDIR += bundy

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind9-devel/Makefile	Mon Jul  4 09:47:25 2016	(r418010)
@@ -2,7 +2,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
+PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/}
 PORTREVISION=	0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	LOCAL/mat/bind
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var --
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind9*-9.[456789].* bind910-* bind911-*  bind9*-sdb-9.[456789].*
 
 SUB_FILES=	pkg-message
 

Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind910/Makefile	Mon Jul  4 09:47:25 2016	(r418010)
@@ -2,7 +2,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
+PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/}
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--disable-shared
 .endif
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind9*-9.[456789].* bind911-* bind9*-sdb-9.[456789].*
 
 .if !defined(BIND_TOOLS_SLAVE)
 SUB_FILES=	pkg-message

Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/Makefile	Mon Jul  4 09:47:25 2016	(r418010)
@@ -2,7 +2,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
+PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/}
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
@@ -15,7 +15,7 @@ MASTER_SITES=	ISC/bind9/${ISCVERSION}
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
-PKGNAMESUFFIX=	910
+PKGNAMESUFFIX=	911
 .endif
 DISTNAME=	${PORTNAME}-${ISCVERSION}
 
@@ -26,10 +26,10 @@ COMMENT=	Command line tools from BIND: d
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
-LICENSE=	ISCL
+LICENSE=	MPL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.4-P1
+ISCVERSION=	9.11.0b1
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--disable-shared
 .endif
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind9*-9.[456789].* bind910-* bind9*-sdb-9.[456789].*
 
 .if !defined(BIND_TOOLS_SLAVE)
 SUB_FILES=	pkg-message
@@ -127,7 +127,7 @@ CONFLICTS+=		bind-tools-9.*
 .endif	# BIND_TOOLS_SLAVE
 
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-SSL_USE=		openssl=yes
+SSL_USES=		ssl
 SSL_CONFIGURE_OFF=	--disable-openssl-version-check --without-openssl
 
 NEWSTATS_CONFIGURE_ENABLE=	newstats
@@ -153,8 +153,10 @@ GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
-PYTHON_CONFIGURE_WITH=	python
+PYTHON_CONFIGURE_WITH=	python=${PYTHON_CMD}
 PYTHON_USES=	python
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
 
 DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
 DLZ_POSTGRESQL_USES=		pgsql
@@ -294,6 +296,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
+# Can't use USE_PYTHON=autoplist
+post-install-PYTHON-on:
+	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 .endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>

Modified: head/dns/bind911/distinfo
==============================================================================
--- head/dns/bind910/distinfo	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/distinfo	Mon Jul  4 09:47:25 2016	(r418010)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464252479
-SHA256 (bind-9.10.4-P1.tar.gz) = 7c3b7d1afe48a6bbead8f11f6971fb09eb57fa257dc32a088fcc20a0218131a2
-SIZE (bind-9.10.4-P1.tar.gz) = 9293605
+TIMESTAMP = 1467624274
+SHA256 (bind-9.11.0b1.tar.gz) = de0f974225dfa8261ab624034cbeef715fe3f767aa3742cd7a2279002399f5d6
+SIZE (bind-9.11.0b1.tar.gz) = 9707184

Modified: head/dns/bind911/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind910/files/extrapatch-bind-min-override-ttl	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/files/extrapatch-bind-min-override-ttl	Mon Jul  4 09:47:25 2016	(r418010)
@@ -1,17 +1,17 @@
---- bin/named/config.c.orig	2016-04-20 20:11:20 UTC
+--- bin/named/config.c.orig	2016-06-27 17:38:13 UTC
 +++ bin/named/config.c
 @@ -151,6 +151,8 @@ options {\n\
- 	min-roots 2;\n\
  	lame-ttl 600;\n\
+ 	servfail-ttl 1;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
 +       override-cache-ttl 0; /* do not override */\n\
 +       min-cache-ttl 0; /* no minimal, zero is allowed */\n\
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
- 	max-cache-size 0;\n\
---- bin/named/server.c.orig	2016-04-20 20:11:20 UTC
+ 	max-cache-size 90%;\n\
+--- bin/named/server.c.orig	2016-06-27 17:38:13 UTC
 +++ bin/named/server.c
-@@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,20 +28,20 @@
  	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	2016-04-20 20:11:20 UTC
+--- lib/dns/include/dns/view.h.orig	2016-06-27 17:38:13 UTC
 +++ lib/dns/include/dns/view.h
-@@ -150,6 +150,8 @@ struct dns_view {
+@@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
- 	isc_boolean_t			requestsit;
+ 	isc_boolean_t			sendcookie;
  	dns_ttl_t			maxcachettl;
 +	dns_ttl_t			mincachettl;
 +	dns_ttl_t			overridecachettl;
  	dns_ttl_t			maxncachettl;
- 	dns_ttl_t			prefetch_trigger;
- 	dns_ttl_t			prefetch_eligible;
---- lib/dns/resolver.c.orig	2016-04-20 20:11:20 UTC
+ 	isc_uint32_t			nta_lifetime;
+ 	isc_uint32_t			nta_recheck;
+--- lib/dns/resolver.c.orig	2016-06-27 17:38:13 UTC
 +++ lib/dns/resolver.c
-@@ -5371,6 +5371,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -60,12 +60,12 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-04-20 20:11:20 UTC
+--- lib/isccfg/namedconf.c.orig	2016-06-27 17:38:13 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1572,6 +1572,8 @@ view_clauses[] = {
- #endif
+@@ -1707,6 +1707,8 @@ view_clauses[] = {
+ 	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
- 	{ "max-cache-size", &cfg_type_sizenodefault, 0 },
+ 	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
 +	{ "override-cache-ttl", &cfg_type_uint32, 0 },
 +	{ "min-cache-ttl", &cfg_type_uint32, 0 },
  	{ "max-cache-ttl", &cfg_type_uint32, 0 },

Modified: head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
==============================================================================
--- head/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in	Mon Jul  4 09:47:25 2016	(r418010)
@@ -1,6 +1,6 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig	2016-04-20 20:11:20 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2016-06-27 17:38:13 UTC
 +++ bin/tests/system/dlzexternal/Makefile.in
-@@ -43,7 +43,7 @@ OBJS =          ${DLOPENOBJS}
+@@ -35,7 +35,7 @@ OBJS =          ${DLOPENOBJS}
  @BIND9_MAKE_RULES@
  
  CFLAGS =	@CFLAGS@ @SO_CFLAGS@

Modified: head/dns/bind911/files/patch-configure
==============================================================================
--- head/dns/bind910/files/patch-configure	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/files/patch-configure	Mon Jul  4 09:47:25 2016	(r418010)
@@ -1,6 +1,6 @@
---- configure.orig	2016-04-20 20:11:20 UTC
+--- configure.orig	2016-06-27 17:38:13 UTC
 +++ configure
-@@ -14142,27 +14142,9 @@ done
+@@ -14205,27 +14205,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
-@@ -14205,47 +14187,7 @@ $as_echo "no" >&6; } ;;
+@@ -14268,47 +14250,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
-@@ -21602,7 +21544,7 @@ $as_echo "" >&6; }
+@@ -22147,7 +22089,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Modified: head/dns/bind911/pkg-plist
==============================================================================
--- head/dns/bind910/pkg-plist	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind911/pkg-plist	Mon Jul  4 09:47:25 2016	(r418010)
@@ -3,6 +3,7 @@ bin/delv
 bin/dig
 bin/host
 bin/isc-config.sh
+bin/mdig
 bin/nslookup
 bin/nsupdate
 include/bind9/check.h
@@ -11,10 +12,12 @@ include/bind9/version.h
 include/dns/acache.h
 include/dns/acl.h
 include/dns/adb.h
+include/dns/badcache.h
 include/dns/bit.h
 include/dns/byaddr.h
 include/dns/cache.h
 include/dns/callbacks.h
+include/dns/catz.h
 include/dns/cert.h
 include/dns/client.h
 include/dns/clientinfo.h
@@ -28,15 +31,19 @@ include/dns/dlz.h
 include/dns/dlz_dlopen.h
 include/dns/dns64.h
 include/dns/dnssec.h
+include/dns/dnstap.h
 include/dns/ds.h
 include/dns/dsdigest.h
+include/dns/dyndb.h
 include/dns/ecdb.h
+include/dns/edns.h
 include/dns/enumclass.h
 include/dns/enumtype.h
 include/dns/events.h
 include/dns/fixedname.h
 include/dns/forward.h
 include/dns/geoip.h
+include/dns/ipkeylist.h
 include/dns/iptable.h
 include/dns/journal.h
 include/dns/keydata.h
@@ -53,6 +60,7 @@ include/dns/name.h
 include/dns/ncache.h
 include/dns/nsec.h
 include/dns/nsec3.h
+include/dns/nta.h
 include/dns/opcode.h
 include/dns/order.h
 include/dns/peer.h
@@ -137,6 +145,7 @@ include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
 include/isc/hmacsha.h
+include/isc/ht.h
 include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
@@ -152,6 +161,7 @@ include/isc/log.h
 include/isc/magic.h
 include/isc/md5.h
 include/isc/mem.h
+include/isc/meminfo.h
 include/isc/msgcat.h
 include/isc/msgs.h
 include/isc/mutex.h
@@ -260,8 +270,10 @@ man/man1/arpaname.1.gz
 man/man1/bind9-config.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
+man/man1/dnstap-read.1.gz
 man/man1/host.1.gz
 man/man1/isc-config.sh.1.gz
+man/man1/mdig.1.gz
 man/man1/named-rrchecker.1.gz
 man/man1/nslookup.1.gz
 man/man1/nsupdate.1.gz
@@ -359,6 +371,7 @@ man/man8/dnssec-dsfromkey.8.gz
 man/man8/dnssec-importkey.8.gz
 man/man8/dnssec-keyfromlabel.8.gz
 man/man8/dnssec-keygen.8.gz
+%%PYTHON%%man/man8/dnssec-keymgr.8.gz
 man/man8/dnssec-revoke.8.gz
 man/man8/dnssec-settime.8.gz
 man/man8/dnssec-signzone.8.gz
@@ -372,13 +385,13 @@ man/man8/named-compilezone.8.gz
 man/man8/named-journalprint.8.gz
 man/man8/named.8.gz
 man/man8/nsec3hash.8.gz
-man/man8/tsig-keygen.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
 man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
+man/man8/tsig-keygen.8.gz
 sbin/arpaname
 sbin/ddns-confgen
 %%PYTHON%%sbin/dnssec-checkds
@@ -387,6 +400,7 @@ sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
 sbin/dnssec-keygen
+%%PYTHON%%sbin/dnssec-keymgr
 sbin/dnssec-revoke
 sbin/dnssec-settime
 sbin/dnssec-signzone

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Mon Jul  4 08:42:30 2016	(r418009)
+++ head/dns/bind99/Makefile	Mon Jul  4 09:47:25 2016	(r418010)
@@ -2,7 +2,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
+PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/}
 PORTREVISION=	0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -39,7 +39,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --d
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
+CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind910-* bind911-* bind-tools-9.*
 
 SUB_FILES=	pkg-message

More information about the svn-ports-head mailing list