Index: branches/2017Q1/dns/bind910/pkg-install =================================================================== --- branches/2017Q1/dns/bind910/pkg-install (revision 431234) +++ branches/2017Q1/dns/bind910/pkg-install (nonexistent) @@ -1,32 +0,0 @@ -#!/bin/sh -# ex:sw=8 sts=8 - -if [ "$2" = 'POST-INSTALL' ] -then - /bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb -fi - -for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do - for FILE in named.conf rndc.conf rndc.key; do - if [ "$2" = 'POST-INSTALL' ] - then - if [ -e ${PKG_PREFIX}/etc/${FILE} ] - then - /bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE} - else - /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE} - fi - fi - if [ "$2" = 'POST-DEINSTALL' ] - then - [ -L ${DIR}/${FILE} ] && rm -f ${DIR}/${FILE} - fi - done -done - -if [ "$2" = 'POST-DEINSTALL' ] -then - cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null 2>&1 || : -fi - -exit 0 Property changes on: branches/2017Q1/dns/bind910/pkg-install ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/dns/bind910/Makefile =================================================================== --- branches/2017Q1/dns/bind910/Makefile (revision 431234) +++ branches/2017Q1/dns/bind910/Makefile (revision 431235) @@ -1,252 +1,237 @@ # $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 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 # ISC releases things like 9.8.0-P1, which our versioning doesn't like ISCVERSION= 9.10.4-P5 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 bind99 bind911 bind9-devel -SUB_FILES= pkg-message +SUB_FILES= pkg-message named.conf 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 \ - LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + 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 -LINKS_DESC= Create conf file symlinks in ${PREFIX} 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_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver 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 SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl IDN_USES= iconv IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit IDN_CONFIGURE_OFF= --without-idn LARGE_FILE_CONFIGURE_ENABLE= largefile SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ENABLE= ipv6 FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 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_CONFIGURE_ON= --with-gost GOST_ASN1_CONFIGURE_ON= --with-gost=asn1 PYTHON_CONFIGURE_WITH= python PYTHON_USES= python DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=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" 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 .include .if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} CONFIGURE_ARGS+= --without-gost .endif -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" -.endif - -PKGDEINSTALL= ${PKGINSTALL} +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 .include Index: branches/2017Q1/dns/bind910/files/pkg-message.in =================================================================== --- branches/2017Q1/dns/bind910/files/pkg-message.in (revision 431234) +++ branches/2017Q1/dns/bind910/files/pkg-message.in (revision 431235) @@ -1,22 +1,15 @@ ********************************************************************** * _ _____ _____ _____ _ _ _____ ___ ___ _ _ * * / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * * / _ \ | | | | | _| | \| | | | | | | | | \| | * * / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * * /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * * * * BIND requires configuration of rndc, including a "secret" key. * * The easiest, and most secure way to configure rndc is to run * * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Index: branches/2017Q1/dns/bind910/pkg-plist =================================================================== --- branches/2017Q1/dns/bind910/pkg-plist (revision 431234) +++ branches/2017Q1/dns/bind910/pkg-plist (revision 431235) @@ -1,423 +1,423 @@ bin/bind9-config bin/delv 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/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/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/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 -man/man8/tsig-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz +man/man8/tsig-keygen.8.gz sbin/arpaname sbin/ddns-confgen %%PYTHON%%sbin/dnssec-checkds %%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 -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working Index: branches/2017Q1/dns/bind911/pkg-install =================================================================== --- branches/2017Q1/dns/bind911/pkg-install (revision 431234) +++ branches/2017Q1/dns/bind911/pkg-install (nonexistent) @@ -1,32 +0,0 @@ -#!/bin/sh -# ex:sw=8 sts=8 - -if [ "$2" = 'POST-INSTALL' ] -then - /bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb -fi - -for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do - for FILE in named.conf rndc.conf rndc.key; do - if [ "$2" = 'POST-INSTALL' ] - then - if [ -e ${PKG_PREFIX}/etc/${FILE} ] - then - /bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE} - else - /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE} - fi - fi - if [ "$2" = 'POST-DEINSTALL' ] - then - [ -L ${DIR}/${FILE} ] && rm -f ${DIR}/${FILE} - fi - done -done - -if [ "$2" = 'POST-DEINSTALL' ] -then - cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null 2>&1 || : -fi - -exit 0 Property changes on: branches/2017Q1/dns/bind911/pkg-install ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/dns/bind911/Makefile =================================================================== --- branches/2017Q1/dns/bind911/Makefile (revision 431234) +++ branches/2017Q1/dns/bind911/Makefile (revision 431235) @@ -1,310 +1,295 @@ # $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= 0 +PORTREVISION= 1 .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 # ISC releases things like 9.8.0-P1, which our versioning doesn't like ISCVERSION= 9.11.0-P2 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} .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared .endif ETCDIR= ${PREFIX}/etc/namedb CONFLICTS+= bind99 bind910 bind9-devel .if !defined(BIND_TOOLS_SLAVE) SUB_FILES= pkg-message .endif 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+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ +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 -LINKS_DESC= Create conf file symlinks in ${PREFIX} 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_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable .if defined(BIND_TOOLS_SLAVE) CONFLICTS+= bind911 .else CONFLICTS+= bind-tools .endif # BIND_TOOLS_SLAVE SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb IDN_USES= iconv IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit IDN_CONFIGURE_OFF= --without-idn LARGE_FILE_CONFIGURE_ENABLE= largefile SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ENABLE= ipv6 FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 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_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 DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=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" 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 MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl QUERYTRACE_CONFIGURE_ENABLE= querytrace DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c .include .if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} CONFIGURE_ARGS+= --without-gost .endif -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " .if !defined(BIND_TOOLS_SLAVE) USE_RC_SUBR+= named SUB_FILES+= named.conf -.endif # !defined(BIND_TOOLS_SLAVE) -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" .endif - -PKGDEINSTALL= ${PKGINSTALL} 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 .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 \\#' \ -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} 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 .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: branches/2017Q1/dns/bind911/files/pkg-message.in =================================================================== --- branches/2017Q1/dns/bind911/files/pkg-message.in (revision 431234) +++ branches/2017Q1/dns/bind911/files/pkg-message.in (revision 431235) @@ -1,22 +1,15 @@ ********************************************************************** * _ _____ _____ _____ _ _ _____ ___ ___ _ _ * * / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * * / _ \ | | | | | _| | \| | | | | | | | | \| | * * / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * * /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * * * * BIND requires configuration of rndc, including a "secret" key. * * The easiest, and most secure way to configure rndc is to run * * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Index: branches/2017Q1/dns/bind911/pkg-plist =================================================================== --- branches/2017Q1/dns/bind911/pkg-plist (revision 431234) +++ branches/2017Q1/dns/bind911/pkg-plist (revision 431235) @@ -1,443 +1,443 @@ bin/arpaname bin/bind9-config bin/delv bin/dig %%DNSTAP%%bin/dnstap-read bin/host bin/isc-config.sh bin/mdig 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/badcache.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/catz.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h 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/dnstap.h %%DNSTAP%%include/dns/dnstap.pb-c.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h include/dns/ecdb.h include/dns/edns.h include/dns/enumclass.h include/dns/enumtype.h include/dns/events.h include/dns/fixedname.h include/dns/forward.h include/dns/geoip.h include/dns/ipkeylist.h include/dns/iptable.h include/dns/journal.h include/dns/keydata.h 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/nta.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/ht.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/meminfo.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/pk11/site.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 %%DNSTAP%%man/man1/dnstap-read.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/mdig.1.gz man/man1/named-rrchecker.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz 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 %%PYTHON%%man/man8/dnssec-keymgr.8.gz man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz 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 %%LMDB%%man/man8/named-nzd2nzf.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/ddns-confgen %%PYTHON%%sbin/dnssec-checkds %%PYTHON%%sbin/dnssec-coverage sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen %%PYTHON%%sbin/dnssec-keymgr sbin/dnssec-revoke sbin/dnssec-settime sbin/dnssec-signzone 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 %%LMDB%%sbin/named-nzd2nzf 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 -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working Index: branches/2017Q1/dns/bind99/pkg-install =================================================================== --- branches/2017Q1/dns/bind99/pkg-install (revision 431234) +++ branches/2017Q1/dns/bind99/pkg-install (nonexistent) @@ -1,32 +0,0 @@ -#!/bin/sh -# ex:sw=8 sts=8 - -if [ "$2" = 'POST-INSTALL' ] -then - /bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb -fi - -for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do - for FILE in named.conf rndc.conf rndc.key; do - if [ "$2" = 'POST-INSTALL' ] - then - if [ -e ${PKG_PREFIX}/etc/${FILE} ] - then - /bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE} - else - /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE} - fi - fi - if [ "$2" = 'POST-DEINSTALL' ] - then - [ -L ${DIR}/${FILE} ] && rm -f ${DIR}/${FILE} - fi - done -done - -if [ "$2" = 'POST-DEINSTALL' ] -then - cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null 2>&1 || : -fi - -exit 0 Property changes on: branches/2017Q1/dns/bind99/pkg-install ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/dns/bind99/Makefile =================================================================== --- branches/2017Q1/dns/bind99/Makefile (revision 431234) +++ branches/2017Q1/dns/bind99/Makefile (revision 431235) @@ -1,247 +1,227 @@ # $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 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 # ISC releases things like 9.8.0-P1, which our versioning doesn't like ISCVERSION= 9.9.9-P5 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 +SUB_FILES= pkg-message named.conf OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL DLZ_FILESYSTEM \ RPZ_NSIP RPZ_NSDNAME -OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \ +OPTIONS_DEFINE= SSL IDN LARGE_FILE FIXED_RRSET SIGCHASE \ IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \ - LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \ + RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH 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) -REPLACE_BASE_DESC= EOL, no longer supported 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 -LINKS_DESC= Create conf file symlinks in ${PREFIX} NEWSTATS_DESC= Enable alternate xml statistics channel format RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_PATCH_DESC= RPZ improvements 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_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver 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 SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl NEWSTATS_CONFIGURE_ENABLE= newstats IDN_USES= iconv IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit IDN_CONFIGURE_OFF= --without-idn LARGE_FILE_CONFIGURE_ENABLE= largefile SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ENABLE= ipv6 FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa GOST_CONFIGURE_WITH= gost PYTHON_CONFIGURE_WITH= python PYTHON_USES= python DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname RPZ_PATCH_PATCHFILES= ${ISCVERSION}-rpz2+rl.14038.05.patch.xz:vix RPZ_PATCH_PATCH_SITES= http://ss.vix.su/~vjs/:vix LOCAL/mat/bind:vix RRL_CONFIGURE_ENABLE= rrl DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=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" 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 .include -.if !${PORT_OPTIONS:MLINKS} -PKGINSTALL=${NONEXISTENT} -.endif - .if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if ${PORT_OPTIONS:MREPLACE_BASE} -IGNORE= REPLACE_BASE is no longer supported -.endif # REPLACE_BASE - -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100) -PKGINSTALL= ${NONEXISTENT} -PLIST_SUB+= NOBASE="" BASE="@comment " -SUB_LIST+= NOBASE="" BASE="@comment " -USE_RC_SUBR+= named -SUB_FILES+= named.conf -.else -PLIST_SUB+= NOBASE="@comment " BASE="" -SUB_LIST+= NOBASE="@comment " BASE="" -.endif - -PKGDEINSTALL= ${PKGINSTALL} +USE_RC_SUBR= named MAKE_JOBS_UNSAFE= yes PORTDOCS= * .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 .include Index: branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl =================================================================== --- branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl (revision 431234) +++ branches/2017Q1/dns/bind99/files/extrapatch-bind-min-override-ttl (revision 431235) @@ -1,73 +1,73 @@ ---- bin/named/config.c.orig 2016-10-21 05:12:02 UTC +--- bin/named/config.c.orig 2016-12-11 22:02:39 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 2016-10-21 05:12:02 UTC +--- bin/named/server.c.orig 2017-01-11 11:22:46 UTC +++ bin/named/server.c -@@ -2559,6 +2559,16 @@ configure_view(dns_view_t *view, cfg_obj +@@ -2683,6 +2683,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 2016-10-21 05:12:02 UTC +--- lib/dns/include/dns/view.h.orig 2017-01-11 11:22:46 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-10-21 05:12:02 UTC +--- lib/dns/resolver.c.orig 2016-12-11 22:02:39 UTC +++ lib/dns/resolver.c @@ -5116,6 +5116,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:12:02 UTC +--- lib/isccfg/namedconf.c.orig 2017-01-11 11:22:46 UTC +++ lib/isccfg/namedconf.c -@@ -1459,6 +1459,8 @@ view_clauses[] = { +@@ -1464,6 +1464,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: branches/2017Q1/dns/bind99/files/pkg-message.in =================================================================== --- branches/2017Q1/dns/bind99/files/pkg-message.in (revision 431234) +++ branches/2017Q1/dns/bind99/files/pkg-message.in (revision 431235) @@ -1,22 +1,15 @@ ********************************************************************** * _ _____ _____ _____ _ _ _____ ___ ___ _ _ * * / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | * * / _ \ | | | | | _| | \| | | | | | | | | \| | * * / ___ \| | | | | |___| |\ | | | | | |_| | |\ | * * /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| * * * * BIND requires configuration of rndc, including a "secret" key. * * The easiest, and most secure way to configure rndc is to run * * 'rndc-confgen -a' to generate the proper conf file, with a new * * random key, and appropriate file permissions. * * * -%%NOBASE%%* The %%PREFIX%%/etc/rc.d/named script will do that for you. * -%%BASE%%* The /etc/rc.d/named script in the base will do that for you. * -%%BASE%%* * -%%BASE%%* You will need to make sure that you have the following line * -%%BASE%%* in your /etc/rc.conf in order to have the startup script * -%%BASE%%* run the named version from the port: * -%%BASE%%* * -%%BASE%%* named_program="%%PREFIX%%/sbin/named" * +* The %%PREFIX%%/etc/rc.d/named script will do that for you. * * * ********************************************************************** Index: branches/2017Q1/dns/bind99/pkg-plist =================================================================== --- branches/2017Q1/dns/bind99/pkg-plist (revision 431234) +++ branches/2017Q1/dns/bind99/pkg-plist (revision 431235) @@ -1,390 +1,390 @@ 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/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 -%%ETCDIR%%/rndc.conf.sample -%%ETCDIR%%/bind.keys -%%NOBASE%%etc/mtree/BIND.chroot.dist -%%NOBASE%%etc/mtree/BIND.chroot.local.dist -%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample -%%NOBASE%%%%ETCDIR%%/named.root -%%NOBASE%%%%ETCDIR%%/master/empty.db -%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db -%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic -%%NOBASE%%@dir %%ETCDIR%%/master -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave -%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working +@dir(bind,bind,) %%ETCDIR%%/dynamic +@dir %%ETCDIR%%/master +@dir(bind,bind,) %%ETCDIR%%/slave +@dir(bind,bind,) %%ETCDIR%%/working Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 431234) +++ branches/2017Q1 (revision 431235) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r431233