Index: head/dns/bind-tools/Makefile =================================================================== --- head/dns/bind-tools/Makefile (revision 438944) +++ head/dns/bind-tools/Makefile (revision 438945) @@ -1,14 +1,13 @@ # $FreeBSD$ # Define PORTREVISION in ${MASTERDIR} MASTERDIR= ${.CURDIR}/../../dns/bind911 DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -PKGINSTALL= /nonexistent BIND_TOOLS_SLAVE= YES INSTALL_WRKSRC= ${WRKSRC}/bin .include "${MASTERDIR}/Makefile" Index: head/dns/bind9-devel/Makefile =================================================================== --- head/dns/bind9-devel/Makefile (revision 438944) +++ head/dns/bind9-devel/Makefile (revision 438945) @@ -1,298 +1,289 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind 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 .else # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 2 .endif CATEGORIES= dns net ipv6 MASTER_SITES= LOCAL/mat/bind #MASTER_SITES= https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=snapshot;h=${HASH};sf=tgz;/ .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 9-devel .endif DISTNAME= ${PORTNAME}9-${HASH} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif LICENSE= MPL +LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2017.04.13 -HASH= 19643a1 +ISCVERSION= 9.12.0a.2017.04.20 +HASH= 706c6ac5 USES= cpe libedit CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif LIB_DEPENDS= libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=/var --disable-linux-caps \ +CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} +ETCDIR= ${PREFIX}/etc/namedb + +CONFLICTS= bind99 bind910 bind9-devel + .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -.endif -ETCDIR= ${PREFIX}/etc/namedb +CONFLICTS+= bind911 +.else +USE_RC_SUBR= named +SUB_FILES= pkg-message named.conf +CONFLICTS+= bind-tools +.endif # BIND_TOOLS_SLAVE -CONFLICTS+= bind99 bind910 bind911 +MAKE_JOBS_UNSAFE= yes -.if !defined(BIND_TOOLS_SLAVE) -SUB_FILES= pkg-message -.endif +PORTDOCS= * OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA + OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB .endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes -SSL_DESC= Build with OpenSSL (Required for DNSSEC) -LARGE_FILE_DESC= 64-bit file support -FIXED_RRSET_DESC= Enable fixed rrset ordering -SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation -FILTER_AAAA_DESC= Enable filtering of AAAA records CRYPTO_DESC= Choose which crypto engine to use -NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) -GEOIP_DESC= Allow geographically based ACL. -GOSTDEF_DESC= Enable GOST ciphers, needs SSL (see help on 8 and 9) -GOST_DESC= GOST raw keys (new default) -GOST_ASN1_DESC= GOST using ASN.1 -PYTHON_DESC= Build with Python utilities -START_LATE_DESC= Start BIND late in the boot process -MINCACHE_DESC= Use the mincachettl patch -PORTREVISION_DESC= Show PORTREVISION in the version string -QUERYTRACE_DESC= Enable the very verbose query tracelogging -LMDB_DESC= Use LMDB for zone management -DNSTAP_DESC= Provides fast passive logging of DNS messages - -RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules -RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records -DLZ_DESC= Dynamically Loadable Zones -DLZ_POSTGRESQL_DESC= DLZ Postgres driver -DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_BDB_DESC= DLZ BDB driver -DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver +DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) +DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver +DNSTAP_DESC= Provides fast passive logging of DNS messages +FILTER_AAAA_DESC= Enable filtering of AAAA records +FIXED_RRSET_DESC= Enable fixed rrset ordering +GEOIP_DESC= Allow geographically based ACL. +GOSTDEF_DESC= Enable GOST ciphers, needs SSL +GOST_ASN1_DESC= GOST using ASN.1 +GOST_DESC= GOST raw keys (new default) GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable +LARGE_FILE_DESC= 64-bit file support +LMDB_DESC= Use LMDB for zone management +MINCACHE_DESC= Use the mincachettl patch +NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) +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 +SSL_DESC= Build with OpenSSL (Required for DNSSEC) +START_LATE_DESC= Start BIND late in the boot process (see help) -.if defined(BIND_TOOLS_SLAVE) -CONFLICTS+= bind9-devel -.else -CONFLICTS+= bind-tools -.endif # BIND_TOOLS_SLAVE +DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes +DLZ_BDB_USES= bdb -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -SSL_USES= ssl -SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes -LMDB_CONFIGURE_WITH= lmdb -LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes +DLZ_LDAP_USE= openldap=yes -IDN_USES= iconv -IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} -IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit -IDN_CONFIGURE_OFF= --without-idn +DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes +DLZ_MYSQL_PREVENTS= THREADS +DLZ_MYSQL_USES= mysql -LARGE_FILE_CONFIGURE_ENABLE= largefile +DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes +DLZ_POSTGRESQL_USES= pgsql -SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" +DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes -IPV6_CONFIGURE_ENABLE= ipv6 +DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_IMPLIES= THREADS +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa -NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_CONFIGURE_WITH= libjson +GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 GOST_CONFIGURE_ON= --with-gost -GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 -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 +GSSAPI_BASE_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_USES= gssapi -DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes -DLZ_POSTGRESQL_USES= pgsql +GSSAPI_HEIMDAL_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_USES= gssapi:heimdal -FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset +GSSAPI_MIT_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_USES= gssapi:mit -RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname +IDN_CONFIGURE_OFF= --without-idn +IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit +IDN_USES= iconv -DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes -DLZ_MYSQL_USES= mysql +IPV6_CONFIGURE_ENABLE= ipv6 -DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes -DLZ_BDB_USES= bdb +JSON_CONFIGURE_WITH= libjson +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes -DLZ_LDAP_USE= openldap=yes +LARGE_FILE_CONFIGURE_ENABLE= largefile -DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes +LMDB_CONFIGURE_WITH= lmdb +LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ - NAMED_BEFORE="LOGIN" -START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ - NAMED_BEFORE="SERVERS" +NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +NATIVE_PKCS11_IMPLIES= THREADS -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_USES= python -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 -DNSTAP_IMPLIES= THREADS +RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -.include +RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip -.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} -CONFIGURE_ARGS+= --without-gost -.endif +SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" -.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif +SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +SSL_USES= ssl -.if !defined(BIND_TOOLS_SLAVE) -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.endif # !defined(BIND_TOOLS_SLAVE) +START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ + NAMED_BEFORE="LOGIN" +START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ + NAMED_BEFORE="SERVERS" -MAKE_JOBS_UNSAFE= yes +THREADS_CONFIGURE_ENABLE= threads -PORTDOCS= * - .include +.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} +CONFIGURE_ARGS+= --without-gost +.endif + .if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif post-extract: echo "SRCID=${HASH}" > ${WRKSRC}/srcid post-patch: @${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${HASH}#' \ ${WRKSRC}/version .if defined(BIND_TOOLS_SLAVE) @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \ + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in .else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor .endif .if !defined(BIND_TOOLS_SLAVE) -.if ${PORTREVISION:N0} +. if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version -.endif +. endif post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} -.for i in dynamic master slave working +. for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i -.endfor +. endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ + ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} +.endif # BIND_TOOLS_SLAVE + # 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 Index: head/dns/bind9-devel/distinfo =================================================================== --- head/dns/bind9-devel/distinfo (revision 438944) +++ head/dns/bind9-devel/distinfo (revision 438945) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492076040 -SHA256 (bind9-19643a1.tar.gz) = c9d7ff5740654e62ce97a7dd2686ac65ab482e11186c5aadc41fa5554df617fe -SIZE (bind9-19643a1.tar.gz) = 11874582 +TIMESTAMP = 1492693611 +SHA256 (bind9-706c6ac5.tar.gz) = ea2efadf91f26b97fbd4e79a6ce22dfd680440c3f76e2d8219a7208e989b087d +SIZE (bind9-706c6ac5.tar.gz) = 11874695 Index: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl =================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (revision 438944) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (revision 438945) @@ -1,73 +1,73 @@ ---- bin/named/config.c.orig 2017-02-09 21:52:45 UTC +--- bin/named/config.c.orig 2017-04-20 07:59:45 UTC +++ bin/named/config.c @@ -158,6 +158,8 @@ options {\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 90%;\n\ ---- bin/named/server.c.orig 2017-02-09 21:52:45 UTC +--- bin/named/server.c.orig 2017-04-20 07:59:45 UTC +++ bin/named/server.c -@@ -3743,6 +3743,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3751,6 +3751,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; + result = ns_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; + result = ns_config_get(maps, "min-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->mincachettl = cfg_obj_asuint32(obj); + + obj = NULL; 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 2017-02-09 21:52:45 UTC +--- lib/dns/include/dns/view.h.orig 2017-04-20 07:59:45 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t mincachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-02-09 21:52:45 UTC +--- lib/dns/resolver.c.orig 2017-04-20 07:59:45 UTC +++ lib/dns/resolver.c -@@ -5467,6 +5467,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5468,6 +5468,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* + * Enforce the configure minimum cache TTL. + */ + if (rdataset->ttl < res->view->mincachettl) + rdataset->ttl = res->view->mincachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-02-09 21:52:45 UTC +--- lib/isccfg/namedconf.c.orig 2017-04-20 07:59:45 UTC +++ lib/isccfg/namedconf.c -@@ -1864,6 +1864,8 @@ view_clauses[] = { +@@ -1882,6 +1882,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 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, { "max-cache-ttl", &cfg_type_uint32, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_uint32, 0 }, Index: head/dns/bind9-devel/files/named.conf.in =================================================================== --- head/dns/bind9-devel/files/named.conf.in (revision 438944) +++ head/dns/bind9-devel/files/named.conf.in (revision 438945) @@ -1,360 +1,388 @@ // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/local/share/doc/bind for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. options { // All file and path names are relative to the chroot directory, // if any, and should be fully qualified. directory "%%ETCDIR%%/working"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. listen-on { 127.0.0.1; }; // If you have IPv6 enabled on this system, uncomment this option for // use as a local resolver. To give access to the network, specify // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; // These zones are already covered by the empty zones listed below. // If you remove the related empty zones below, comment these lines out. disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you // benefit from its cache, thus reduce overall DNS traffic in the Internet. /* forwarders { 127.0.0.1; }; */ // If the 'forwarders' clause is not empty the default is to 'forward first' // which will fall back to sending a query from your local server if the name // servers in 'forwarders' do not have the answer. Alternatively you can // force your name server to never initiate queries of its own by enabling the // following line: // forward only; // If you wish to have forwarding configured automatically based on // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). // include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing query by default in order to dramatically reduce the possibility of cache poisoning. All users are strongly encouraged to utilize this feature, and to configure their firewalls to accommodate it. AS A LAST RESORT in order to get around a restrictive firewall policy you can try enabling the option below. Use of this option will significantly reduce your ability to withstand cache poisoning attacks, and should be avoided if at all possible. Replace NNNNN in the example with a number between 49160 and 65530. */ // query-source address * port NNNNN; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. zone "." { type hint; file "%%ETCDIR%%/named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots 3. Greater resilience to any potential root server failure/DDoS On the other hand, this method requires more monitoring than the hints file to be sure that an unexpected failure mode has not incapacitated your server. Name servers that are serving a lot of clients will benefit more from this approach than individual hosts. Use with caution. To use this mechanism, uncomment the entries below, and comment the hint zone above. As documented at http://dns.icann.org/services/axfr/ these zones: - "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others are available for AXFR from these servers on IPv4 and IPv6: xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { type slave; file "%%ETCDIR%%/slave/root.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; zone "arpa" { type slave; file "%%ETCDIR%%/slave/arpa.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; +zone "in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/in-addr.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} +zone "ip6.arpa" { + type slave; + file "%%ETCDIR%%/slave/ip6.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} */ /* Serving the following zones locally will prevent any queries for these zones leaving your network and going to the root name servers. This has two significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots */ // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // RFC 1912-style zone for IPv6 localhost address (RFC 6303) zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; // "This" Network (RFCs 1912, 5735 and 6303) zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Private Use Networks (RFCs 1918, 5735 and 6303) zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Shared Address Space (RFC 6598) zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Link-local/APIPA (RFCs 3927, 5735 and 6303) zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IETF protocol assignments (RFCs 5735 and 5736) zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Example Range for Documentation (RFCs 3849 and 6303) zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Router Benchmark Testing (RFCs 2544 and 5735) zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IANA Reserved - Old Class E Space (RFC 5735) zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Unassigned Addresses (RFC 4291) zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 ULA (RFCs 4193 and 6303) zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Link Local (RFCs 4291 and 6303) zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IP6.INT is Deprecated (RFC 4159) zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! // // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible // master name server. // // Do not forget to include the reverse lookup zone! // This is named after the first bytes of the IP address, in reverse // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // // Before starting to set up a master zone, make sure you fully // understand how DNS and BIND work. There are sometimes // non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. /* An example dynamic zone key "exampleorgkey" { algorithm hmac-md5; secret "sf87HJqjkqh8ac87a02lla=="; }; zone "example.org" { type master; allow-update { key "exampleorgkey"; }; file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; }; */ Index: head/dns/bind9-devel/files/named.root =================================================================== --- head/dns/bind9-devel/files/named.root (revision 438944) +++ head/dns/bind9-devel/files/named.root (revision 438945) @@ -1,94 +1,96 @@ ; ; $FreeBSD$ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: March 23, 2016 -; related version of root zone: 2016032301 +; last update: April 11, 2017 +; related version of root zone: 2017041101 ; ; formerly NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b ; ; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 ; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 ; End of file Index: head/dns/bind910/Makefile =================================================================== --- head/dns/bind910/Makefile (revision 438944) +++ head/dns/bind910/Makefile (revision 438945) @@ -1,237 +1,238 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 910 DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.4-P8 +ISCVERSION= 9.10.5 USES= cpe libedit CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif LIB_DEPENDS= libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=/var --disable-linux-caps \ +CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS+= bind-tools bind99 bind911 bind9-devel +CONFLICTS= bind-tools bind99 bind911 bind9-devel SUB_FILES= pkg-message named.conf +USE_RC_SUBR= named +MAKE_JOBS_UNSAFE= yes + +PORTDOCS= * + OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \ DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE \ START_LATE + OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes -SSL_DESC= Build with OpenSSL (Required for DNSSEC) -LARGE_FILE_DESC= 64-bit file support -FIXED_RRSET_DESC= Enable fixed rrset ordering -SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation -FILTER_AAAA_DESC= Enable filtering of AAAA records CRYPTO_DESC= Choose which crypto engine to use -NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) -GEOIP_DESC= Allow geographically based ACL. -GOSTDEF_DESC= Enable GOST ciphers, needs SSL (see help on 8 and 9) -GOST_DESC= GOST raw keys (new default) -GOST_ASN1_DESC= GOST using ASN.1 -PYTHON_DESC= Build with Python utilities -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 - -RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules -RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records -DLZ_DESC= Dynamically Loadable Zones -DLZ_POSTGRESQL_DESC= DLZ Postgres driver -DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_BDB_DESC= DLZ BDB driver -DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver +DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) +DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver +FETCHLIMIT_DESC= Enable the query quotas for resolvers +FILTER_AAAA_DESC= Enable filtering of AAAA records +FIXED_RRSET_DESC= Enable fixed rrset ordering +GEOIP_DESC= Allow geographically based ACL. +GOSTDEF_DESC= Enable GOST ciphers, needs SSL +GOST_ASN1_DESC= GOST using ASN.1 +GOST_DESC= GOST raw keys (new default) 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 +LARGE_FILE_DESC= 64-bit file support +MINCACHE_DESC= Use the mincachettl patch +NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) +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 +SSL_DESC= Build with OpenSSL (Required for DNSSEC) +START_LATE_DESC= Start BIND late in the boot process (see help) -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -SSL_USES= ssl -SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes +DLZ_BDB_USES= bdb -IDN_USES= iconv -IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} -IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit -IDN_CONFIGURE_OFF= --without-idn +DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes -LARGE_FILE_CONFIGURE_ENABLE= largefile +DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes +DLZ_LDAP_USE= openldap=yes -SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" +DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes +DLZ_MYSQL_PREVENTS= THREADS +DLZ_MYSQL_USES= mysql -IPV6_CONFIGURE_ENABLE= ipv6 +DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes +DLZ_POSTGRESQL_USES= pgsql +DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes + +FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit + FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa -NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_CONFIGURE_WITH= libjson +GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 GOST_CONFIGURE_ON= --with-gost -GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 -PYTHON_CONFIGURE_WITH= python -PYTHON_USES= python +GSSAPI_BASE_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_USES= gssapi -DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes -DLZ_POSTGRESQL_USES= pgsql +GSSAPI_HEIMDAL_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_USES= gssapi:heimdal -FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset +GSSAPI_MIT_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_USES= gssapi:mit -RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname +IDN_CONFIGURE_OFF= --without-idn +IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit +IDN_USES= iconv -DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes -DLZ_MYSQL_USES= mysql +IPV6_CONFIGURE_ENABLE= ipv6 -DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes -DLZ_BDB_USES= bdb +JSON_CONFIGURE_WITH= libjson +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes -DLZ_LDAP_USE= openldap=yes +LARGE_FILE_CONFIGURE_ENABLE= largefile -DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes +NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +NATIVE_PKCS11_IMPLIES= THREADS +PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} +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" + +SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +SSL_USES= ssl + START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ NAMED_BEFORE="SERVERS" -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +THREADS_CONFIGURE_ENABLE= threads -.include +.include .if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} CONFIGURE_ARGS+= --without-gost .endif -.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - -USE_RC_SUBR= named - -MAKE_JOBS_UNSAFE= yes - -PORTDOCS= * - -.include - .if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif post-patch: - @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ - s|readline/history.h|histedit.h|' \ - ${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} .endfor .if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif - -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} .for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i .endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree -.endif ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ + ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +# Can't use USE_PYTHON=autoplist +post-install-PYTHON-on: + @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind910/distinfo =================================================================== --- head/dns/bind910/distinfo (revision 438944) +++ head/dns/bind910/distinfo (revision 438945) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492054917 -SHA256 (bind-9.10.4-P8.tar.gz) = 7dd356ab466ead8124d645f83719e620686998c81ce1d4eb0c52daffca7566eb -SIZE (bind-9.10.4-P8.tar.gz) = 9323291 +TIMESTAMP = 1492690349 +SHA256 (bind-9.10.5.tar.gz) = 71688d2e134e42205075eef93cc1b78b42a140a2d61bf8263afc9c92fc872b0e +SIZE (bind-9.10.5.tar.gz) = 9431916 Index: head/dns/bind910/files/extrapatch-bind-min-override-ttl =================================================================== --- head/dns/bind910/files/extrapatch-bind-min-override-ttl (revision 438944) +++ head/dns/bind910/files/extrapatch-bind-min-override-ttl (revision 438945) @@ -1,73 +1,73 @@ ---- bin/named/config.c.orig 2016-10-21 05:10:54 UTC +--- bin/named/config.c.orig 2017-04-14 03:54:11 UTC +++ bin/named/config.c -@@ -151,6 +151,8 @@ options {\n\ +@@ -154,6 +154,8 @@ options {\n\ min-roots 2;\n\ lame-ttl 600;\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-10-21 05:10:54 UTC +--- bin/named/server.c.orig 2017-04-14 03:54:11 UTC +++ bin/named/server.c -@@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -2890,6 +2890,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; + result = ns_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; + result = ns_config_get(maps, "min-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->mincachettl = cfg_obj_asuint32(obj); + + obj = NULL; 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-10-21 05:10:54 UTC +--- lib/dns/include/dns/view.h.orig 2017-04-14 03:54:11 UTC +++ lib/dns/include/dns/view.h -@@ -150,6 +150,8 @@ struct dns_view { +@@ -151,6 +151,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t requestsit; 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-10-21 05:10:54 UTC +--- lib/dns/resolver.c.orig 2017-04-14 03:54:11 UTC +++ lib/dns/resolver.c -@@ -5373,6 +5373,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5378,6 +5378,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* + * Enforce the configure minimum cache TTL. + */ + if (rdataset->ttl < res->view->mincachettl) + rdataset->ttl = res->view->mincachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-10-21 05:10:54 UTC +--- lib/isccfg/namedconf.c.orig 2017-04-14 03:54:11 UTC +++ lib/isccfg/namedconf.c -@@ -1572,6 +1572,8 @@ view_clauses[] = { +@@ -1591,6 +1591,8 @@ view_clauses[] = { #endif { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizenodefault, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, { "max-cache-ttl", &cfg_type_uint32, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_uint32, 0 }, Index: head/dns/bind910/files/named.conf.in =================================================================== --- head/dns/bind910/files/named.conf.in (revision 438944) +++ head/dns/bind910/files/named.conf.in (revision 438945) @@ -1,360 +1,388 @@ // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/local/share/doc/bind for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. options { // All file and path names are relative to the chroot directory, // if any, and should be fully qualified. directory "%%ETCDIR%%/working"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. listen-on { 127.0.0.1; }; // If you have IPv6 enabled on this system, uncomment this option for // use as a local resolver. To give access to the network, specify // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; // These zones are already covered by the empty zones listed below. // If you remove the related empty zones below, comment these lines out. disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you // benefit from its cache, thus reduce overall DNS traffic in the Internet. /* forwarders { 127.0.0.1; }; */ // If the 'forwarders' clause is not empty the default is to 'forward first' // which will fall back to sending a query from your local server if the name // servers in 'forwarders' do not have the answer. Alternatively you can // force your name server to never initiate queries of its own by enabling the // following line: // forward only; // If you wish to have forwarding configured automatically based on // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). // include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing query by default in order to dramatically reduce the possibility of cache poisoning. All users are strongly encouraged to utilize this feature, and to configure their firewalls to accommodate it. AS A LAST RESORT in order to get around a restrictive firewall policy you can try enabling the option below. Use of this option will significantly reduce your ability to withstand cache poisoning attacks, and should be avoided if at all possible. Replace NNNNN in the example with a number between 49160 and 65530. */ // query-source address * port NNNNN; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. zone "." { type hint; file "%%ETCDIR%%/named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots 3. Greater resilience to any potential root server failure/DDoS On the other hand, this method requires more monitoring than the hints file to be sure that an unexpected failure mode has not incapacitated your server. Name servers that are serving a lot of clients will benefit more from this approach than individual hosts. Use with caution. To use this mechanism, uncomment the entries below, and comment the hint zone above. As documented at http://dns.icann.org/services/axfr/ these zones: - "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others are available for AXFR from these servers on IPv4 and IPv6: xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { type slave; file "%%ETCDIR%%/slave/root.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; zone "arpa" { type slave; file "%%ETCDIR%%/slave/arpa.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; +zone "in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/in-addr.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} +zone "ip6.arpa" { + type slave; + file "%%ETCDIR%%/slave/ip6.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} */ /* Serving the following zones locally will prevent any queries for these zones leaving your network and going to the root name servers. This has two significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots */ // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // RFC 1912-style zone for IPv6 localhost address (RFC 6303) zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; // "This" Network (RFCs 1912, 5735 and 6303) zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Private Use Networks (RFCs 1918, 5735 and 6303) zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Shared Address Space (RFC 6598) zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Link-local/APIPA (RFCs 3927, 5735 and 6303) zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IETF protocol assignments (RFCs 5735 and 5736) zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Example Range for Documentation (RFCs 3849 and 6303) zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Router Benchmark Testing (RFCs 2544 and 5735) zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IANA Reserved - Old Class E Space (RFC 5735) zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Unassigned Addresses (RFC 4291) zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 ULA (RFCs 4193 and 6303) zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Link Local (RFCs 4291 and 6303) zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IP6.INT is Deprecated (RFC 4159) zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! // // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible // master name server. // // Do not forget to include the reverse lookup zone! // This is named after the first bytes of the IP address, in reverse // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // // Before starting to set up a master zone, make sure you fully // understand how DNS and BIND work. There are sometimes // non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. /* An example dynamic zone key "exampleorgkey" { algorithm hmac-md5; secret "sf87HJqjkqh8ac87a02lla=="; }; zone "example.org" { type master; allow-update { key "exampleorgkey"; }; file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; }; */ Index: head/dns/bind910/files/named.root =================================================================== --- head/dns/bind910/files/named.root (revision 438944) +++ head/dns/bind910/files/named.root (revision 438945) @@ -1,94 +1,96 @@ ; ; $FreeBSD$ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: March 23, 2016 -; related version of root zone: 2016032301 +; last update: April 11, 2017 +; related version of root zone: 2017041101 ; ; formerly NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b ; ; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 ; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 ; End of file Index: head/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in =================================================================== --- head/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in (revision 438944) +++ head/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in (revision 438945) @@ -1,11 +1,11 @@ ---- bin/tests/system/dlzexternal/Makefile.in.orig 2016-04-20 20:11:20 UTC +--- bin/tests/system/dlzexternal/Makefile.in.orig 2017-04-14 03:54:11 UTC +++ bin/tests/system/dlzexternal/Makefile.in -@@ -43,7 +43,7 @@ OBJS = ${DLOPENOBJS} +@@ -39,7 +39,7 @@ OBJS = @BIND9_MAKE_RULES@ CFLAGS = @CFLAGS@ @SO_CFLAGS@ -SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@ +SO_LDFLAGS = @SO_LDFLAGS@ - dlopen@EXEEXT@: ${DLOPENOBJS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ + driver.@SO@: ${SO_OBJS} + ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@ Index: head/dns/bind910/files/patch-configure =================================================================== --- head/dns/bind910/files/patch-configure (revision 438944) +++ head/dns/bind910/files/patch-configure (revision 438945) @@ -1,90 +1,90 @@ ---- configure.orig 2016-04-20 20:11:20 UTC +--- configure.orig 2017-04-14 03:54:11 UTC +++ configure -@@ -14142,27 +14142,9 @@ done +@@ -14347,27 +14347,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ - "-lgssapi_krb5" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do - # Note that this does not include $saved_libs, because - # on FreeBSD machines this configure script has added - # -L/usr/local/lib to LIBS, which can make the - # -lgssapi_krb5 test succeed with shared libraries even - # when you are trying to build with KTH in /usr/lib. -- if test "$use_gssapi" = "/usr" +- if test "/usr" = "$use_gssapi" - then - LIBS="$TRY_LIBS" - else - LIBS="-L$use_gssapi/lib $TRY_LIBS" - fi + LIBS="$TRY_LIBS" { $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; } ;; +@@ -14410,47 +14392,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac - # - # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib - # but MIT in /usr/local/lib and trying to build with KTH. - # /usr/local/lib can end up earlier on the link lines. - # Like most kludges, this one is not only inelegant it - # is also likely to be the wrong thing to do at least as - # many times as it is the right thing. Something better - # needs to be done. - # -- if test "$use_gssapi" = "/usr" -a \ +- if test "/usr" = "$use_gssapi" -a \ - -f /usr/local/lib/libkrb5.a; then - FIX_KTH_VS_MIT=yes - fi - - case "$FIX_KTH_VS_MIT" in - yes) - case "$enable_static_linking" in - yes) gssapi_lib_suffix=".a" ;; - *) gssapi_lib_suffix=".so" ;; - esac - - for lib in $LIBS; do - case $lib in - -L*) - ;; - -l*) - new_lib=`echo $lib | - sed -e s%^-l%$use_gssapi/lib/lib% \ - -e s%$%$gssapi_lib_suffix%` - NEW_LIBS="$NEW_LIBS $new_lib" - ;; - *) - as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 - ;; - esac - done - LIBS="$NEW_LIBS" - ;; - esac - - DST_GSSAPI_INC="-I$use_gssapi/include" + DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" 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; } +@@ -21960,7 +21902,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). - bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" + bdb_incdirs="/db6 /db5 /db48" # include a blank element first for d in "" $bdb_incdirs do Index: head/dns/bind910/pkg-help =================================================================== --- head/dns/bind910/pkg-help (revision 438944) +++ head/dns/bind910/pkg-help (revision 438945) @@ -1,30 +1,20 @@ NATIVE_PKCS11 When using the NATIVE_PKCS11 option, BIND will use the PKCS#11 engine specified by the named_pkcss11_engine variable in /etc/rc.conf for *all* crypto operations. This is primarily intended to be used in an authoritative case. If BIND is also operating as a validating resolver, NATIVE_PKCS11 should not be used, because the HSM will be used for all crypto, including DNSSEC validations, and the HSM is likely to be slower than the CPU for this purpose. Additionally, the HSM might not support all of the PKCS#11 API functions needed for signature verification. - GOST -If using a chrooted instance of BIND on FreeBSD 8.x and 9.x, -the OpenSSL engines MUST be accessible from within the chroot. -If BIND is chrooted in /var/named, this can be achieved by -either copying content of /usr/local/lib/engines into -/var/named/usr/local/lib/engines, or by creating that directory -and adding this line to /etc/fstab: -/usr/local/lib/engines /var/named/usr/local/lib/engines nullfs ro 0 0 - - START_LATE Most of the time, BIND needs to start early in the boot process. Enable this if BIND starts too early for you and you need it to start later. Index: head/dns/bind910/pkg-plist =================================================================== --- head/dns/bind910/pkg-plist (revision 438944) +++ head/dns/bind910/pkg-plist (revision 438945) @@ -1,423 +1,425 @@ +bin/arpaname bin/bind9-config bin/delv bin/dig bin/host bin/isc-config.sh +bin/named-rrchecker bin/nslookup bin/nsupdate etc/mtree/BIND.chroot.dist etc/mtree/BIND.chroot.local.dist %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db %%ETCDIR%%/master/localhost-reverse.db @sample %%ETCDIR%%/named.conf.sample %%ETCDIR%%/named.root %%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h include/dns/acache.h include/dns/acl.h include/dns/adb.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h include/dns/dbtable.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h include/dns/ds.h include/dns/dsdigest.h include/dns/ecdb.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/iptable.h include/dns/journal.h include/dns/keydata.h include/dns/keyflags.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h include/dns/log.h include/dns/lookup.h include/dns/master.h include/dns/masterdump.h include/dns/message.h include/dns/name.h include/dns/ncache.h include/dns/nsec.h include/dns/nsec3.h include/dns/opcode.h include/dns/order.h include/dns/peer.h include/dns/portlist.h include/dns/private.h include/dns/rbt.h include/dns/rcode.h include/dns/rdata.h include/dns/rdataclass.h include/dns/rdatalist.h include/dns/rdataset.h include/dns/rdatasetiter.h include/dns/rdataslab.h include/dns/rdatastruct.h include/dns/rdatatype.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h include/dns/rpz.h include/dns/rriterator.h include/dns/rrl.h include/dns/sdb.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/tcpmsg.h include/dns/time.h include/dns/timer.h include/dns/tkey.h include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h include/dns/update.h include/dns/validator.h include/dns/version.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h include/dst/lib.h include/dst/result.h include/irs/context.h include/irs/dnsconf.h include/irs/netdb.h include/irs/platform.h include/irs/resconf.h include/irs/types.h include/irs/version.h include/isc/aes.h include/isc/app.h include/isc/assertions.h include/isc/atomic.h include/isc/backtrace.h include/isc/base32.h include/isc/base64.h include/isc/bind9.h include/isc/boolean.h include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h 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 include/isc/file.h include/isc/formatcheck.h include/isc/fsaccess.h include/isc/hash.h include/isc/heap.h include/isc/hex.h include/isc/hmacmd5.h include/isc/hmacsha.h include/isc/httpd.h include/isc/int.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/json.h include/isc/keyboard.h include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h include/isc/list.h include/isc/log.h include/isc/magic.h include/isc/md5.h include/isc/mem.h include/isc/msgcat.h include/isc/msgs.h include/isc/mutex.h include/isc/mutexblock.h include/isc/net.h include/isc/netaddr.h include/isc/netdb.h include/isc/netscope.h include/isc/offset.h include/isc/once.h include/isc/ondestroy.h include/isc/os.h include/isc/parseint.h include/isc/platform.h include/isc/pool.h include/isc/portset.h include/isc/print.h include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h include/isc/ratelimiter.h include/isc/refcount.h include/isc/regex.h include/isc/region.h include/isc/resource.h include/isc/result.h include/isc/resultclass.h include/isc/rwlock.h include/isc/safe.h include/isc/serial.h include/isc/sha1.h include/isc/sha2.h include/isc/sockaddr.h include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdio.h include/isc/stdlib.h include/isc/stdtime.h include/isc/strerror.h include/isc/string.h include/isc/symtab.h include/isc/syslog.h include/isc/task.h include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h include/isc/util.h include/isc/version.h include/isc/xml.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h include/isccc/ccmsg.h include/isccc/events.h include/isccc/lib.h include/isccc/result.h include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/dnsconf.h include/isccfg/grammar.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h include/lwres/context.h include/lwres/int.h include/lwres/ipv6.h include/lwres/lang.h include/lwres/list.h include/lwres/lwbuffer.h include/lwres/lwpacket.h include/lwres/lwres.h include/lwres/net.h include/lwres/netdb.h include/lwres/platform.h include/lwres/result.h include/lwres/stdlib.h include/lwres/string.h include/lwres/version.h include/pk11/constants.h include/pk11/internal.h include/pk11/pk11.h include/pk11/result.h +include/pk11/site.h include/pkcs11/cryptoki.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h include/pkcs11/pkcs11t.h lib/libbind9.a lib/libdns.a lib/libirs.a lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/liblwres.a man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz man/man1/dig.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/named-rrchecker.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz man/man3/lwres.3.gz man/man3/lwres_addr_parse.3.gz man/man3/lwres_buffer.3.gz man/man3/lwres_buffer_add.3.gz man/man3/lwres_buffer_back.3.gz man/man3/lwres_buffer_clear.3.gz man/man3/lwres_buffer_first.3.gz man/man3/lwres_buffer_forward.3.gz man/man3/lwres_buffer_getmem.3.gz man/man3/lwres_buffer_getuint16.3.gz man/man3/lwres_buffer_getuint32.3.gz man/man3/lwres_buffer_getuint8.3.gz man/man3/lwres_buffer_init.3.gz man/man3/lwres_buffer_invalidate.3.gz man/man3/lwres_buffer_putmem.3.gz man/man3/lwres_buffer_putuint16.3.gz man/man3/lwres_buffer_putuint32.3.gz man/man3/lwres_buffer_putuint8.3.gz man/man3/lwres_buffer_subtract.3.gz man/man3/lwres_conf_clear.3.gz man/man3/lwres_conf_get.3.gz man/man3/lwres_conf_init.3.gz man/man3/lwres_conf_parse.3.gz man/man3/lwres_conf_print.3.gz man/man3/lwres_config.3.gz man/man3/lwres_context.3.gz man/man3/lwres_context_allocmem.3.gz man/man3/lwres_context_create.3.gz man/man3/lwres_context_destroy.3.gz man/man3/lwres_context_freemem.3.gz man/man3/lwres_context_initserial.3.gz man/man3/lwres_context_nextserial.3.gz man/man3/lwres_context_sendrecv.3.gz man/man3/lwres_endhostent.3.gz man/man3/lwres_endhostent_r.3.gz man/man3/lwres_freeaddrinfo.3.gz man/man3/lwres_freehostent.3.gz man/man3/lwres_gabn.3.gz man/man3/lwres_gabnrequest_free.3.gz man/man3/lwres_gabnrequest_parse.3.gz man/man3/lwres_gabnrequest_render.3.gz man/man3/lwres_gabnresponse_free.3.gz man/man3/lwres_gabnresponse_parse.3.gz man/man3/lwres_gabnresponse_render.3.gz man/man3/lwres_gai_strerror.3.gz man/man3/lwres_getaddrinfo.3.gz man/man3/lwres_getaddrsbyname.3.gz man/man3/lwres_gethostbyaddr.3.gz man/man3/lwres_gethostbyaddr_r.3.gz man/man3/lwres_gethostbyname.3.gz man/man3/lwres_gethostbyname2.3.gz man/man3/lwres_gethostbyname_r.3.gz man/man3/lwres_gethostent.3.gz man/man3/lwres_gethostent_r.3.gz man/man3/lwres_getipnode.3.gz man/man3/lwres_getipnodebyaddr.3.gz man/man3/lwres_getipnodebyname.3.gz man/man3/lwres_getnamebyaddr.3.gz man/man3/lwres_getnameinfo.3.gz man/man3/lwres_getrrsetbyname.3.gz man/man3/lwres_gnba.3.gz man/man3/lwres_gnbarequest_free.3.gz man/man3/lwres_gnbarequest_parse.3.gz man/man3/lwres_gnbarequest_render.3.gz man/man3/lwres_gnbaresponse_free.3.gz man/man3/lwres_gnbaresponse_parse.3.gz man/man3/lwres_gnbaresponse_render.3.gz man/man3/lwres_herror.3.gz man/man3/lwres_hstrerror.3.gz man/man3/lwres_inetntop.3.gz man/man3/lwres_lwpacket_parseheader.3.gz man/man3/lwres_lwpacket_renderheader.3.gz man/man3/lwres_net_ntop.3.gz man/man3/lwres_noop.3.gz man/man3/lwres_nooprequest_free.3.gz man/man3/lwres_nooprequest_parse.3.gz man/man3/lwres_nooprequest_render.3.gz man/man3/lwres_noopresponse_free.3.gz man/man3/lwres_noopresponse_parse.3.gz man/man3/lwres_noopresponse_render.3.gz man/man3/lwres_packet.3.gz man/man3/lwres_resutil.3.gz man/man3/lwres_sethostent.3.gz man/man3/lwres_sethostent_r.3.gz man/man3/lwres_string_parse.3.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz %%PYTHON%%man/man8/dnssec-checkds.8.gz %%PYTHON%%man/man8/dnssec-coverage.8.gz man/man8/dnssec-dsfromkey.8.gz man/man8/dnssec-importkey.8.gz man/man8/dnssec-keyfromlabel.8.gz man/man8/dnssec-keygen.8.gz man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz man/man8/dnssec-verify.8.gz man/man8/genrandom.8.gz man/man8/isc-hmac-fixup.8.gz man/man8/lwresd.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz man/man8/named-journalprint.8.gz man/man8/named.8.gz man/man8/nsec3hash.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 %%PYTHON%%sbin/dnssec-coverage sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen sbin/dnssec-revoke sbin/dnssec-settime sbin/dnssec-signzone sbin/dnssec-verify sbin/genrandom sbin/isc-hmac-fixup sbin/lwresd sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone sbin/named-journalprint -sbin/named-rrchecker sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list %%NATIVE_PKCS11%%sbin/pkcs11-tokens sbin/rndc sbin/rndc-confgen sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir %%ETCDIR%%/master @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working Index: head/dns/bind911/Makefile =================================================================== --- head/dns/bind911/Makefile (revision 438944) +++ head/dns/bind911/Makefile (revision 438945) @@ -1,295 +1,282 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind 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 .else # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 911 .endif DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif LICENSE= MPL +LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0-P5 +ISCVERSION= 9.11.1 USES= cpe libedit CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif LIB_DEPENDS= libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=/var --disable-linux-caps \ +CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} +ETCDIR= ${PREFIX}/etc/namedb + +CONFLICTS= bind99 bind910 bind9-devel + .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared -.endif -ETCDIR= ${PREFIX}/etc/namedb +CONFLICTS+= bind911 +.else +USE_RC_SUBR= named +SUB_FILES= pkg-message named.conf +CONFLICTS+= bind-tools +.endif # BIND_TOOLS_SLAVE -CONFLICTS+= bind99 bind910 bind9-devel +MAKE_JOBS_UNSAFE= yes -.if !defined(BIND_TOOLS_SLAVE) -SUB_FILES= pkg-message -.endif +PORTDOCS= * OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA + OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB .endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes -SSL_DESC= Build with OpenSSL (Required for DNSSEC) -LARGE_FILE_DESC= 64-bit file support -FIXED_RRSET_DESC= Enable fixed rrset ordering -SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation -FILTER_AAAA_DESC= Enable filtering of AAAA records CRYPTO_DESC= Choose which crypto engine to use -NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) -GEOIP_DESC= Allow geographically based ACL. -GOSTDEF_DESC= Enable GOST ciphers, needs SSL (see help on 8 and 9) -GOST_DESC= GOST raw keys (new default) -GOST_ASN1_DESC= GOST using ASN.1 -PYTHON_DESC= Build with Python utilities -START_LATE_DESC= Start BIND late in the boot process -MINCACHE_DESC= Use the mincachettl patch -PORTREVISION_DESC= Show PORTREVISION in the version string -QUERYTRACE_DESC= Enable the very verbose query tracelogging -LMDB_DESC= Use LMDB for zone management -DNSTAP_DESC= Provides fast passive logging of DNS messages - -RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules -RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records -DLZ_DESC= Dynamically Loadable Zones -DLZ_POSTGRESQL_DESC= DLZ Postgres driver -DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_BDB_DESC= DLZ BDB driver -DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver +DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) +DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver +DNSTAP_DESC= Provides fast passive logging of DNS messages +FILTER_AAAA_DESC= Enable filtering of AAAA records +FIXED_RRSET_DESC= Enable fixed rrset ordering +GEOIP_DESC= Allow geographically based ACL. +GOSTDEF_DESC= Enable GOST ciphers, needs SSL +GOST_ASN1_DESC= GOST using ASN.1 +GOST_DESC= GOST raw keys (new default) GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable +LARGE_FILE_DESC= 64-bit file support +LMDB_DESC= Use LMDB for zone management +MINCACHE_DESC= Use the mincachettl patch +NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) +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 +SSL_DESC= Build with OpenSSL (Required for DNSSEC) +START_LATE_DESC= Start BIND late in the boot process (see help) -.if defined(BIND_TOOLS_SLAVE) -CONFLICTS+= bind911 -.else -CONFLICTS+= bind-tools -.endif # BIND_TOOLS_SLAVE +DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes +DLZ_BDB_USES= bdb -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -SSL_USES= ssl -SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes -LMDB_CONFIGURE_WITH= lmdb -LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes +DLZ_LDAP_USE= openldap=yes -IDN_USES= iconv -IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} -IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit -IDN_CONFIGURE_OFF= --without-idn +DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes +DLZ_MYSQL_PREVENTS= THREADS +DLZ_MYSQL_USES= mysql -LARGE_FILE_CONFIGURE_ENABLE= largefile +DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes +DLZ_POSTGRESQL_USES= pgsql -SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" +DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes -IPV6_CONFIGURE_ENABLE= ipv6 +DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_IMPLIES= THREADS +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa -NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_CONFIGURE_WITH= libjson +GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 GOST_CONFIGURE_ON= --with-gost -GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 -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 +GSSAPI_BASE_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_USES= gssapi -DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes -DLZ_POSTGRESQL_USES= pgsql +GSSAPI_HEIMDAL_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_USES= gssapi:heimdal -FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset +GSSAPI_MIT_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_USES= gssapi:mit -RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname +IDN_CONFIGURE_OFF= --without-idn +IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit +IDN_USES= iconv -DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes -DLZ_MYSQL_USES= mysql +IPV6_CONFIGURE_ENABLE= ipv6 -DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes -DLZ_BDB_USES= bdb +JSON_CONFIGURE_WITH= libjson +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes -DLZ_LDAP_USE= openldap=yes +LARGE_FILE_CONFIGURE_ENABLE= largefile -DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes +LMDB_CONFIGURE_WITH= lmdb +LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ - NAMED_BEFORE="LOGIN" -START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ - NAMED_BEFORE="SERVERS" +NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 +NATIVE_PKCS11_IMPLIES= THREADS -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_USES= python -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 +RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -.include +RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip -.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} -CONFIGURE_ARGS+= --without-gost -.endif +SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" -.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif +SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +SSL_USES= ssl -.if !defined(BIND_TOOLS_SLAVE) -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.endif +START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ + NAMED_BEFORE="LOGIN" +START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ + NAMED_BEFORE="SERVERS" -MAKE_JOBS_UNSAFE= yes +THREADS_CONFIGURE_ENABLE= threads -PORTDOCS= * - .include +.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} +CONFIGURE_ARGS+= --without-gost +.endif + .if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif post-patch: - @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ - s|readline/history.h|histedit.h|' \ - ${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c .if defined(BIND_TOOLS_SLAVE) @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = dig delv dnssec tools nsupdate \\#' \ + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in .else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor .endif .if !defined(BIND_TOOLS_SLAVE) -.if ${PORTREVISION:N0} +. if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version -.endif +. endif post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif - -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} -.for i in dynamic master slave working +. for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i -.endfor +. endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree -.endif ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ + ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind911/distinfo =================================================================== --- head/dns/bind911/distinfo (revision 438944) +++ head/dns/bind911/distinfo (revision 438945) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492054601 -SHA256 (bind-9.11.0-P5.tar.gz) = 1e283f0567b484687dfd7b936e26c9af4f64043daf73cbd8f3eb1122c9fb71f5 -SIZE (bind-9.11.0-P5.tar.gz) = 9698446 +TIMESTAMP = 1492691449 +SHA256 (bind-9.11.1.tar.gz) = 22050095f5c82a1385cc4174190ac60392670bbc5d63d592ecae52a214bc10b2 +SIZE (bind-9.11.1.tar.gz) = 9762743 Index: head/dns/bind911/files/extrapatch-bind-min-override-ttl =================================================================== --- head/dns/bind911/files/extrapatch-bind-min-override-ttl (revision 438944) +++ head/dns/bind911/files/extrapatch-bind-min-override-ttl (revision 438945) @@ -1,73 +1,73 @@ ---- bin/named/config.c.orig 2016-10-21 05:13:38 UTC +--- bin/named/config.c.orig 2017-04-14 03:58:25 UTC +++ bin/named/config.c @@ -154,6 +154,8 @@ options {\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 90%;\n\ ---- bin/named/server.c.orig 2016-10-21 05:13:38 UTC +--- bin/named/server.c.orig 2017-04-14 03:58:25 UTC +++ bin/named/server.c -@@ -3638,6 +3638,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3693,6 +3693,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; + result = ns_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; + result = ns_config_get(maps, "min-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->mincachettl = cfg_obj_asuint32(obj); + + obj = NULL; 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-10-21 05:13:38 UTC +--- lib/dns/include/dns/view.h.orig 2017-04-14 03:58:25 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t mincachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-10-21 05:13:38 UTC +--- lib/dns/resolver.c.orig 2017-04-14 03:58:25 UTC +++ lib/dns/resolver.c -@@ -5433,6 +5433,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5439,6 +5439,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* + * Enforce the configure minimum cache TTL. + */ + if (rdataset->ttl < res->view->mincachettl) + rdataset->ttl = res->view->mincachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-10-21 05:13:38 UTC +--- lib/isccfg/namedconf.c.orig 2017-04-14 03:58:25 UTC +++ lib/isccfg/namedconf.c -@@ -1735,6 +1735,8 @@ view_clauses[] = { +@@ -1759,6 +1759,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 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, { "max-cache-ttl", &cfg_type_uint32, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_uint32, 0 }, Index: head/dns/bind911/files/named.conf.in =================================================================== --- head/dns/bind911/files/named.conf.in (revision 438944) +++ head/dns/bind911/files/named.conf.in (revision 438945) @@ -1,360 +1,388 @@ // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/local/share/doc/bind for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. options { // All file and path names are relative to the chroot directory, // if any, and should be fully qualified. directory "%%ETCDIR%%/working"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. listen-on { 127.0.0.1; }; // If you have IPv6 enabled on this system, uncomment this option for // use as a local resolver. To give access to the network, specify // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; // These zones are already covered by the empty zones listed below. // If you remove the related empty zones below, comment these lines out. disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you // benefit from its cache, thus reduce overall DNS traffic in the Internet. /* forwarders { 127.0.0.1; }; */ // If the 'forwarders' clause is not empty the default is to 'forward first' // which will fall back to sending a query from your local server if the name // servers in 'forwarders' do not have the answer. Alternatively you can // force your name server to never initiate queries of its own by enabling the // following line: // forward only; // If you wish to have forwarding configured automatically based on // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). // include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing query by default in order to dramatically reduce the possibility of cache poisoning. All users are strongly encouraged to utilize this feature, and to configure their firewalls to accommodate it. AS A LAST RESORT in order to get around a restrictive firewall policy you can try enabling the option below. Use of this option will significantly reduce your ability to withstand cache poisoning attacks, and should be avoided if at all possible. Replace NNNNN in the example with a number between 49160 and 65530. */ // query-source address * port NNNNN; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. zone "." { type hint; file "%%ETCDIR%%/named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots 3. Greater resilience to any potential root server failure/DDoS On the other hand, this method requires more monitoring than the hints file to be sure that an unexpected failure mode has not incapacitated your server. Name servers that are serving a lot of clients will benefit more from this approach than individual hosts. Use with caution. To use this mechanism, uncomment the entries below, and comment the hint zone above. As documented at http://dns.icann.org/services/axfr/ these zones: - "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others are available for AXFR from these servers on IPv4 and IPv6: xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { type slave; file "%%ETCDIR%%/slave/root.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; zone "arpa" { type slave; file "%%ETCDIR%%/slave/arpa.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; +zone "in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/in-addr.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} +zone "ip6.arpa" { + type slave; + file "%%ETCDIR%%/slave/ip6.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} */ /* Serving the following zones locally will prevent any queries for these zones leaving your network and going to the root name servers. This has two significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots */ // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // RFC 1912-style zone for IPv6 localhost address (RFC 6303) zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; // "This" Network (RFCs 1912, 5735 and 6303) zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Private Use Networks (RFCs 1918, 5735 and 6303) zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Shared Address Space (RFC 6598) zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Link-local/APIPA (RFCs 3927, 5735 and 6303) zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IETF protocol assignments (RFCs 5735 and 5736) zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Example Range for Documentation (RFCs 3849 and 6303) zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Router Benchmark Testing (RFCs 2544 and 5735) zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IANA Reserved - Old Class E Space (RFC 5735) zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Unassigned Addresses (RFC 4291) zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 ULA (RFCs 4193 and 6303) zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Link Local (RFCs 4291 and 6303) zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IP6.INT is Deprecated (RFC 4159) zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! // // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible // master name server. // // Do not forget to include the reverse lookup zone! // This is named after the first bytes of the IP address, in reverse // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // // Before starting to set up a master zone, make sure you fully // understand how DNS and BIND work. There are sometimes // non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. /* An example dynamic zone key "exampleorgkey" { algorithm hmac-md5; secret "sf87HJqjkqh8ac87a02lla=="; }; zone "example.org" { type master; allow-update { key "exampleorgkey"; }; file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; }; */ Index: head/dns/bind911/files/named.root =================================================================== --- head/dns/bind911/files/named.root (revision 438944) +++ head/dns/bind911/files/named.root (revision 438945) @@ -1,94 +1,96 @@ ; ; $FreeBSD$ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: March 23, 2016 -; related version of root zone: 2016032301 +; last update: April 11, 2017 +; related version of root zone: 2017041101 ; ; formerly NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b ; ; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 ; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 ; End of file Index: head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in =================================================================== --- head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in (revision 438944) +++ head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in (revision 438945) @@ -1,11 +1,11 @@ ---- bin/tests/system/dlzexternal/Makefile.in.orig 2016-07-28 12:26:36 UTC +--- bin/tests/system/dlzexternal/Makefile.in.orig 2017-04-14 03:58:25 UTC +++ bin/tests/system/dlzexternal/Makefile.in -@@ -35,7 +35,7 @@ OBJS = ${DLOPENOBJS} +@@ -31,7 +31,7 @@ OBJS = @BIND9_MAKE_RULES@ CFLAGS = @CFLAGS@ @SO_CFLAGS@ -SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@ +SO_LDFLAGS = @SO_LDFLAGS@ - dlopen@EXEEXT@: ${DLOPENOBJS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ + driver.@SO@: ${SO_OBJS} + ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@ Index: head/dns/bind911/files/patch-configure =================================================================== --- head/dns/bind911/files/patch-configure (revision 438944) +++ head/dns/bind911/files/patch-configure (revision 438945) @@ -1,90 +1,90 @@ ---- configure.orig 2016-08-30 11:01:49 UTC +--- configure.orig 2017-04-14 03:58:25 UTC +++ configure -@@ -14341,27 +14341,9 @@ done +@@ -14401,27 +14401,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ - "-lgssapi_krb5" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do - # Note that this does not include $saved_libs, because - # on FreeBSD machines this configure script has added - # -L/usr/local/lib to LIBS, which can make the - # -lgssapi_krb5 test succeed with shared libraries even - # when you are trying to build with KTH in /usr/lib. -- if test "$use_gssapi" = "/usr" +- if test "/usr" = "$use_gssapi" - then - LIBS="$TRY_LIBS" - else - LIBS="-L$use_gssapi/lib $TRY_LIBS" - fi + LIBS="$TRY_LIBS" { $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 -@@ -14404,47 +14386,7 @@ $as_echo "no" >&6; } ;; +@@ -14464,47 +14446,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac - # - # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib - # but MIT in /usr/local/lib and trying to build with KTH. - # /usr/local/lib can end up earlier on the link lines. - # Like most kludges, this one is not only inelegant it - # is also likely to be the wrong thing to do at least as - # many times as it is the right thing. Something better - # needs to be done. - # -- if test "$use_gssapi" = "/usr" -a \ +- if test "/usr" = "$use_gssapi" -a \ - -f /usr/local/lib/libkrb5.a; then - FIX_KTH_VS_MIT=yes - fi - - case "$FIX_KTH_VS_MIT" in - yes) - case "$enable_static_linking" in - yes) gssapi_lib_suffix=".a" ;; - *) gssapi_lib_suffix=".so" ;; - esac - - for lib in $LIBS; do - case $lib in - -L*) - ;; - -l*) - new_lib=`echo $lib | - sed -e s%^-l%$use_gssapi/lib/lib% \ - -e s%$%$gssapi_lib_suffix%` - NEW_LIBS="$NEW_LIBS $new_lib" - ;; - *) - as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 - ;; - esac - done - LIBS="$NEW_LIBS" - ;; - esac - - DST_GSSAPI_INC="-I$use_gssapi/include" + DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22563,7 +22505,7 @@ $as_echo "" >&6; } +@@ -22666,7 +22608,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). - bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" + bdb_incdirs="/db6 /db5 /db48" # include a blank element first for d in "" $bdb_incdirs do Index: head/dns/bind911/pkg-help =================================================================== --- head/dns/bind911/pkg-help (revision 438944) +++ head/dns/bind911/pkg-help (revision 438945) @@ -1,30 +1,20 @@ NATIVE_PKCS11 When using the NATIVE_PKCS11 option, BIND will use the PKCS#11 engine specified by the named_pkcss11_engine variable in /etc/rc.conf for *all* crypto operations. This is primarily intended to be used in an authoritative case. If BIND is also operating as a validating resolver, NATIVE_PKCS11 should not be used, because the HSM will be used for all crypto, including DNSSEC validations, and the HSM is likely to be slower than the CPU for this purpose. Additionally, the HSM might not support all of the PKCS#11 API functions needed for signature verification. - GOST -If using a chrooted instance of BIND on FreeBSD 8.x and 9.x, -the OpenSSL engines MUST be accessible from within the chroot. -If BIND is chrooted in /var/named, this can be achieved by -either copying content of /usr/local/lib/engines into -/var/named/usr/local/lib/engines, or by creating that directory -and adding this line to /etc/fstab: -/usr/local/lib/engines /var/named/usr/local/lib/engines nullfs ro 0 0 - - START_LATE Most of the time, BIND needs to start early in the boot process. Enable this if BIND starts too early for you and you need it to start later. Index: head/dns/bind99/Makefile =================================================================== --- head/dns/bind99/Makefile (revision 438944) +++ head/dns/bind99/Makefile (revision 438945) @@ -1,223 +1,221 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.9-P8 +ISCVERSION= 9.9.10 USES= cpe libedit CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif LIB_DEPENDS= libxml2.so:textproc/libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind-tools bind9-devel bind910 bind911 SUB_FILES= pkg-message named.conf +USE_RC_SUBR= named +MAKE_JOBS_UNSAFE= yes + +PORTDOCS= * + OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL DLZ_FILESYSTEM \ RPZ_NSIP RPZ_NSDNAME OPTIONS_DEFINE= SSL IDN LARGE_FILE FIXED_RRSET SIGCHASE \ IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \ RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS \ PORTREVISION FETCHLIMIT QUERYTRACE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes -SSL_DESC= Build with OpenSSL (Required for DNSSEC) -LARGE_FILE_DESC= 64-bit file support -FIXED_RRSET_DESC= Enable fixed rrset ordering -SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation -FILTER_AAAA_DESC= Enable filtering of AAAA records -GOST_DESC= Enable GOST ciphers, needs SSL (see help on 8 and 9) -PYTHON_DESC= Build with Python utilities -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 - -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) DLZ_BDB_DESC= DLZ BDB driver -DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver +DLZ_LDAP_DESC= DLZ LDAP driver +DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) +DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver +FETCHLIMIT_DESC= Enable the query quotas for resolvers +FILTER_AAAA_DESC= Enable filtering of AAAA records +FIXED_RRSET_DESC= Enable fixed rrset ordering +GOST_DESC= Enable GOST ciphers, needs SSL GSSAPI_BASE_DESC= ${GSSAPI_DESC} (Heimdal in base) GSSAPI_HEIMDAL_DESC= ${GSSAPI_DESC} (security/heimdal) GSSAPI_MIT_DESC= ${GSSAPI_DESC} (security/krb5) GSSAPI_NONE_DESC= No ${GSSAPI_DESC} -MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit -QUERYTRACE_CONFIGURE_ENABLE= querytrace +LARGE_FILE_DESC= 64-bit file support +MINCACHE_DESC= Use the mincachettl patch +NEWSTATS_DESC= Enable alternate xml statistics channel format +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 +RRL_DESC= Response Rate Limiting +SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +SSL_DESC= Build with OpenSSL (Required for DNSSEC) +START_LATE_DESC= Start BIND late in the boot process (see help) -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -SSL_USES= ssl -SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes +DLZ_BDB_USES= bdb -NEWSTATS_CONFIGURE_ENABLE= newstats +DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes -IDN_USES= iconv -IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} -IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit -IDN_CONFIGURE_OFF= --without-idn +DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes +DLZ_LDAP_USE= openldap=yes -LARGE_FILE_CONFIGURE_ENABLE= largefile +DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes +DLZ_MYSQL_PREVENTS= THREADS +DLZ_MYSQL_USES= mysql -SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" +DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes +DLZ_POSTGRESQL_USES= pgsql -IPV6_CONFIGURE_ENABLE= ipv6 +DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes +FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit + FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa +FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset + GOST_CONFIGURE_WITH= gost -PYTHON_CONFIGURE_WITH= python -PYTHON_USES= python +GSSAPI_BASE_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_USES= gssapi -DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes -DLZ_POSTGRESQL_USES= pgsql +GSSAPI_HEIMDAL_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_USES= gssapi:heimdal -FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset +GSSAPI_MIT_CONFIGURE_ON= \ + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_USES= gssapi:mit -RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname +IDN_CONFIGURE_OFF= --without-idn +IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} +IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit +IDN_USES= iconv -RRL_CONFIGURE_ENABLE= rrl +IPV6_CONFIGURE_ENABLE= ipv6 -DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes -DLZ_MYSQL_USES= mysql +LARGE_FILE_CONFIGURE_ENABLE= largefile -DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes -DLZ_BDB_USES= bdb +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes -DLZ_LDAP_USE= openldap=yes +NEWSTATS_CONFIGURE_ENABLE= newstats -DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes +PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} +PYTHON_USES= python -DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes +QUERYTRACE_CONFIGURE_ENABLE= querytrace -START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ - NAMED_BEFORE="LOGIN" -START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ - NAMED_BEFORE="SERVERS" +RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip -.include +RRL_CONFIGURE_ENABLE= rrl -.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif +SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" -USE_RC_SUBR= named +SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl +SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +SSL_USES= ssl -MAKE_JOBS_UNSAFE= yes +START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ + NAMED_BEFORE="LOGIN" +START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ + NAMED_BEFORE="SERVERS" -PORTDOCS= * +THREADS_CONFIGURE_ENABLE= threads .include .if ( ${PORT_OPTIONS:MGOST} ) && ${SSL_DEFAULT} == base BROKEN= OpenSSL from the base system does not support GOST, add \ DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \ that needs SSL. .endif post-patch: - @${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \ - s|readline/history.h|histedit.h|' \ - ${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} .endfor .if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version .endif post-configure: @${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath,/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif - -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} .for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i .endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree -.endif ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm + ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ + ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +# Can't use USE_PYTHON=autoplist +post-install-PYTHON-on: + @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind99/distinfo =================================================================== --- head/dns/bind99/distinfo (revision 438944) +++ head/dns/bind99/distinfo (revision 438945) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492055014 -SHA256 (bind-9.9.9-P8.tar.gz) = ffddfcad820200d287b6063694116f88bb48838b250fe383f135136f1c31b1b8 -SIZE (bind-9.9.9-P8.tar.gz) = 8790853 +TIMESTAMP = 1492688489 +SHA256 (bind-9.9.10.tar.gz) = 7deabe932b11149ebce7bf96abe114479c3c52e0081a29d00877125f55ae562a +SIZE (bind-9.9.10.tar.gz) = 8857543 Index: head/dns/bind99/files/extrapatch-bind-min-override-ttl =================================================================== --- head/dns/bind99/files/extrapatch-bind-min-override-ttl (revision 438944) +++ head/dns/bind99/files/extrapatch-bind-min-override-ttl (revision 438945) @@ -1,73 +1,73 @@ ---- bin/named/config.c.orig 2016-12-11 22:02:39 UTC +--- bin/named/config.c.orig 2017-04-14 03:50:56 UTC +++ bin/named/config.c @@ -141,6 +141,8 @@ options {\n\ min-roots 2;\n\ lame-ttl 600;\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 2017-01-11 11:22:46 UTC +--- bin/named/server.c.orig 2017-04-14 03:50:56 UTC +++ bin/named/server.c -@@ -2683,6 +2683,16 @@ configure_view(dns_view_t *view, cfg_obj +@@ -2647,6 +2647,16 @@ configure_view(dns_view_t *view, cfg_obj } obj = NULL; + result = ns_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; + result = ns_config_get(maps, "min-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->mincachettl = cfg_obj_asuint32(obj); + + obj = NULL; 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 2017-01-11 11:22:46 UTC +--- lib/dns/include/dns/view.h.orig 2017-04-14 03:50:56 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,8 @@ struct dns_view { isc_boolean_t provideixfr; isc_boolean_t requestnsid; dns_ttl_t maxcachettl; + dns_ttl_t mincachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; in_port_t dstport; dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2016-12-11 22:02:39 UTC +--- lib/dns/resolver.c.orig 2017-04-14 03:50:56 UTC +++ lib/dns/resolver.c -@@ -5116,6 +5116,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5117,6 +5117,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* + * Enforce the configure minimum cache TTL. + */ + if (rdataset->ttl < res->view->mincachettl) + rdataset->ttl = res->view->mincachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-01-11 11:22:46 UTC +--- lib/isccfg/namedconf.c.orig 2017-04-14 03:50:56 UTC +++ lib/isccfg/namedconf.c -@@ -1464,6 +1464,8 @@ view_clauses[] = { +@@ -1475,6 +1475,8 @@ view_clauses[] = { { "lame-ttl", &cfg_type_uint32, 0 }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizenodefault, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, { "max-cache-ttl", &cfg_type_uint32, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_uint32, 0 }, Index: head/dns/bind99/files/named.conf.in =================================================================== --- head/dns/bind99/files/named.conf.in (revision 438944) +++ head/dns/bind99/files/named.conf.in (revision 438945) @@ -1,360 +1,388 @@ // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/local/share/doc/bind for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. options { // All file and path names are relative to the chroot directory, // if any, and should be fully qualified. directory "%%ETCDIR%%/working"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. listen-on { 127.0.0.1; }; // If you have IPv6 enabled on this system, uncomment this option for // use as a local resolver. To give access to the network, specify // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; // These zones are already covered by the empty zones listed below. // If you remove the related empty zones below, comment these lines out. disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you // benefit from its cache, thus reduce overall DNS traffic in the Internet. /* forwarders { 127.0.0.1; }; */ // If the 'forwarders' clause is not empty the default is to 'forward first' // which will fall back to sending a query from your local server if the name // servers in 'forwarders' do not have the answer. Alternatively you can // force your name server to never initiate queries of its own by enabling the // following line: // forward only; // If you wish to have forwarding configured automatically based on // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). // include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing query by default in order to dramatically reduce the possibility of cache poisoning. All users are strongly encouraged to utilize this feature, and to configure their firewalls to accommodate it. AS A LAST RESORT in order to get around a restrictive firewall policy you can try enabling the option below. Use of this option will significantly reduce your ability to withstand cache poisoning attacks, and should be avoided if at all possible. Replace NNNNN in the example with a number between 49160 and 65530. */ // query-source address * port NNNNN; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. zone "." { type hint; file "%%ETCDIR%%/named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots 3. Greater resilience to any potential root server failure/DDoS On the other hand, this method requires more monitoring than the hints file to be sure that an unexpected failure mode has not incapacitated your server. Name servers that are serving a lot of clients will benefit more from this approach than individual hosts. Use with caution. To use this mechanism, uncomment the entries below, and comment the hint zone above. As documented at http://dns.icann.org/services/axfr/ these zones: - "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others are available for AXFR from these servers on IPv4 and IPv6: xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { type slave; file "%%ETCDIR%%/slave/root.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; zone "arpa" { type slave; file "%%ETCDIR%%/slave/arpa.slave"; masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org }; notify no; }; +zone "in-addr.arpa" { + type slave; + file "%%ETCDIR%%/slave/in-addr.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} +zone "ip6.arpa" { + type slave; + file "%%ETCDIR%%/slave/ip6.arpa.slave"; + masters { + 192.0.32.132; // lax.xfr.dns.icann.org + 2620:0:2d0:202::132; // lax.xfr.dns.icann.org + 192.0.47.132; // iad.xfr.dns.icann.org + 2620:0:2830:202::132; // iad.xfr.dns.icann.org + }; + notify no; +} */ /* Serving the following zones locally will prevent any queries for these zones leaving your network and going to the root name servers. This has two significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots */ // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // RFC 1912-style zone for IPv6 localhost address (RFC 6303) zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; // "This" Network (RFCs 1912, 5735 and 6303) zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Private Use Networks (RFCs 1918, 5735 and 6303) zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Shared Address Space (RFC 6598) zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Link-local/APIPA (RFCs 3927, 5735 and 6303) zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IETF protocol assignments (RFCs 5735 and 5736) zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Example Range for Documentation (RFCs 3849 and 6303) zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Router Benchmark Testing (RFCs 2544 and 5735) zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IANA Reserved - Old Class E Space (RFC 5735) zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Unassigned Addresses (RFC 4291) zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 ULA (RFCs 4193 and 6303) zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Link Local (RFCs 4291 and 6303) zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IP6.INT is Deprecated (RFC 4159) zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! // // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible // master name server. // // Do not forget to include the reverse lookup zone! // This is named after the first bytes of the IP address, in reverse // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // // Before starting to set up a master zone, make sure you fully // understand how DNS and BIND work. There are sometimes // non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. /* An example dynamic zone key "exampleorgkey" { algorithm hmac-md5; secret "sf87HJqjkqh8ac87a02lla=="; }; zone "example.org" { type master; allow-update { key "exampleorgkey"; }; file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; }; */ Index: head/dns/bind99/files/named.root =================================================================== --- head/dns/bind99/files/named.root (revision 438944) +++ head/dns/bind99/files/named.root (revision 438945) @@ -1,94 +1,96 @@ ; ; $FreeBSD$ ; ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: March 23, 2016 -; related version of root zone: 2016032301 +; last update: April 11, 2017 +; related version of root zone: 2017041101 ; ; formerly NS.INTERNIC.NET ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b ; ; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 ; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 ; End of file Index: head/dns/bind99/files/patch-configure =================================================================== --- head/dns/bind99/files/patch-configure (revision 438944) +++ head/dns/bind99/files/patch-configure (revision 438945) @@ -1,90 +1,90 @@ ---- configure.orig 2016-04-20 20:11:30 UTC +--- configure.orig 2017-04-14 03:50:56 UTC +++ configure -@@ -14329,27 +14329,9 @@ done +@@ -14508,27 +14508,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ - "-lgssapi_krb5" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do - # Note that this does not include $saved_libs, because - # on FreeBSD machines this configure script has added - # -L/usr/local/lib to LIBS, which can make the - # -lgssapi_krb5 test succeed with shared libraries even - # when you are trying to build with KTH in /usr/lib. -- if test "$use_gssapi" = "/usr" +- if test "/usr" = "$use_gssapi" - then - LIBS="$TRY_LIBS" - else - LIBS="-L$use_gssapi/lib $TRY_LIBS" - fi + LIBS="$TRY_LIBS" { $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 -@@ -14392,47 +14374,7 @@ $as_echo "no" >&6; } ;; +@@ -14571,47 +14553,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac - # - # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib - # but MIT in /usr/local/lib and trying to build with KTH. - # /usr/local/lib can end up earlier on the link lines. - # Like most kludges, this one is not only inelegant it - # is also likely to be the wrong thing to do at least as - # many times as it is the right thing. Something better - # needs to be done. - # -- if test "$use_gssapi" = "/usr" -a \ +- if test "/usr" = "$use_gssapi" -a \ - -f /usr/local/lib/libkrb5.a; then - FIX_KTH_VS_MIT=yes - fi - - case "$FIX_KTH_VS_MIT" in - yes) - case "$enable_static_linking" in - yes) gssapi_lib_suffix=".a" ;; - *) gssapi_lib_suffix=".so" ;; - esac - - for lib in $LIBS; do - case $lib in - -L*) - ;; - -l*) - new_lib=`echo $lib | - sed -e s%^-l%$use_gssapi/lib/lib% \ - -e s%$%$gssapi_lib_suffix%` - NEW_LIBS="$NEW_LIBS $new_lib" - ;; - *) - as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 - ;; - esac - done - LIBS="$NEW_LIBS" - ;; - esac - - DST_GSSAPI_INC="-I$use_gssapi/include" + DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -20477,7 +20419,7 @@ $as_echo "" >&6; } +@@ -20735,7 +20677,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). - bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" + bdb_incdirs="/db6 /db5 /db48" # include a blank element first for d in "" $bdb_incdirs do Index: head/dns/bind99/pkg-help =================================================================== --- head/dns/bind99/pkg-help (revision 438944) +++ head/dns/bind99/pkg-help (revision 438945) @@ -1,14 +1,4 @@ - GOST -If using a chrooted instance of BIND on FreeBSD 8.x and 9.x, -the OpenSSL engines MUST be accessible from within the chroot. -If BIND is chrooted in /var/named, this can be achieved by -either copying content of /usr/local/lib/engines into -/var/named/usr/local/lib/engines, or by creating that directory -and adding this line to /etc/fstab: -/usr/local/lib/engines /var/named/usr/local/lib/engines nullfs ro 0 0 - - START_LATE Most of the time, BIND needs to start early in the boot process. Enable this if BIND starts too early for you and you need it to start later. Index: head/dns/bind99/pkg-plist =================================================================== --- head/dns/bind99/pkg-plist (revision 438944) +++ head/dns/bind99/pkg-plist (revision 438945) @@ -1,390 +1,391 @@ +bin/arpaname bin/bind9-config bin/dig bin/host bin/isc-config.sh bin/nslookup bin/nsupdate etc/mtree/BIND.chroot.dist etc/mtree/BIND.chroot.local.dist %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db %%ETCDIR%%/master/localhost-reverse.db @sample %%ETCDIR%%/named.conf.sample %%ETCDIR%%/named.root %%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h include/dns/acache.h include/dns/acl.h include/dns/adb.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h include/dns/dbtable.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h include/dns/ds.h include/dns/ecdb.h include/dns/enumclass.h include/dns/enumtype.h include/dns/events.h include/dns/fixedname.h include/dns/forward.h include/dns/iptable.h include/dns/journal.h include/dns/keydata.h include/dns/keyflags.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h include/dns/log.h include/dns/lookup.h include/dns/master.h include/dns/masterdump.h include/dns/message.h include/dns/name.h include/dns/ncache.h include/dns/nsec.h include/dns/nsec3.h include/dns/opcode.h include/dns/order.h include/dns/peer.h include/dns/portlist.h include/dns/private.h include/dns/rbt.h include/dns/rcode.h include/dns/rdata.h include/dns/rdataclass.h include/dns/rdatalist.h include/dns/rdataset.h include/dns/rdatasetiter.h include/dns/rdataslab.h include/dns/rdatastruct.h include/dns/rdatatype.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h include/dns/rpz.h include/dns/rriterator.h include/dns/rrl.h include/dns/sdb.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/tcpmsg.h include/dns/time.h include/dns/timer.h include/dns/tkey.h include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h include/dns/update.h include/dns/validator.h include/dns/version.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h include/dst/lib.h include/dst/result.h include/isc/app.h include/isc/assertions.h include/isc/atomic.h include/isc/backtrace.h include/isc/base32.h include/isc/base64.h include/isc/bind9.h include/isc/bitstring.h include/isc/boolean.h include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h include/isc/counter.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 include/isc/file.h include/isc/formatcheck.h include/isc/fsaccess.h include/isc/hash.h include/isc/heap.h include/isc/hex.h include/isc/hmacmd5.h include/isc/hmacsha.h include/isc/httpd.h include/isc/int.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/keyboard.h include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h include/isc/list.h include/isc/log.h include/isc/magic.h include/isc/md5.h include/isc/mem.h include/isc/msgcat.h include/isc/msgs.h include/isc/mutex.h include/isc/mutexblock.h include/isc/namespace.h include/isc/net.h include/isc/netaddr.h include/isc/netdb.h include/isc/netscope.h include/isc/offset.h include/isc/once.h include/isc/ondestroy.h include/isc/os.h include/isc/parseint.h include/isc/platform.h include/isc/pool.h include/isc/portset.h include/isc/print.h include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h include/isc/ratelimiter.h include/isc/refcount.h include/isc/regex.h include/isc/region.h include/isc/resource.h include/isc/result.h include/isc/resultclass.h include/isc/rwlock.h include/isc/safe.h include/isc/serial.h include/isc/sha1.h include/isc/sha2.h include/isc/sockaddr.h include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdio.h include/isc/stdlib.h include/isc/stdtime.h include/isc/strerror.h include/isc/string.h include/isc/symtab.h include/isc/syslog.h include/isc/task.h include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h include/isc/util.h include/isc/version.h include/isc/xml.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h include/isccc/ccmsg.h include/isccc/events.h include/isccc/lib.h include/isccc/result.h include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/dnsconf.h include/isccfg/grammar.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h include/lwres/context.h include/lwres/int.h include/lwres/ipv6.h include/lwres/lang.h include/lwres/list.h include/lwres/lwbuffer.h include/lwres/lwpacket.h include/lwres/lwres.h include/lwres/net.h include/lwres/netdb.h include/lwres/platform.h include/lwres/result.h include/lwres/stdlib.h include/lwres/string.h include/lwres/version.h lib/libbind9.a lib/libdns.a lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/liblwres.a man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/dig.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz man/man3/lwres.3.gz man/man3/lwres_addr_parse.3.gz man/man3/lwres_buffer.3.gz man/man3/lwres_buffer_add.3.gz man/man3/lwres_buffer_back.3.gz man/man3/lwres_buffer_clear.3.gz man/man3/lwres_buffer_first.3.gz man/man3/lwres_buffer_forward.3.gz man/man3/lwres_buffer_getmem.3.gz man/man3/lwres_buffer_getuint16.3.gz man/man3/lwres_buffer_getuint32.3.gz man/man3/lwres_buffer_getuint8.3.gz man/man3/lwres_buffer_init.3.gz man/man3/lwres_buffer_invalidate.3.gz man/man3/lwres_buffer_putmem.3.gz man/man3/lwres_buffer_putuint16.3.gz man/man3/lwres_buffer_putuint32.3.gz man/man3/lwres_buffer_putuint8.3.gz man/man3/lwres_buffer_subtract.3.gz man/man3/lwres_conf_clear.3.gz man/man3/lwres_conf_get.3.gz man/man3/lwres_conf_init.3.gz man/man3/lwres_conf_parse.3.gz man/man3/lwres_conf_print.3.gz man/man3/lwres_config.3.gz man/man3/lwres_context.3.gz man/man3/lwres_context_allocmem.3.gz man/man3/lwres_context_create.3.gz man/man3/lwres_context_destroy.3.gz man/man3/lwres_context_freemem.3.gz man/man3/lwres_context_initserial.3.gz man/man3/lwres_context_nextserial.3.gz man/man3/lwres_context_sendrecv.3.gz man/man3/lwres_endhostent.3.gz man/man3/lwres_endhostent_r.3.gz man/man3/lwres_freeaddrinfo.3.gz man/man3/lwres_freehostent.3.gz man/man3/lwres_gabn.3.gz man/man3/lwres_gabnrequest_free.3.gz man/man3/lwres_gabnrequest_parse.3.gz man/man3/lwres_gabnrequest_render.3.gz man/man3/lwres_gabnresponse_free.3.gz man/man3/lwres_gabnresponse_parse.3.gz man/man3/lwres_gabnresponse_render.3.gz man/man3/lwres_gai_strerror.3.gz man/man3/lwres_getaddrinfo.3.gz man/man3/lwres_getaddrsbyname.3.gz man/man3/lwres_gethostbyaddr.3.gz man/man3/lwres_gethostbyaddr_r.3.gz man/man3/lwres_gethostbyname.3.gz man/man3/lwres_gethostbyname2.3.gz man/man3/lwres_gethostbyname_r.3.gz man/man3/lwres_gethostent.3.gz man/man3/lwres_gethostent_r.3.gz man/man3/lwres_getipnode.3.gz man/man3/lwres_getipnodebyaddr.3.gz man/man3/lwres_getipnodebyname.3.gz man/man3/lwres_getnamebyaddr.3.gz man/man3/lwres_getnameinfo.3.gz man/man3/lwres_getrrsetbyname.3.gz man/man3/lwres_gnba.3.gz man/man3/lwres_gnbarequest_free.3.gz man/man3/lwres_gnbarequest_parse.3.gz man/man3/lwres_gnbarequest_render.3.gz man/man3/lwres_gnbaresponse_free.3.gz man/man3/lwres_gnbaresponse_parse.3.gz man/man3/lwres_gnbaresponse_render.3.gz man/man3/lwres_herror.3.gz man/man3/lwres_hstrerror.3.gz man/man3/lwres_inetntop.3.gz man/man3/lwres_lwpacket_parseheader.3.gz man/man3/lwres_lwpacket_renderheader.3.gz man/man3/lwres_net_ntop.3.gz man/man3/lwres_noop.3.gz man/man3/lwres_nooprequest_free.3.gz man/man3/lwres_nooprequest_parse.3.gz man/man3/lwres_nooprequest_render.3.gz man/man3/lwres_noopresponse_free.3.gz man/man3/lwres_noopresponse_parse.3.gz man/man3/lwres_noopresponse_render.3.gz man/man3/lwres_packet.3.gz man/man3/lwres_resutil.3.gz man/man3/lwres_sethostent.3.gz man/man3/lwres_sethostent_r.3.gz man/man3/lwres_string_parse.3.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz %%PYTHON%%man/man8/dnssec-checkds.8.gz %%PYTHON%%man/man8/dnssec-coverage.8.gz man/man8/dnssec-dsfromkey.8.gz man/man8/dnssec-importkey.8.gz man/man8/dnssec-keyfromlabel.8.gz man/man8/dnssec-keygen.8.gz man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz man/man8/dnssec-verify.8.gz man/man8/genrandom.8.gz man/man8/isc-hmac-fixup.8.gz man/man8/lwresd.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz man/man8/named-journalprint.8.gz man/man8/named.8.gz man/man8/nsec3hash.8.gz man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz -sbin/arpaname sbin/ddns-confgen %%PYTHON%%sbin/dnssec-checkds %%PYTHON%%sbin/dnssec-coverage sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen sbin/dnssec-revoke sbin/dnssec-settime sbin/dnssec-signzone sbin/dnssec-verify sbin/genrandom sbin/isc-hmac-fixup sbin/lwresd sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir %%ETCDIR%%/master @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working