svn commit: r335667 - in head/dns: bind96 bind98 bind99
Erwin Lansing
erwin at FreeBSD.org
Thu Dec 5 12:54:58 UTC 2013
Author: erwin
Date: Thu Dec 5 12:54:56 2013
New Revision: 335667
URL: http://svnweb.freebsd.org/changeset/ports/335667
Log:
Install named.conf as named.conf.sample and don't overwrite on upgrade
Bullet hole in foot: joeld
Pointy hat: erwin
Modified:
head/dns/bind96/Makefile
head/dns/bind96/pkg-plist
head/dns/bind98/Makefile
head/dns/bind98/pkg-plist
head/dns/bind99/Makefile
head/dns/bind99/pkg-plist
Modified: head/dns/bind96/Makefile
==============================================================================
--- head/dns/bind96/Makefile Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind96/Makefile Thu Dec 5 12:54:56 2013 (r335667)
@@ -2,7 +2,7 @@
PORTNAME= bind96
PORTVERSION= 9.6.3.2.ESV.R10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -235,7 +235,10 @@ post-install:
.for DIR in dynamic slave working
${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
.endfor
- ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
Modified: head/dns/bind96/pkg-plist
==============================================================================
--- head/dns/bind96/pkg-plist Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind96/pkg-plist Thu Dec 5 12:54:56 2013 (r335667)
@@ -216,7 +216,8 @@ sbin/rndc-confgen
%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
%%NOBASE%%%%BIND_DESTETC%%/named.root
%%NOBASE%%%%BIND_DESTETC%%/master/empty.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
Modified: head/dns/bind98/Makefile
==============================================================================
--- head/dns/bind98/Makefile Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind98/Makefile Thu Dec 5 12:54:56 2013 (r335667)
@@ -2,7 +2,7 @@
PORTNAME= bind98
PORTVERSION= 9.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d
CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
-OPTIONS_DEFAULT= IPV6 SSL XML THREADS
+OPTIONS_DEFAULT= IPV6 SSL XML THREADS GSSAPI
OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \
FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
@@ -272,7 +272,10 @@ post-install:
.for DIR in dynamic slave working
${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
.endfor
- ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
Modified: head/dns/bind98/pkg-plist
==============================================================================
--- head/dns/bind98/pkg-plist Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind98/pkg-plist Thu Dec 5 12:54:56 2013 (r335667)
@@ -229,7 +229,8 @@ sbin/rndc-confgen
%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
%%NOBASE%%%%BIND_DESTETC%%/named.root
%%NOBASE%%%%BIND_DESTETC%%/master/empty.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind99/Makefile Thu Dec 5 12:54:56 2013 (r335667)
@@ -2,7 +2,7 @@
PORTNAME?= bind99
PORTVERSION= 9.9.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d
CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
-OPTIONS_DEFAULT= IPV6 SSL XML THREADS
+OPTIONS_DEFAULT= IPV6 SSL XML THREADS GSSAPI
OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE \
FIXED_RRSET SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
.if !defined(BIND_TOOLS_SLAVE)
@@ -283,7 +283,10 @@ post-install:
.for DIR in dynamic slave working
${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
.endfor
- ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
Modified: head/dns/bind99/pkg-plist
==============================================================================
--- head/dns/bind99/pkg-plist Thu Dec 5 12:36:21 2013 (r335666)
+++ head/dns/bind99/pkg-plist Thu Dec 5 12:54:56 2013 (r335667)
@@ -231,7 +231,8 @@ sbin/rndc-confgen
%%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
%%NOBASE%%%%BIND_DESTETC%%/named.root
%%NOBASE%%%%BIND_DESTETC%%/master/empty.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
More information about the svn-ports-all
mailing list