Minor files/named.conf-r4 fixes. Remove "stop" argument from the stop() function of the init script, bug 335398.

Package-Manager: portage-2.2_rc74/cvs/Linux x86_64

5 files changed, 25 insertions, 19 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index d80a10e55bc0..4585a07c3cf3 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.288 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.289 2010/09/03 17:52:01 idl0r Exp $
+
+  03 Sep 2010; Christian Ruppert <idl0r@gentoo.org> files/named.conf-r4,
+  files/named.init-r5, files/named.init-r7:
+  Minor files/named.conf-r4 fixes. Remove "stop" argument from the stop()
+  function of the init script, bug 335398.
 
   26 Aug 2010; Christian Ruppert <idl0r@gentoo.org> files/named.init-r5,
   files/named.init-r7:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 8c93c3790ffe..84879856a9e5 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,11 +11,11 @@ AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1a
 AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc
 AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b1575428e8b5f513469a90a32cf163e8db46cab5 SHA256 35f7fcf2b177678cf362af7ac942f7f1a1c102c045dc3844991a411fc4c5d277
 AUX named.conf-r3 1317 RMD160 dace9861fb15a7ad415b23f2452fca5eb3ef2604 SHA1 02385c388d4ca99f68354c83f9e4cae2c2bcb034 SHA256 f431592c2441a27205e1112dcff7b9b07655007c460a309b7968c97688c8e7f4
-AUX named.conf-r4 5259 RMD160 368fcafd0987b8380aed8f3e5760928130019dda SHA1 5e2a7124b88f57dfe20c55976d014067ab84c77c SHA256 b1097dd24b3f7a2987b97147ba903cb70aff5ad61aea7ae1c6aa5634924d54f1
+AUX named.conf-r4 5288 RMD160 d5b56d46370b0e54e42aefbe41e1ff290df30439 SHA1 945ee47a99d37c2160829b2fdfd9ffbd3293b333 SHA256 852fc5f2100c94834b59ee64566b7414f0ec12b17751900bb572ab2375c8ca50
 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
 AUX named.confd-r3 719 RMD160 813e82a611c24a0aa3aca0400f499b68727cc8ef SHA1 d4bc0d753e9ec52fa9091b10eca10aee4462b83c SHA256 b37c19dccf3af6e313b09720c12ef7de107a297d2434c78b7101cd67ba0798f6
-AUX named.init-r5 1806 RMD160 95463037e9114890d85f44bb1d08b1b3d79e9c29 SHA1 0829ff7a5ef3d0d4eb641ec153d02a1bb072c2c1 SHA256 5fc6301b2bbe4e1b97943a51632bc947b308fa4c91062aebd109b934a9edba5a
-AUX named.init-r7 3604 RMD160 86ad7deb2aa0a6c7808d59866d61f2de8b6c3656 SHA1 c11ee00f9f68639dedf3152bcc22bd5c384830d4 SHA256 2fb1b71ba123f324c71beec2e30a8aef793927168664c7eeca8eec7657e36910
+AUX named.init-r5 1798 RMD160 a4cf8a2d19c79c40f7121559a5b0252204ede75b SHA1 0a131aa6b42050c6173c144d26a927f2fe5d3a1b SHA256 71153fce5461d4d85853218371599f5c909c625bacd9894b8a0ff16636773e05
+AUX named.init-r7 3622 RMD160 4ed3c76403bf5ddc545b0d681b176fbe5f7f8484 SHA1 dfe2e1a0925b23584581f8dd243bc15a9833bbe0 SHA256 9999609ce9ecb7fcafac50174713e72c2af80137f2c7c06fc5cfee26620a3e7e
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
 DIST bind-9.6.2-P2.tar.gz 6543309 RMD160 0706aa4f4f6cd4927d2e8ff72d5fb8a91be94fa9 SHA1 fce8067d3ff03366d5ee305adf941b5c41e41d07 SHA256 233404ea08c4880eb867ee4e1084d96cff748a2bdd8857014203bef511f17e64
 DIST bind-9.7.0-P2.tar.gz 7125822 RMD160 e77877f9ef7341071f4f458863ebe715e2f6506f SHA1 4b805d4a66075a88c93c5b852b928da96467aa2d SHA256 872906cf729511f725dfef21790b5d54b89dd257e586185135db9221568e3f54
@@ -28,16 +28,16 @@ EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0
 EBUILD bind-9.6.2_p2.ebuild 10430 RMD160 06a692de249741add2caf239499b4f19a90bb47a SHA1 5c8efabe30e98a97ed22d46acc197e02b9443e5b SHA256 d796179e0ade295aba7d3f838f64bb20d2226f0453191462a14e63e78a99d3e6
 EBUILD bind-9.7.0_p2-r1.ebuild 10455 RMD160 c8b1e130af051525829513cc458892c29b7c3c25 SHA1 2ae51d039f642271fe5f228ce4f900bf65ee691c SHA256 13c91454a2f2854e7f1970bca813b8cc6cf428f2920f1f439d3583891da928a7
 EBUILD bind-9.7.1_p2.ebuild 10518 RMD160 f6491fb7306ea02b84d0a7e94fe85edfd099395d SHA1 1688ecbb5596223bac8a1d97cdfc4ce45a8a57bb SHA256 9b84c9feaa0a32b8092419c974b74ff96ca69a57e5e495d0cc9b127b5a706c30
-MISC ChangeLog 47897 RMD160 7b89bec1643607edf3bbf4463b6d75076892a87d SHA1 352fa027e91d334b112f1a64adb2e628dfdd0ad8 SHA256 94653319acc2e7045641475b2cb83e8d3299f3f2f5db784cfaa58682f8621e77
+MISC ChangeLog 48132 RMD160 ac486deb40e7352febac79967650fc348c561e89 SHA1 eac13100032a70f76f30563f8c563ccd1d9c64ad SHA256 db9a625dbea0878ab49faf4de02ba83a95427a3be94195740dc1221a6a88b053
 MISC metadata.xml 788 RMD160 bf52f4f66dbf21e131ef2e8f3d4066cc61ba5aee SHA1 30c5619a8831a452fe6881e46f0082fdca6f1664 SHA256 a698cbceada96d79667f8eb109f1ea14ab0fd0590276c8eab1d2abc2f28ab438
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMdpBiAAoJEMOx0zmdw4Z1tCgH/AlbvPXJC2HU3WU1VGPA9kI8
-dR2z2EFbllKuL9PfzFBxH8te3K407RLxKFYfeJf25QVdjINCGgGS859wBiJhCZzi
-kIdTImeDt8bvzOMe32GVRjaW3QPGaOSReTa/IuIRUpeJbrzRVDFShsV2VoOINJ1F
-8wEFkGxbCa59bK+thVnCZUk88kufIjGN7aKqojajYhtCmNq/EGq602KYDrv3krB9
-cbMIhfjK2aoXtLLMemPwor6TG38YjBGjG2lVrl5iE8ARvEd3h9qqf84oUx1NPLg2
-pBLI/IpzY8SxGGGfxPPHyKu24LfOfkogUs0enuCCXrXtRlmB6IedeMMLUOVijuQ=
-=9OTf
+iQEcBAEBAgAGBQJMgTXHAAoJEMOx0zmdw4Z12AMH/1kil70ziTWQhzVLL2cvF0g6
+WhKtG9ohkgvq8bqX0vRTMF7+qdBKeovb3/AnFoFPo16nfZ9FI9X0A55+MD0NtasX
+OxGEwZpWNGtqDDQmg6WGtDBs0y7ul5W4fbEuxVZ+mcHk04uMzc/NstoMqw/iozjk
+MB469T0nLoOO7jAHMh/VJnpnj2zfN6RyCuyH1Q1/i/iHBPIv/o2GGgbH/ynH3sG4
+ixr5P9G5Dp+Jg/JQd9d3E53fSRND5svPPPrszFc2OcX98B6CtLAJ48En3+Un+uUW
+HggLJVEiNlpTxYl6N8rOFtYxGpsrfIsWMGx5g+JUKihRayEEk8mPWvXpWjGDTW8=
+=9H0t
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/files/named.conf-r4 b/net-dns/bind/files/named.conf-r4
index d302794bc16c..35ee3644ea91 100644
--- a/net-dns/bind/files/named.conf-r4
+++ b/net-dns/bind/files/named.conf-r4
@@ -31,7 +31,7 @@ options {
 	pid-file "/var/run/named/named.pid";
 
 	/* https://www.isc.org/solutions/dlv >=bind-9.7.x only */
-	//bindkeys-file "/etc/bind/bind.keys";
+	// bindkeys-file "/etc/bind/bind.keys";
 
 	listen-on-v6 { ::1; };
 	listen-on { 127.0.0.1; };
@@ -80,7 +80,8 @@ options {
 
 */
 
-	//dnssec-enable yes;
+	// dnssec-enable yes;
+	// dnssec-validation yes;
 
 	/* if you have problems and are behind a firewall: */
 	//query-source address * port 53;
diff --git a/net-dns/bind/files/named.init-r5 b/net-dns/bind/files/named.init-r5
index de10032f158b..b06c74d4e32b 100755
--- a/net-dns/bind/files/named.init-r5
+++ b/net-dns/bind/files/named.init-r5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.2 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.3 2010/09/03 17:52:01 idl0r Exp $
 
 opts="start stop reload restart"
 
@@ -56,7 +56,7 @@ stop() {
 		rndc -k $KEY stop &>/dev/null
 	else
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
+			--exec /usr/sbin/named
 	fi
 	eend $?
 }
diff --git a/net-dns/bind/files/named.init-r7 b/net-dns/bind/files/named.init-r7
index ae887e9ecdfd..454b10158b3f 100644
--- a/net-dns/bind/files/named.init-r7
+++ b/net-dns/bind/files/named.init-r7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.5 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.6 2010/09/03 17:52:01 idl0r Exp $
 
 opts="start stop reload restart"
 
@@ -117,11 +117,11 @@ stop() {
 
 	ebegin "Stopping ${CHROOT:+chrooted }named"
 	checkconfig || return 2
-	if [ -f $RNDC_KEY ] ; then
+	if [[ -n "${RNDC_KEY}" && -f "${RNDC_KEY}" ]] ; then
 		rndc $SERVER -k $RNDC_KEY stop &>/dev/null
 	else
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
+			--exec /usr/sbin/named
 	fi
 
 	if [[ -n ${CHROOT} ]];