Fix rcfile issues

4 files changed, 12 insertions, 76 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 5cb47fc5da99..9e3c86669b71 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.26 2003/04/27 22:37:46 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.27 2003/06/01 05:22:40 lostlogic Exp $
+
+  01 Jun 2003; Brandon Low <lostlogic@gentoo.org> files/named.rc6:
+  Fix rcfiles
 
 *bind-9.2.2-r2 (27 Apr 2003)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index e880025c27d5..bfb740a95696 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,7 +1,7 @@
 MD5 20542079b97eb62c2bf449ae44361cc4 bind-9.2.2.ebuild 4584
 MD5 25e13d358d4a439b9a65030ee2161701 bind-9.2.2-r2.ebuild 4797
 MD5 f2878b39d022399c9bc5a7eb63763651 bind-9.2.2_rc1-r2.ebuild 4496
-MD5 6dbfb1c4de2c16f19d53a13c13d91e7b ChangeLog 5192
+MD5 794e25f5e077792f255dc4c935a03021 ChangeLog 5274
 MD5 d3586eddb838e4392e13d0b2ee4ba5e4 bind-9.2.2-r1.ebuild 4797
 MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 MD5 e020f0d41f68e0c47d196c4aa1a06c09 files/digest-bind-9.2.2-r1 63
@@ -15,7 +15,6 @@ MD5 20f93349185d27963c279254fe494b34 files/named.conf-r2 766
 MD5 8c87d7839f4a6caa9c690e5905a247f4 files/digest-bind-9.2.2_rc1-r2 66
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
 MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
-MD5 118c4ccb777bbbd0e55e7cd26ff442cf files/named.rc6 1378
-MD5 c0d3c0898169e863e9e09c910b1b158a files/named.rc7 1400
+MD5 da2b1cecefaca27cf9125983b4f49419 files/named.rc6 1389
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
 MD5 b5605e61fab3836f54d54acfba68b09f files/named.ca 2499
diff --git a/net-dns/bind/files/named.rc6 b/net-dns/bind/files/named.rc6
index 581af764b4cf..d0e39b902f78 100644
--- a/net-dns/bind/files/named.rc6
+++ b/net-dns/bind/files/named.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc6,v 1.9 2003/02/14 22:59:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc6,v 1.10 2003/06/01 05:22:40 lostlogic Exp $
 
 opts="start stop reload restart"
 
@@ -22,10 +22,10 @@ checkconfig() {
 	fi
 
 	if [ $CHROOT -a -d $CHROOT ] ; then
-		PIDFILE="${CHROOT}/var/run/named/named.pid"
+		PIDFILE="${CHROOT}/var/run/named.pid"
 		KEY="${CHROOT}/etc/bind/rndc.key"
 	else
-		PIDFILE="/var/run/named/named.pid"
+		PIDFILE="/var/run/named.pid"
 		KEY="/etc/bind/rndc.key"
 	fi
 }
@@ -52,8 +52,8 @@ reload() {
 	fi
 
 	if [ -f $KEY ] ; then
-		ebegin "Reloading named"
-		rndc -k $KEY reconfig &>/dev/null
+		ebegin "Reloading named.conf and zone files"
+		rndc -k $KEY reload &>/dev/null
 		eend $?
 	else /etc/init.d/named restart &>/dev/null
 	fi
@@ -63,4 +63,4 @@ restart() {
 	svc_stop
 	svc_start
 }
-	
\ No newline at end of file
+	
diff --git a/net-dns/bind/files/named.rc7 b/net-dns/bind/files/named.rc7
deleted file mode 100644
index e2663994978a..000000000000
--- a/net-dns/bind/files/named.rc7
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc7,v 1.1 2003/04/27 22:37:46 lostlogic Exp $
-
-opts="start stop reload restart"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then
-		eerror "No ${CHROOT}/etc/bind/named.conf file exists!"
-	fi
-	
-	# In case someone doesn't have $CPU set from /etc/conf.d/named
-	if [ ! $CPU ] ; then
-		CPU=1
-	fi
-
-	if [ $CHROOT -a -d $CHROOT ] ; then
-		PIDFILE="${CHROOT}/var/run/named/named.pid"
-		KEY="${CHROOT}/etc/bind/rndc.key"
-	else
-		PIDFILE="/var/run/named/named.pid"
-		KEY="/etc/bind/rndc.key"
-	fi
-}
-
-start() {
-	ebegin "Starting ${CHROOT:+chrooted }named"
-	checkconfig || return 1
-	start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping named"
-	checkconfig || return 2
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE
-	eend $?
-}
-
-reload() {
-	checkconfig || return 3
-	if [ ! -f $PIDFILE ] ; then
-		/etc/init.d/named start &>/dev/null
-		exit
-	fi
-
-	if [ -f $KEY ] ; then
-		ebegin "Reloading named.conf and zone files"
-		rndc -k $KEY reload &>/dev/null
-		eend $?
-	else /etc/init.d/named restart &>/dev/null
-	fi
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
-