Update to latest commit.

While there, add some placeholders for things to change when a new
branch gets there.

Sponsored by:	Absolight

5 files changed, 35 insertions, 13 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 359aabb5f178..a5dcb433d0b8 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -7,16 +7,21 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 # dns/bind-tools here
 PORTREVISION=	0
 .else
+# XXX: correct version
 # dns/bind9xx here
 PORTREVISION=	0
 .endif
 CATEGORIES=	dns net ipv6
+# XXX: put the ISC master_site
+#MASTER_SITES=	ISC/bind9/${ISCVERSION}
 MASTER_SITES=	LOCAL/mat/bind
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
 PKGNAMESUFFIX=	9-devel
 .endif
+# XXX: correct DISTNAME.
+#DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 .if defined(BIND_TOOLS_SLAVE)
@@ -29,13 +34,15 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.13.0a0.2018.03.21
+ISCVERSION=	9.13.0a0.2018.04.06
+# XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	52909b5dbeadf13ecbf43e8ee573af23eebd6859
+GL_COMMIT=	76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb
 
+# XXX: remove tar:bz2
 USES=	cpe libedit tar:bz2
 
 CPE_VENDOR=	isc
@@ -56,10 +63,12 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
+# XXX: Add -devel
 CONFLICTS=	bind99 bind910 bind911 bind912
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
+# XXX: Change to the correct version
 CONFLICTS+=		bind9-devel
 .else
 USE_RC_SUBR=	named
@@ -233,9 +242,11 @@ BROKEN=	OpenSSL from the base system does not support GOST, add \
 	that needs SSL.
 .endif
 
+# XXX: Remove
 post-extract:
 	echo "SRCID=${GL_COMMIT}" > ${WRKSRC}/srcid
 
+# XXX: Remove first REINPLACE_CMD
 post-patch:
 	@${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \
 		${WRKSRC}/version
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 674f9cfe292e..adfb5494f1cb 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522069214
-SHA256 (isc-projects-bind9-52909b5dbeadf13ecbf43e8ee573af23eebd6859_GL0.tar.gz) = e605744916aa8399774fa1f2c4bcffe93095cb2d644b4df4aaa81419de0644fd
-SIZE (isc-projects-bind9-52909b5dbeadf13ecbf43e8ee573af23eebd6859_GL0.tar.gz) = 8969035
+TIMESTAMP = 1523269093
+SHA256 (isc-projects-bind9-76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb_GL0.tar.gz) = bda5aa83818b285635fb503b1c347404f9dc8a446777afe0dc9f5b1c37658f9d
+SIZE (isc-projects-bind9-76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb_GL0.tar.gz) = 8966215
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 2a3b852ea2e5..be62dfa83c70 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2018-02-26 06:30:28 UTC
+--- bin/named/config.c.orig	2018-04-06 06:10:50 UTC
 +++ bin/named/config.c
 @@ -179,12 +179,14 @@ options {\n\
  	max-recursion-queries 75;\n\
@@ -15,7 +15,7 @@
  	provide-ixfr true;\n\
  	query-source address *;\n\
  	query-source-v6 address *;\n\
---- bin/named/server.c.orig	2018-02-26 06:30:28 UTC
+--- bin/named/server.c.orig	2018-04-06 06:10:50 UTC
 +++ bin/named/server.c
 @@ -4077,6 +4077,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
@@ -34,7 +34,7 @@
  	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-02-26 06:30:28 UTC
+--- lib/dns/include/dns/view.h.orig	2018-04-06 06:10:50 UTC
 +++ lib/dns/include/dns/view.h
 @@ -148,6 +148,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -45,9 +45,9 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2018-02-26 06:30:28 UTC
+--- lib/dns/resolver.c.orig	2018-04-06 06:10:50 UTC
 +++ lib/dns/resolver.c
-@@ -5748,6 +5748,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5752,6 +5752,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -66,7 +66,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2018-02-26 06:30:28 UTC
+--- lib/isccfg/namedconf.c.orig	2018-04-06 06:10:50 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1916,6 +1916,8 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,
diff --git a/dns/bind9-devel/files/patch-bin_named_server.c b/dns/bind9-devel/files/patch-bin_named_server.c
new file mode 100644
index 000000000000..455ab222f113
--- /dev/null
+++ b/dns/bind9-devel/files/patch-bin_named_server.c
@@ -0,0 +1,11 @@
+--- bin/named/server.c.orig	2018-04-06 06:10:50 UTC
++++ bin/named/server.c
+@@ -3552,7 +3552,7 @@ configure_dnstap(const cfg_obj_t **maps,
+ 			fstrm_iothr_options_set_reopen_interval(fopt, i);
+ 		}
+ 
+-		CHECKM(dns_dt_create2(named_g_mctx, dmode, dpath,
++		CHECKM(dns_dt_create(named_g_mctx, dmode, dpath,
+ 				      &fopt, named_g_server->task,
+ 				      &named_g_server->dtenv),
+ 		       "unable to create dnstap environment");
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 628b003edfb7..0ead582fce98 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2018-03-19 09:15:08 UTC
+--- configure.orig	2018-04-06 06:10:50 UTC
 +++ configure
 @@ -14764,27 +14764,9 @@ done
  		# problems start to show up.
@@ -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
-@@ -23481,7 +23423,7 @@ $as_echo "" >&6; }
+@@ -23487,7 +23429,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).