Date: Wed, 31 Aug 2016 11:58:51 +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: r421151 - in head/dns/bind911: . files Message-ID: <201608311158.u7VBwpNc098497@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 31 11:58:51 2016 New Revision: 421151 URL: https://svnweb.freebsd.org/changeset/ports/421151 Log: Update to 9.11.0rc1. While there, remove obsolete configure options, and set as default the one that default to yes. Changes: https://lists.isc.org/pipermail/bind-announce/2016-August/001002.html Sponsored by: Absolight Modified: head/dns/bind911/Makefile (contents, props changed) head/dns/bind911/distinfo (contents, props changed) head/dns/bind911/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind911/files/patch-configure (contents, props changed) head/dns/bind911/pkg-plist (contents, props changed) Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Aug 31 11:49:42 2016 (r421150) +++ head/dns/bind911/Makefile Wed Aug 31 11:58:51 2016 (r421151) @@ -2,7 +2,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/} +PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0b3 +ISCVERSION= 9.11.0rc1 MAKE_JOBS_UNSAFE= yes @@ -70,9 +70,9 @@ OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) -OPTIONS_DEFAULT+= RRL DLZ_FILESYSTEM -OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP \ - MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE LMDB +OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP +OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB @@ -97,15 +97,13 @@ PYTHON_DESC= Build with Python utilitie START_LATE_DESC= Start BIND late in the boot process MINCACHE_DESC= Use the mincachettl patch PORTREVISION_DESC= Show PORTREVISION in the version string -FETCHLIMIT_DESC= Enable the query quotas for resolvers QUERYTRACE_DESC= Enable the very verbose query tracelogging LMDB_DESC= Use LMDB for zone management +DNSTAP_DESC= Provides fast passive logging of DNS messages LINKS_DESC= Create conf file symlinks in ${PREFIX} -NEWSTATS_DESC= Enable alternate xml statistics channel format RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records -RRL_DESC= Response Rate Limiting DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -117,9 +115,6 @@ GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable -MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit -QUERYTRACE_CONFIGURE_ENABLE= querytrace .if defined(BIND_TOOLS_SLAVE) CONFLICTS+= bind910-9.10.* @@ -134,8 +129,6 @@ SSL_CONFIGURE_OFF= --disable-openssl-ver LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -NEWSTATS_CONFIGURE_ENABLE= newstats - IDN_USES= iconv IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit @@ -171,8 +164,6 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RRL_CONFIGURE_ENABLE= rrl - DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql @@ -202,6 +193,14 @@ GSSAPI_MIT_CONFIGURE_ON= \ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl + +QUERYTRACE_CONFIGURE_ENABLE= querytrace + +DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c + .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} Modified: head/dns/bind911/distinfo ============================================================================== --- head/dns/bind911/distinfo Wed Aug 31 11:49:42 2016 (r421150) +++ head/dns/bind911/distinfo Wed Aug 31 11:58:51 2016 (r421151) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470224272 -SHA256 (bind-9.11.0b3.tar.gz) = 7c1d0d3465755c0cfb990c9bfff33f33c7cef9a16e320e7e3a5eb7c506d9e993 -SIZE (bind-9.11.0b3.tar.gz) = 9735747 +TIMESTAMP = 1472643318 +SHA256 (bind-9.11.0rc1.tar.gz) = 047ed20de3bed0ca40d68b2ca7fedff9d46f82097d5ac474ef1456b27da3002d +SIZE (bind-9.11.0rc1.tar.gz) = 9788210 Modified: head/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Aug 31 11:49:42 2016 (r421150) +++ head/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Aug 31 11:58:51 2016 (r421151) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2016-07-28 12:26:36 UTC +--- bin/named/config.c.orig 2016-08-30 11:01:49 UTC +++ bin/named/config.c -@@ -152,6 +152,8 @@ options {\n\ +@@ -154,6 +154,8 @@ options {\n\ lame-ttl 600;\n\ servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-07-28 12:26:36 UTC +--- bin/named/server.c.orig 2016-08-30 11:01:49 UTC +++ bin/named/server.c -@@ -3567,6 +3567,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3637,6 +3637,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ 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-07-28 12:26:36 UTC +--- lib/dns/include/dns/view.h.orig 2016-08-30 11:01:49 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-07-28 12:26:36 UTC +--- lib/dns/resolver.c.orig 2016-08-30 11:01:49 UTC +++ lib/dns/resolver.c @@ -5431,6 +5431,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 2016-07-28 12:26:36 UTC +--- lib/isccfg/namedconf.c.orig 2016-08-30 11:01:49 UTC +++ lib/isccfg/namedconf.c -@@ -1707,6 +1707,8 @@ view_clauses[] = { +@@ -1735,6 +1735,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: head/dns/bind911/files/patch-configure ============================================================================== --- head/dns/bind911/files/patch-configure Wed Aug 31 11:49:42 2016 (r421150) +++ head/dns/bind911/files/patch-configure Wed Aug 31 11:58:51 2016 (r421151) @@ -1,4 +1,4 @@ ---- configure.orig 2016-07-28 12:26:36 UTC +--- configure.orig 2016-08-30 11:01:49 UTC +++ configure @@ -14341,27 +14341,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 -@@ -22448,7 +22390,7 @@ $as_echo "" >&6; } +@@ -22563,7 +22505,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind911/pkg-plist ============================================================================== --- head/dns/bind911/pkg-plist Wed Aug 31 11:49:42 2016 (r421150) +++ head/dns/bind911/pkg-plist Wed Aug 31 11:58:51 2016 (r421151) @@ -2,6 +2,7 @@ bin/arpaname bin/bind9-config bin/delv bin/dig +%%DNSTAP%%bin/dnstap-read bin/host bin/isc-config.sh bin/mdig @@ -34,6 +35,7 @@ include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h include/dns/dnstap.h +%%DNSTAP%%include/dns/dnstap.pb-c.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h @@ -136,6 +138,7 @@ include/isc/counter.h include/isc/crc64.h include/isc/dir.h include/isc/entropy.h +include/isc/errno.h include/isc/error.h include/isc/event.h include/isc/eventclass.h @@ -229,6 +232,7 @@ include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h +include/pk11/site.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h @@ -272,6 +276,7 @@ man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz man/man1/dig.1.gz +%%DNSTAP%%man/man1/dnstap-read.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/mdig.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608311158.u7VBwpNc098497>