[Midnightbsd-cvs] mports [17867] trunk/dns/bind99: bind 9.9.6-P1 is a security update and recommended.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Dec 11 07:50:01 EST 2014 

Revision: 17867
          http://svnweb.midnightbsd.org/mports/?rev=17867
Author:   laffer1
Date:     2014-12-11 07:50:00 -0500 (Thu, 11 Dec 2014)
Log Message:
-----------
bind 9.9.6-P1 is a security update and recommended.

Modified Paths:
--------------
    trunk/dns/bind99/Makefile
    trunk/dns/bind99/distinfo
    trunk/dns/bind99/pkg-install
    trunk/dns/bind99/pkg-plist

Modified: trunk/dns/bind99/Makefile
===================================================================
--- trunk/dns/bind99/Makefile	2014-12-08 16:25:05 UTC (rev 17866)
+++ trunk/dns/bind99/Makefile	2014-12-11 12:50:00 UTC (rev 17867)
@@ -1,12 +1,13 @@
 # $MidnightBSD$
+# $FreeBSD: head/dns/bind99/Makefile 374305 2014-12-08 17:29:44Z mat $
 
-PORTNAME?=	bind99
-PORTVERSION=	9.9.5
-PORTREVISION?=	3
+PORTNAME=	bind
+PORTVERSION=	${ISCVERSION:S/-P/P/}
+PORTREVISION=	0
 CATEGORIES=	dns net ipv6
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
-DISTNAME=	bind-${ISCVERSION}
+MASTER_SITES=	ISC/bind9/${ISCVERSION}
+PKGNAMESUFFIX=	99
+DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
@@ -14,11 +15,11 @@
 LICENSE=	iscl
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.9.5-P1
+ISCVERSION=	9.9.6-P1
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		cpe
+USES=	cpe
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -32,32 +33,38 @@
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--without-python \
 		--with-libxml2=${LOCALBASE}
+ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
-OPTIONS_DEFAULT=	IPV6 SSL LINKS THREADS
-OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE \
-			FIXED_RRSET SIGCHASE IPV6 THREADS
-.if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFINE+=	LINKS RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH
+OPTIONS_DEFAULT=	IPV6 SSL THREADS GSSAPI_NONE RRL
+OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
+			IPV6 THREADS FILTER_AAAA GOST PYTHON \
+			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS
 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)
-REPLACE_BASE_DESC=	Replace base BIND with this version
+REPLACE_BASE_DESC=	Replace base BIND (FreeBSD 9.x and earlier)
 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)
+PYTHON_DESC=		Build with Python utilities
 
-.if !defined(BIND_TOOLS_SLAVE)
 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
-RPZRRL_PATCH_DESC=	RPZ improvements + RRL patch (experimental)
+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)
@@ -65,95 +72,80 @@
 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}
 
-CONFLICTS+=		bind-tools-9.*
-.endif	# BIND_TOOLS_SLAVE
+SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+SSL_USE=		openssl=yes
+SSL_CONFIGURE_OFF=	--disable-openssl-version-check --without-openssl
 
-.include <bsd.mport.options.mk>
+NEWSTATS_CONFIGURE_ENABLE=	newstats
 
-.if (${ARCH} == "amd64")
-ARCH=		x86_64
-.endif
+IDN_USES=		iconv
+IDN_CONFIGURE_ON=	--with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
+IDN_LIB_DEPENDS=	libidnkit.so:${PORTSDIR}/dns/idnkit
+IDN_CONFIGURE_OFF=	--without-idn
 
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-USE_OPENSSL=		yes
-.else
-CONFIGURE_ARGS+=	--disable-openssl-version-check
-CONFIGURE_ARGS+=	--without-openssl
-.endif
+LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
-.if ${PORT_OPTIONS:MIDN}
-CONFIGURE_ARGS+=	--with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
-LIB_DEPENDS+=		idnkit.1:${PORTSDIR}/dns/idnkit
-.else
-CONFIGURE_ARGS+=	--without-idn
-.endif
+SIGCHASE_CONFIGURE_ON=	STD_CDEFINES="-DDIG_SIGCHASE=1"
 
-.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
-PLIST_SUB+=	LINKS=""
-.else
-PLIST_SUB+=	LINKS="@comment "
-.endif
+IPV6_CONFIGURE_ENABLE=	ipv6
 
-.if ${PORT_OPTIONS:MLARGE_FILE}
-CONFIGURE_ARGS+=	--enable-largefile
-.endif
+FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 
-.if ${PORT_OPTIONS:MSIGCHASE}
-CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
-.endif
+GOST_CONFIGURE_WITH=	gost
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_USES=	python
 
-.if ${PORT_OPTIONS:MDLZ_POSTGRESQL}
-CONFIGURE_ARGS+=	--with-dlz-postgres=yes
-USE_PGSQL=		yes
-.endif
+DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
+DLZ_POSTGRESQL_USES=		pgsql
 
-.if ${PORT_OPTIONS:MFIXED_RRSET}
-CONFIGURE_ARGS+=	--enable-fixed-rrset
-.endif
+FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
-.if ${PORT_OPTIONS:MRPZ_NSIP}
-CONFIGURE_ARGS+=	--enable-rpz-nsip
-.endif
+RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
 
-.if ${PORT_OPTIONS:MRPZ_NSDNAME}
-CONFIGURE_ARGS+=	--enable-rpz-nsdname
-.endif
+RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
 
-.if ${PORT_OPTIONS:MRPZRRL_PATCH}
-PATCHFILES=		9.9.3-rpz+rl.13208.13-P2.patch
-PATCH_SITES=		http://ss.vix.com/~vjs/
-.endif
+RPZ_PATCH_PATCHFILES=	9.9.6-P1-rpz2+rl.14038.05.patch:vix
+RPZ_PATCH_PATCH_SITES=	http://ss.vix.su/~vjs/:vix ${MASTER_SITE_LOCAL:S/%SUBDIR%/mat\/bind/:S/$/:vix/}
 
-.if ${PORT_OPTIONS:MDLZ_MYSQL}
-CONFIGURE_ARGS+=	--with-dlz-mysql=yes
-USE_MYSQL=		yes
-.endif
+RRL_CONFIGURE_ENABLE=	rrl
 
-.if ${PORT_OPTIONS:MDLZ_BDB}
-CONFIGURE_ARGS+=	--with-dlz-bdb=yes
-USE_BDB=		yes
-.endif
+DLZ_MYSQL_CONFIGURE_ON=	--with-dlz-mysql=yes
+DLZ_MYSQL_USE=		mysql=yes
 
-.if ${PORT_OPTIONS:MDLZ_LDAP}
-CONFIGURE_ARGS+=	--with-dlz-ldap=yes
-USE_OPENLDAP=		yes
-.endif
+DLZ_BDB_CONFIGURE_ON=	--with-dlz-bdb=yes
+DLZ_BDB_USE=		bdb=yes
 
-.if ${PORT_OPTIONS:MDLZ_FILESYSTEM}
-CONFIGURE_ARGS+=	--with-dlz-filesystem=yes
-.endif
+DLZ_LDAP_CONFIGURE_ON=	--with-dlz-ldap=yes
+DLZ_LDAP_USE=		openldap=yes
 
-.if ${PORT_OPTIONS:MDLZ_STUB}
-CONFIGURE_ARGS+=	--with-dlz-stub=yes
+DLZ_FILESYSTEM_CONFIGURE_ON=	--with-dlz-filesystem=yes
+
+DLZ_STUB_CONFIGURE_ON=	--with-dlz-stub=yes
+
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_BASE_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
+
+.include <bsd.mport.options.mk>
+
+.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE}
+PKGINSTALL=${NONEXISTENT}
 .endif
 
-.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL)
+.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
@@ -160,98 +152,61 @@
 .endif
 
 .if ${PORT_OPTIONS:MREPLACE_BASE}
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
+IGNORE=		REPLACE_BASE option is not supported on this release
+.else # >= 10.0
+# Move to BROKEN after expiration.
+DEPRECATED=		REPLACE_BASE option will be removed.  There is no real need for foot-shooting.
+EXPIRATION_DATE=	2015-01-01
+.endif # >= 10.0
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
+PLIST_SUB+=	SHARE_MAN="share/"
+NO_MTREE=	yes
 BIND_DESTETC=	/etc/namedb
+.else # REPLACE_BASE
+PLIST_SUB+=	SHARE_MAN=""
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
+BIND_DESTETC=	${PREFIX}/etc/namedb
+PKGINSTALL=	${NONEXISTENT}
+.else # >= 10.0
+BIND_DESTETC=	${PREFIX}/etc
+.endif # >= 10.0
+.endif # REPLACE_BASE
+
+PKGDEINSTALL=	${PKGINSTALL}
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--sysconfdir=${BIND_DESTETC}
-.else
-BIND_DESTETC=	${PREFIX}/etc
-.endif
-
+SUB_LIST+=	BIND_DESTETC="${BIND_DESTETC}"
 PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
 
-MAN1?=	arpaname.1 dig.1 host.1 isc-config.sh.1 nslookup.1 nsupdate.1
-.if !defined(BIND_TOOLS_SLAVE)
-MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
-	lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \
-	lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \
-	lwres_buffer_getuint32.3 lwres_buffer_getuint8.3 lwres_buffer_init.3 \
-	lwres_buffer_invalidate.3 lwres_buffer_putmem.3 \
-	lwres_buffer_putuint16.3 lwres_buffer_putuint32.3 \
-	lwres_buffer_putuint8.3 lwres_buffer_subtract.3 lwres_conf_clear.3 \
-	lwres_conf_get.3 lwres_conf_init.3 lwres_conf_parse.3 \
-	lwres_conf_print.3 lwres_config.3 lwres_context.3 \
-	lwres_context_allocmem.3 lwres_context_create.3 \
-	lwres_context_destroy.3 lwres_context_freemem.3 \
-	lwres_context_initserial.3 lwres_context_nextserial.3 \
-	lwres_context_sendrecv.3 lwres_endhostent.3 lwres_endhostent_r.3 \
-	lwres_freeaddrinfo.3 lwres_freehostent.3 lwres_gabn.3 \
-	lwres_gabnrequest_free.3 lwres_gabnrequest_parse.3 \
-	lwres_gabnrequest_render.3 lwres_gabnresponse_free.3 \
-	lwres_gabnresponse_parse.3 lwres_gabnresponse_render.3 \
-	lwres_gai_strerror.3 lwres_getaddrinfo.3 lwres_getaddrsbyname.3 \
-	lwres_gethostbyaddr.3 lwres_gethostbyaddr_r.3 lwres_gethostbyname.3 \
-	lwres_gethostbyname2.3 lwres_gethostbyname_r.3 lwres_gethostent.3 \
-	lwres_gethostent_r.3 lwres_getipnode.3 lwres_getipnodebyaddr.3 \
-	lwres_getipnodebyname.3 lwres_getnamebyaddr.3 lwres_getnameinfo.3 \
-	lwres_getrrsetbyname.3 lwres_gnba.3 lwres_gnbarequest_free.3 \
-	lwres_gnbarequest_parse.3 lwres_gnbarequest_render.3 \
-	lwres_gnbaresponse_free.3 lwres_gnbaresponse_parse.3 \
-	lwres_gnbaresponse_render.3 lwres_herror.3 lwres_hstrerror.3 \
-	lwres_inetntop.3 lwres_lwpacket_parseheader.3 \
-	lwres_lwpacket_renderheader.3 lwres_net_ntop.3 lwres_noop.3 \
-	lwres_nooprequest_free.3 lwres_nooprequest_parse.3 \
-	lwres_nooprequest_render.3 lwres_noopresponse_free.3 \
-	lwres_noopresponse_parse.3 lwres_noopresponse_render.3 \
-	lwres_packet.3 lwres_resutil.3 lwres_sethostent.3 \
-	lwres_sethostent_r.3 lwres_string_parse.3
-MAN5=	named.conf.5 rndc.conf.5
-MAN8=	ddns-confgen.8 dnssec-dsfromkey.8 dnssec-keyfromlabel.8 \
-	dnssec-keygen.8 dnssec-revoke.8 dnssec-settime.8 dnssec-signzone.8 \
-	dnssec-verify.8 \
-	genrandom.8 isc-hmac-fixup.8 lwresd.8 named-checkconf.8 \
-	named-checkzone.8 named-journalprint.8 named.8 nsec3hash.8 \
-	rndc-confgen.8 rndc.8
-MLINKS=	named-checkzone.8 named-compilezone.8
-.endif	# BIND_TOOLS_SLVE
+PORTDOCS=	*
 
-.if !defined(BIND_TOOLS_SLAVE)
+PLIST_SUB+=	NOBASE="@comment " BASE=""
+.if ${PORT_OPTIONS:MSSL}
+WITH_OPENSSL_PORT=	yes
+.endif
+
 post-patch:
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
-	@${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist
-	@${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \
+	@${REINPLACE_CMD} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
-		${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE}
+		${WRKSRC}/bin/${FILE}
 .endfor
-	@${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist
-	@${SED} -e 's#.*bind\.keys.*##' ${WRKSRC}/Makefile.in.Dist > \
-		${WRKSRC}/Makefile.in
-	@${MV} ${WRKSRC}/bin/named/Makefile.in ${WRKSRC}/bin/named/Makefile.in.Dist
-	@${SED} -e 's/$${PERL}/#/' -e 's/bind.keys.h/#/g' -e 's/bind9.xsl.h/#/g' \
-		${WRKSRC}/bin/named/Makefile.in.Dist > \
-		${WRKSRC}/bin/named/Makefile.in
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
+post-configure:
+	${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
-		${BIND_DESTETC}/rndc.conf.sample
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/arm ${DOCSDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCSDIR}/arm
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc
-	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
-		${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/
+	${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 ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 
-.endif	# BIND_TOOLS_SLAVE
-
 .include <bsd.port.mk>

Modified: trunk/dns/bind99/distinfo
===================================================================
--- trunk/dns/bind99/distinfo	2014-12-08 16:25:05 UTC (rev 17866)
+++ trunk/dns/bind99/distinfo	2014-12-11 12:50:00 UTC (rev 17867)
@@ -1,4 +1,4 @@
-SHA256 (bind-9.9.5-P1.tar.gz) = a41f7813f3a6eb0dcae961651ec93896fd82074929bc6c1d8c90b04a2417b850
-SIZE (bind-9.9.5-P1.tar.gz) = 7730150
-SHA256 (9.9.5-P1-rpz2+rl.14038.05.patch) = 48110f1f0b5c27d2fe3230888f69fdd175f8d0db54f64f73c03449f5ba8ec88a
-SIZE (9.9.5-P1-rpz2+rl.14038.05.patch) = 238941
+SHA256 (bind-9.9.6-P1.tar.gz) = dfedcb2b414d2803accd1a9c21d183178a288f40a2486af5ec0d3369a8cb8526
+SIZE (bind-9.9.6-P1.tar.gz) = 7816337
+SHA256 (9.9.6-P1-rpz2+rl.14038.05.patch) = b978d634c3deb1de42418700ac28ec947373f8979a4bbe2230d0eea462a6cc86
+SIZE (9.9.6-P1-rpz2+rl.14038.05.patch) = 194778

Modified: trunk/dns/bind99/pkg-install
===================================================================
--- trunk/dns/bind99/pkg-install	2014-12-08 16:25:05 UTC (rev 17866)
+++ trunk/dns/bind99/pkg-install	2014-12-11 12:50:00 UTC (rev 17867)
@@ -1,13 +1,26 @@
 #!/bin/sh
 
-[ "$2" = 'POST-INSTALL' ] || exit 0
+if [ "$2" = 'POST-INSTALL' ]
+then
+	/bin/mkdir -p /var/named${PKG_PREFIX}/etc
+fi
 
-/bin/mkdir -p /var/named${PKG_PREFIX}/etc
-
 for DIR in ${PKG_PREFIX}/etc /var/named${PKG_PREFIX}/etc; do
 	for FILE in named.conf rndc.key; do
-		/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+		if [ "$2" = 'POST-INSTALL' ]
+		then
+			/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+		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 > /dev/null  2>&1 || :
+fi
+
 exit 0

Modified: trunk/dns/bind99/pkg-plist
===================================================================
--- trunk/dns/bind99/pkg-plist	2014-12-08 16:25:05 UTC (rev 17866)
+++ trunk/dns/bind99/pkg-plist	2014-12-11 12:50:00 UTC (rev 17867)
@@ -1,19 +1,21 @@
+bin/bind9-config
 bin/dig
 bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
-%%LINKS%%etc/named.conf
-%%LINKS%%etc/rndc.key
 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
@@ -22,19 +24,25 @@
 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
@@ -41,6 +49,9 @@
 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
@@ -54,23 +65,29 @@
 include/dns/rdataslab.h
 include/dns/rdatastruct.h
 include/dns/rdatatype.h
-include/dns/rpz.h
-include/dns/sdlz.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
@@ -85,6 +102,8 @@
 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
@@ -93,6 +112,7 @@
 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
@@ -110,6 +130,7 @@
 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
@@ -127,6 +148,7 @@
 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
@@ -133,7 +155,10 @@
 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
@@ -152,9 +177,11 @@
 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
@@ -163,6 +190,7 @@
 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
@@ -182,6 +210,7 @@
 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
@@ -198,6 +227,8 @@
 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
@@ -205,9 +236,128 @@
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
+%%SHARE_MAN%%man/man1/arpaname.1.gz
+%%SHARE_MAN%%man/man1/bind9-config.1.gz
+%%SHARE_MAN%%man/man1/dig.1.gz
+%%SHARE_MAN%%man/man1/host.1.gz
+%%SHARE_MAN%%man/man1/isc-config.sh.1.gz
+%%SHARE_MAN%%man/man1/nslookup.1.gz
+%%SHARE_MAN%%man/man1/nsupdate.1.gz
+%%SHARE_MAN%%man/man3/lwres.3.gz
+%%SHARE_MAN%%man/man3/lwres_addr_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_add.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_back.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_clear.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_first.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_forward.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_getmem.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_getuint16.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_getuint32.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_getuint8.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_init.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_invalidate.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_putmem.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_putuint16.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_putuint32.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_putuint8.3.gz
+%%SHARE_MAN%%man/man3/lwres_buffer_subtract.3.gz
+%%SHARE_MAN%%man/man3/lwres_conf_clear.3.gz
+%%SHARE_MAN%%man/man3/lwres_conf_get.3.gz
+%%SHARE_MAN%%man/man3/lwres_conf_init.3.gz
+%%SHARE_MAN%%man/man3/lwres_conf_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_conf_print.3.gz
+%%SHARE_MAN%%man/man3/lwres_config.3.gz
+%%SHARE_MAN%%man/man3/lwres_context.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_allocmem.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_create.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_destroy.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_freemem.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_initserial.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_nextserial.3.gz
+%%SHARE_MAN%%man/man3/lwres_context_sendrecv.3.gz
+%%SHARE_MAN%%man/man3/lwres_endhostent.3.gz
+%%SHARE_MAN%%man/man3/lwres_endhostent_r.3.gz
+%%SHARE_MAN%%man/man3/lwres_freeaddrinfo.3.gz
+%%SHARE_MAN%%man/man3/lwres_freehostent.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabn.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnrequest_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnrequest_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnrequest_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnresponse_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnresponse_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_gabnresponse_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_gai_strerror.3.gz
+%%SHARE_MAN%%man/man3/lwres_getaddrinfo.3.gz
+%%SHARE_MAN%%man/man3/lwres_getaddrsbyname.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostbyaddr.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostbyaddr_r.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostbyname.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostbyname2.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostbyname_r.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostent.3.gz
+%%SHARE_MAN%%man/man3/lwres_gethostent_r.3.gz
+%%SHARE_MAN%%man/man3/lwres_getipnode.3.gz
+%%SHARE_MAN%%man/man3/lwres_getipnodebyaddr.3.gz
+%%SHARE_MAN%%man/man3/lwres_getipnodebyname.3.gz
+%%SHARE_MAN%%man/man3/lwres_getnamebyaddr.3.gz
+%%SHARE_MAN%%man/man3/lwres_getnameinfo.3.gz
+%%SHARE_MAN%%man/man3/lwres_getrrsetbyname.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnba.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbarequest_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbarequest_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbarequest_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbaresponse_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbaresponse_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_gnbaresponse_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_herror.3.gz
+%%SHARE_MAN%%man/man3/lwres_hstrerror.3.gz
+%%SHARE_MAN%%man/man3/lwres_inetntop.3.gz
+%%SHARE_MAN%%man/man3/lwres_lwpacket_parseheader.3.gz
+%%SHARE_MAN%%man/man3/lwres_lwpacket_renderheader.3.gz
+%%SHARE_MAN%%man/man3/lwres_net_ntop.3.gz
+%%SHARE_MAN%%man/man3/lwres_noop.3.gz
+%%SHARE_MAN%%man/man3/lwres_nooprequest_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_nooprequest_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_nooprequest_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_noopresponse_free.3.gz
+%%SHARE_MAN%%man/man3/lwres_noopresponse_parse.3.gz
+%%SHARE_MAN%%man/man3/lwres_noopresponse_render.3.gz
+%%SHARE_MAN%%man/man3/lwres_packet.3.gz
+%%SHARE_MAN%%man/man3/lwres_resutil.3.gz
+%%SHARE_MAN%%man/man3/lwres_sethostent.3.gz
+%%SHARE_MAN%%man/man3/lwres_sethostent_r.3.gz
+%%SHARE_MAN%%man/man3/lwres_string_parse.3.gz
+%%SHARE_MAN%%man/man5/named.conf.5.gz
+%%SHARE_MAN%%man/man5/rndc.conf.5.gz
+%%SHARE_MAN%%man/man8/ddns-confgen.8.gz
+%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-checkds.8.gz
+%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-coverage.8.gz
+%%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz
+%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz
+%%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz
+%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz
+%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz
+%%SHARE_MAN%%man/man8/dnssec-settime.8.gz
+%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz
+%%SHARE_MAN%%man/man8/dnssec-verify.8.gz
+%%SHARE_MAN%%man/man8/genrandom.8.gz
+%%SHARE_MAN%%man/man8/isc-hmac-fixup.8.gz
+%%SHARE_MAN%%man/man8/lwresd.8.gz
+%%SHARE_MAN%%man/man8/named-checkconf.8.gz
+%%SHARE_MAN%%man/man8/named-checkzone.8.gz
+%%SHARE_MAN%%man/man8/named-compilezone.8.gz
+%%SHARE_MAN%%man/man8/named-journalprint.8.gz
+%%SHARE_MAN%%man/man8/named.8.gz
+%%SHARE_MAN%%man/man8/nsec3hash.8.gz
+%%SHARE_MAN%%man/man8/rndc-confgen.8.gz
+%%SHARE_MAN%%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
@@ -225,15 +375,15 @@
 sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
-%%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
-%%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
-%%LINKS%%@unexec rm -rf /var/named/%D
-%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
- at unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
- at dirrm include/bind9
- at dirrm include/dns
- at dirrm include/dst
- at dirrmtry include/isc
- at dirrm include/isccc
- at dirrm include/isccfg
- at dirrm include/lwres
+%%BASE%%etc/bind.keys
+%%NOBASE%%%%ETCDIR%%/bind.keys
+%%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%%%%ETCDIR%%/rndc.conf.sample
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working

More information about the Midnightbsd-cvs mailing list