Date: Wed, 10 Dec 2014 23:41:28 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374497 - in branches/2014Q4/dns: bind-tools bind910 bind99 Message-ID: <201412102341.sBANfSCS096923@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Dec 10 23:41:28 2014 New Revision: 374497 URL: https://svnweb.freebsd.org/changeset/ports/374497 QAT: https://qat.redports.org/buildarchive/r374497/ Log: MFH r371360,372675,372752,374305: Security update of BIND9 to 9.9.6-P1 and 9.10.1-P1. Security: CVE-2014-8500, CVE-2014-8680 Approved by: ports-secteam Modified: branches/2014Q4/dns/bind-tools/Makefile branches/2014Q4/dns/bind910/Makefile branches/2014Q4/dns/bind910/distinfo branches/2014Q4/dns/bind910/pkg-plist branches/2014Q4/dns/bind99/Makefile branches/2014Q4/dns/bind99/distinfo branches/2014Q4/dns/bind99/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/dns/bind-tools/Makefile ============================================================================== --- branches/2014Q4/dns/bind-tools/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind-tools/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +# Define PORTREVISION in ${MASTERDIR} PKGNAMESUFFIX= -tools COMMENT= Command line tools from BIND: dig, host, and nslookup Modified: branches/2014Q4/dns/bind910/Makefile ============================================================================== --- branches/2014Q4/dns/bind910/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -2,6 +2,13 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +.if defined(BIND_TOOLS_SLAVE) +# dns/bind-tools here +PORTREVISION= 0 +.else +# dns/bind910 here +PORTREVISION= 0 +.endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX?= 910 @@ -13,7 +20,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.1 +ISCVERSION= 9.10.1-P1 MAKE_JOBS_UNSAFE= yes @@ -169,8 +176,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) .if ${PORT_OPTIONS:MGOST} WITH_OPENSSL_PORT=yes .endif @@ -194,19 +203,11 @@ PORTDOCS= * 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#${ETCDIR}/named.conf#g' \ + @${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}.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 post-install: .if ${PORT_OPTIONS:MDOCS} Modified: branches/2014Q4/dns/bind910/distinfo ============================================================================== --- branches/2014Q4/dns/bind910/distinfo Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/distinfo Wed Dec 10 23:41:28 2014 (r374497) @@ -1,2 +1,2 @@ -SHA256 (bind-9.10.1.tar.gz) = 5361eca2b8b6bc0b13904b0f964336a478dfbc165711547f6cc3f8752ac60181 -SIZE (bind-9.10.1.tar.gz) = 8353313 +SHA256 (bind-9.10.1-P1.tar.gz) = 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d +SIZE (bind-9.10.1-P1.tar.gz) = 8356463 Modified: branches/2014Q4/dns/bind910/pkg-plist ============================================================================== --- branches/2014Q4/dns/bind910/pkg-plist Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/pkg-plist Wed Dec 10 23:41:28 2014 (r374497) @@ -122,6 +122,7 @@ 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 @@ -408,6 +409,7 @@ sbin/rndc sbin/rndc-confgen sbin/tsig-keygen %%ETCDIR%%/rndc.conf.sample +%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db Modified: branches/2014Q4/dns/bind99/Makefile ============================================================================== --- branches/2014Q4/dns/bind99/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -13,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.6 +ISCVERSION= 9.9.6-P1 MAKE_JOBS_UNSAFE= yes @@ -108,7 +109,7 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RPZ_PATCH_PATCHFILES= 9.9.6-rpz2+rl.14038.05.patch:vix +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/} RRL_CONFIGURE_ENABLE= rrl @@ -173,6 +174,7 @@ PKGDEINSTALL= ${PKGINSTALL} CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} SUB_LIST+= BIND_DESTETC="${BIND_DESTETC}" +PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" PORTDOCS= * @@ -193,19 +195,11 @@ WITH_OPENSSL_PORT= yes 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 post-configure: @${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath,/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile Modified: branches/2014Q4/dns/bind99/distinfo ============================================================================== --- branches/2014Q4/dns/bind99/distinfo Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/distinfo Wed Dec 10 23:41:28 2014 (r374497) @@ -1,4 +1,4 @@ -SHA256 (bind-9.9.6.tar.gz) = 6b9432644a3bfa41695354543bd9e2547104e35f3c7354a416a030a4cdd1c514 -SIZE (bind-9.9.6.tar.gz) = 7811896 -SHA256 (9.9.6-rpz2+rl.14038.05.patch) = 7ff0f755a032f6c44ed5758c257a8e217be8e7f8af5bf967333e08621b1abe67 -SIZE (9.9.6-rpz2+rl.14038.05.patch) = 194775 +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: branches/2014Q4/dns/bind99/pkg-plist ============================================================================== --- branches/2014Q4/dns/bind99/pkg-plist Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/pkg-plist Wed Dec 10 23:41:28 2014 (r374497) @@ -112,6 +112,7 @@ 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 @@ -374,6 +375,8 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen +%%BASE%%%%BIND_DESTETC%%/bind.keys +%%NOBASE%%%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412102341.sBANfSCS096923>