Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 28 Jan 2019 13:00:03 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491481 - in head/dns/bind9-devel: . files
Message-ID:  <201901281300.x0SD03vd055856@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mat
Date: Mon Jan 28 13:00:03 2019
New Revision: 491481
URL: https://svnweb.freebsd.org/changeset/ports/491481

Log:
  Update to latest commit.

Added:
  head/dns/bind9-devel/files/patch-fix-quota   (contents, props changed)
Modified:
  head/dns/bind9-devel/Makefile   (contents, props changed)
  head/dns/bind9-devel/distinfo   (contents, props changed)
  head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl   (contents, props changed)
  head/dns/bind9-devel/files/patch-configure   (contents, props changed)

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Mon Jan 28 12:59:49 2019	(r491480)
+++ head/dns/bind9-devel/Makefile	Mon Jan 28 13:00:03 2019	(r491481)
@@ -38,13 +38,13 @@ LIB_DEPENDS=	libxml2.so:textproc/libxml2
 # XXX: remove tar:bz2
 USES=	compiler:c11 cpe libedit ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.13.4a0.2019.01.21
+ISCVERSION=	9.13.4a0.2019.01.25
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	914e8ddd6126200a698d1a52dce800eaeb088730
+GL_COMMIT=	14d48a9b694571c3e2b7ff87d831ece1c746a1d3
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -86,8 +86,8 @@ OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	NATIVE_PKCS11
 
 .if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
-OPTIONS_DEFINE+=	RPZ_NSIP RPZ_NSDNAME DOCS \
+OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB TCP_FASTOPEN
+OPTIONS_DEFINE+=	DOCS \
 			OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
 			START_LATE TUNING_LARGE TCP_FASTOPEN
 OPTIONS_GROUP=		DLZ
@@ -120,8 +120,6 @@ NATIVE_PKCS11_DESC=	Use PKCS\#11 native API (**READ HE
 PORTREVISION_DESC=	Show PORTREVISION in the version string
 PYTHON_DESC=		Build with Python utilities
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
-RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
-RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
@@ -186,10 +184,6 @@ PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:deve
 PYTHON_USES=	python
 
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
-
-RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
-
-RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
 
 SIGCHASE_CONFIGURE_ON=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 

Modified: head/dns/bind9-devel/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo	Mon Jan 28 12:59:49 2019	(r491480)
+++ head/dns/bind9-devel/distinfo	Mon Jan 28 13:00:03 2019	(r491481)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548074594
-SHA256 (isc-projects-bind9-914e8ddd6126200a698d1a52dce800eaeb088730_GL0.tar.gz) = 156570ae4ac279a672d0872339f3e45a282e71a85ff1dbd62ac23d8d16d4b868
-SIZE (isc-projects-bind9-914e8ddd6126200a698d1a52dce800eaeb088730_GL0.tar.gz) = 6337698
+TIMESTAMP = 1548678139
+SHA256 (isc-projects-bind9-14d48a9b694571c3e2b7ff87d831ece1c746a1d3_GL0.tar.gz) = e1ce71b7dcae5a633f0daa530e45092e63042abae2ee8ab4817ac8ddc3f64676
+SIZE (isc-projects-bind9-14d48a9b694571c3e2b7ff87d831ece1c746a1d3_GL0.tar.gz) = 6344559

Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl	Mon Jan 28 12:59:49 2019	(r491480)
+++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl	Mon Jan 28 13:00:03 2019	(r491481)
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2019-01-21 07:04:08 UTC
+--- bin/named/config.c.orig	2019-01-25 09:45:27 UTC
 +++ bin/named/config.c
 @@ -179,6 +179,7 @@ options {\n\
  	notify-source *;\n\
@@ -8,9 +8,9 @@
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2019-01-21 07:04:08 UTC
+--- bin/named/server.c.orig	2019-01-25 09:45:27 UTC
 +++ bin/named/server.c
-@@ -4153,6 +4153,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4150,6 +4150,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -22,7 +22,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	2019-01-21 07:04:08 UTC
+--- lib/dns/include/dns/view.h.orig	2019-01-25 09:45:27 UTC
 +++ lib/dns/include/dns/view.h
 @@ -153,6 +153,7 @@ struct dns_view {
  	bool			requestnsid;
@@ -32,7 +32,7 @@
  	dns_ttl_t			maxncachettl;
  	dns_ttl_t			mincachettl;
  	dns_ttl_t			minncachettl;
---- lib/dns/resolver.c.orig	2019-01-21 07:04:08 UTC
+--- lib/dns/resolver.c.orig	2019-01-25 09:45:27 UTC
 +++ lib/dns/resolver.c
 @@ -6008,6 +6008,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
@@ -47,7 +47,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2019-01-21 07:04:08 UTC
+--- lib/isccfg/namedconf.c.orig	2019-01-25 09:45:27 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1900,6 +1900,7 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,

Modified: head/dns/bind9-devel/files/patch-configure
==============================================================================
--- head/dns/bind9-devel/files/patch-configure	Mon Jan 28 12:59:49 2019	(r491480)
+++ head/dns/bind9-devel/files/patch-configure	Mon Jan 28 13:00:03 2019	(r491481)
@@ -1,6 +1,6 @@
---- configure.orig	2019-01-14 02:09:02 UTC
+--- configure.orig	2019-01-25 09:45:27 UTC
 +++ configure
-@@ -16302,27 +16302,9 @@ done
+@@ -16310,27 +16310,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
-@@ -16365,47 +16347,7 @@ $as_echo "no" >&6; } ;;
+@@ -16373,47 +16355,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
-@@ -20924,7 +20866,7 @@ $as_echo "" >&6; }
+@@ -20888,7 +20830,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Added: head/dns/bind9-devel/files/patch-fix-quota
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/bind9-devel/files/patch-fix-quota	Mon Jan 28 13:00:03 2019	(r491481)
@@ -0,0 +1,68 @@
+--- lib/isc/include/isc/quota.h.orig	2019-01-25 09:45:27 UTC
++++ lib/isc/include/isc/quota.h
+@@ -44,7 +44,7 @@ ISC_LANG_BEGINDECLS
+ /*% isc_quota structure */
+ struct isc_quota {
+ 	atomic_uint_fast32_t 		__max;
+-	atomic_uint_fast32_t 		__used;
++	atomic_uint_fast32_t 		_used;
+ 	atomic_uint_fast32_t		__soft;
+ };
+ 
+--- lib/isc/quota.c.orig	2019-01-25 09:45:27 UTC
++++ lib/isc/quota.c
+@@ -24,15 +24,15 @@
+ void
+ isc_quota_init(isc_quota_t *quota, unsigned int max) {
+ 	atomic_store(&quota->__max, max);
+-	atomic_store(&quota->__used, 0);
++	atomic_store(&quota->_used, 0);
+ 	atomic_store(&quota->__soft, 0);
+ }
+ 
+ void
+ isc_quota_destroy(isc_quota_t *quota) {
+-	INSIST(atomic_load(&quota->__used) == 0);
++	INSIST(atomic_load(&quota->_used) == 0);
+ 	atomic_store(&quota->__max, 0);
+-	atomic_store(&quota->__used, 0);
++	atomic_store(&quota->_used, 0);
+ 	atomic_store(&quota->__soft, 0);
+ }
+ 
+@@ -58,7 +58,7 @@ isc_quota_getsoft(isc_quota_t *quota) {
+ 
+ unsigned int
+ isc_quota_getused(isc_quota_t *quota) {
+-	return (atomic_load_relaxed(&quota->__used));
++	return (atomic_load_relaxed(&quota->_used));
+ }
+ 
+ isc_result_t
+@@ -66,7 +66,7 @@ isc_quota_reserve(isc_quota_t *quota) {
+ 	isc_result_t result;
+ 	uint32_t max = atomic_load(&quota->__max);
+ 	uint32_t soft = atomic_load(&quota->__soft);
+-	uint32_t used = atomic_fetch_add(&quota->__used, 1);
++	uint32_t used = atomic_fetch_add(&quota->_used, 1);
+ 	if (max == 0 || used < max) {
+ 		if (soft == 0 || used < soft) {
+ 			result = ISC_R_SUCCESS;
+@@ -74,7 +74,7 @@ isc_quota_reserve(isc_quota_t *quota) {
+ 			result = ISC_R_SOFTQUOTA;
+ 		}
+ 	} else {
+-		INSIST(atomic_fetch_sub(&quota->__used, 1) > 0);
++		INSIST(atomic_fetch_sub(&quota->_used, 1) > 0);
+ 		result = ISC_R_QUOTA;
+ 	}
+ 	return (result);
+@@ -82,7 +82,7 @@ isc_quota_reserve(isc_quota_t *quota) {
+ 
+ void
+ isc_quota_release(isc_quota_t *quota) {
+-	INSIST(atomic_fetch_sub(&quota->__used, 1) > 0);
++	INSIST(atomic_fetch_sub(&quota->_used, 1) > 0);
+ }
+ 
+ isc_result_t

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901281300.x0SD03vd055856>