Date: Wed, 31 Aug 2016 11:59:05 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421152 - in head/dns: bind9-devel bind910 bind911 bind99 Message-ID: <201608311159.u7VBx52P098686@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 31 11:59:05 2016 New Revision: 421152 URL: https://svnweb.freebsd.org/changeset/ports/421152 Log: The NEWSTATS and RRL options were removed in BIND9 9.10, so remove them from here, also, make the upstream default options default for real. While there, put back the BIND_TOOLS knobs in bind9-devel. Sponsored by: Absolight Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/pkg-plist (contents, props changed) head/dns/bind910/Makefile (contents, props changed) head/dns/bind911/Makefile (contents, props changed) head/dns/bind99/Makefile (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Wed Aug 31 11:58:51 2016 (r421151) +++ head/dns/bind9-devel/Makefile Wed Aug 31 11:59:05 2016 (r421152) @@ -2,16 +2,30 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/} +PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} +.if defined(BIND_TOOLS_SLAVE) +# dns/bind-tools here PORTREVISION= 0 +.else +# dns/bind9xx here +PORTREVISION= 1 +.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 @@ -39,11 +53,16 @@ CONFIGURE_ARGS+= --localstatedir=/var -- --with-readline=-ledit \ --with-dlopen=yes \ --sysconfdir=${ETCDIR} +.if defined(BIND_TOOLS_SLAVE) +CONFIGURE_ARGS+= --disable-shared +.endif ETCDIR= ${PREFIX}/etc/namedb CONFLICTS+= bind9*-9.[456789].* bind910-* bind911-* bind9*-sdb-9.[456789].* +.if !defined(BIND_TOOLS_SLAVE) SUB_FILES= pkg-message +.endif OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE OPTIONS_DEFINE= IDN LARGE_FILE PYTHON START_LATE \ @@ -52,12 +71,14 @@ OPTIONS_RADIO= CRYPTO GOSTDEF OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 -OPTIONS_DEFAULT+= RRL DLZ_FILESYSTEM LMDB -OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP \ - MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE LMDB +.if !defined(BIND_TOOLS_SLAVE) +OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP +OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ + MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +.endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE @@ -78,15 +99,13 @@ PYTHON_DESC= Build with Python utilitie START_LATE_DESC= Start BIND late in the boot process MINCACHE_DESC= Use the mincachettl patch PORTREVISION_DESC= Show PORTREVISION in the version string -FETCHLIMIT_DESC= Enable the query quotas for resolvers QUERYTRACE_DESC= Enable the very verbose query tracelogging LMDB_DESC= Use LMDB for zone management +DNSTAP_DESC= Provides fast passive logging of DNS messages LINKS_DESC= Create conf file symlinks in ${PREFIX} -NEWSTATS_DESC= Enable alternate xml statistics channel format RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records -RRL_DESC= Response Rate Limiting DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -98,9 +117,12 @@ GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable -MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit -QUERYTRACE_CONFIGURE_ENABLE= querytrace + +.if defined(BIND_TOOLS_SLAVE) +CONFLICTS+= bind910-9.10.* +.else +CONFLICTS+= bind-tools-9.* +.endif # BIND_TOOLS_SLAVE SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl @@ -109,8 +131,6 @@ SSL_CONFIGURE_OFF= --disable-openssl-ver LMDB_CONFIGURE_WITH= lmdb LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -NEWSTATS_CONFIGURE_ENABLE= newstats - IDN_USES= iconv IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit @@ -146,8 +166,6 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RRL_CONFIGURE_ENABLE= rrl - DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql @@ -177,6 +195,14 @@ GSSAPI_MIT_CONFIGURE_ON= \ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl + +QUERYTRACE_CONFIGURE_ENABLE= querytrace + +DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c + .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1} @@ -197,8 +223,10 @@ CONFIGURE_ARGS+= --disable-threads 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="" @@ -226,6 +254,16 @@ 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 = delv dig dnssec 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' \ @@ -233,7 +271,9 @@ post-patch: -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}#' \ @@ -269,5 +309,6 @@ post-install: # 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 <bsd.port.post.mk> Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind9-devel/pkg-plist Wed Aug 31 11:58:51 2016 (r421151) +++ head/dns/bind9-devel/pkg-plist Wed Aug 31 11:59:05 2016 (r421152) @@ -2,6 +2,7 @@ bin/arpaname bin/bind9-config bin/delv bin/dig +%%DNSTAP%%bin/dnstap-read bin/host bin/isc-config.sh bin/mdig @@ -34,6 +35,7 @@ include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h include/dns/dnstap.h +%%DNSTAP%%include/dns/dnstap.pb-c.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h @@ -274,6 +276,7 @@ man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz man/man1/dig.1.gz +%%DNSTAP%%man/man1/dnstap-read.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/mdig.1.gz Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Wed Aug 31 11:58:51 2016 (r421151) +++ head/dns/bind910/Makefile Wed Aug 31 11:59:05 2016 (r421152) @@ -2,13 +2,13 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/} +PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 .else -# dns/bind910 here -PORTREVISION= 0 +# dns/bind9xx here +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -70,8 +70,8 @@ OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1 .if !defined(BIND_TOOLS_SLAVE) -OPTIONS_DEFAULT+= RRL DLZ_FILESYSTEM -OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS NEWSTATS GEOIP \ +OPTIONS_DEFAULT+= DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME +OPTIONS_DEFINE+= LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ @@ -101,10 +101,8 @@ FETCHLIMIT_DESC= Enable the query quotas 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 -RRL_DESC= Response Rate Limiting DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) @@ -130,8 +128,6 @@ SSL_CONFIGURE_ON= --with-openssl=${OPENS 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 @@ -165,8 +161,6 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RRL_CONFIGURE_ENABLE= rrl - DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Aug 31 11:58:51 2016 (r421151) +++ head/dns/bind911/Makefile Wed Aug 31 11:59:05 2016 (r421152) @@ -7,7 +7,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b # dns/bind-tools here PORTREVISION= 0 .else -# dns/bind910 here +# dns/bind9xx here PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Aug 31 11:58:51 2016 (r421151) +++ head/dns/bind99/Makefile Wed Aug 31 11:59:05 2016 (r421152) @@ -2,8 +2,8 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/} -PORTREVISION= 0 +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 @@ -43,7 +43,8 @@ CONFLICTS= bind9*-9.[45678].* bind9*-sdb SUB_FILES= pkg-message -OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE RRL DLZ_FILESYSTEM +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 \ IPV6 THREADS FILTER_AAAA GOST PYTHON START_LATE MINCACHE \ LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608311159.u7VBx52P098686>