Make the init script POSIX conform again, bug 366431.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

3 files changed, 17 insertions, 14 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f16d91c4ef98..cbb0339453a7 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.340 2011/06/16 18:54:12 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.341 2011/06/16 18:56:09 idl0r Exp $
+
+  16 Jun 2011; Christian Ruppert <idl0r@gentoo.org> files/named.init-r11:
+  Make the init script POSIX conform again, bug 366431.
 
 *bind-9.8.0_p2-r1 (16 Jun 2011)
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 4fddfd754ae1..e5ab7f8510a2 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,7 +11,7 @@ AUX named.conf-r5 3952 RMD160 e4554204786565b08eefb9d129c7b8e0b3a55454 SHA1 cd5c
 AUX named.confd-r5 1224 RMD160 b353a2bd8c73cbc1f967d04339d4f07db840a5ee SHA1 181a57e1b2c0371ad2704bb61f621498e2bfddff SHA256 00f06f96dc0cc7855bd15d31449b492e3a2502938e8038081c9f09e0d0ce7a08
 AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492
 AUX named.init-r10 5925 RMD160 acd84047fe945bb146c676a673eca9782362f4ad SHA1 bf91dabc72f693222c935eada9a21f7dc7dc2c2a SHA256 e7604579ed45cafdf121a65c5847b56aecb42356a213f7bac17474823431b24d
-AUX named.init-r11 6250 RMD160 9a03c4670a71fbf865507928b7a59f91fef0df3d SHA1 8e4647b87d9dc4cc79b4c87d2c68575085a7901a SHA256 f59025a8c22a95fb9af5955a96e7aa9562cc2d8cf6be725df69ead56ee93bacd
+AUX named.init-r11 6250 RMD160 12de95defb4de776b4399640be5ae7b2c91388f8 SHA1 9e8ab623ce45cc362b156fed8ffdd67c3294f740 SHA256 5fec01c26a37a793a7c812b0e0c22bd0a0142d1ebfabd21b1bf4f11b73c5526b
 AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748
 DIST bind-9.7.3-P1.tar.gz 7586464 RMD160 838d9089b4f761608c0358a2f897654a7383357b SHA1 4c61aa9ca83310c18e2260748e2f1a5296c83d78 SHA256 5ff684039fda0df27b75a771b66dbe77fd612fb4ade5f4c15960fbb8d62bbbf1
 DIST bind-9.7.3.tar.gz 7653584 RMD160 9e53c9cefa2e8261bc52b5d6d7ed550891d9dce5 SHA1 78e14b3d3e653a8c21b098361b645dee5ed66238 SHA256 7c584ca838da4adb6e94e4507b97b180248ca2b1e6aec1513336b58b344a29f7
@@ -24,16 +24,16 @@ EBUILD bind-9.7.3-r1.ebuild 11624 RMD160 19690cfe501651256d1a2cc1901e93e317b79ce
 EBUILD bind-9.7.3.ebuild 11374 RMD160 9c65021dfb7b8a5e2d5d1efd202d71355ef695aa SHA1 2ef602dc663c0259310e054c771e576a5f1f0e25 SHA256 5da52eab6748d8a03ff41464f39069942fc6cfe39e1a4b575b125151f4e10b1f
 EBUILD bind-9.7.3_p1.ebuild 11613 RMD160 bad58a3f45a5d909b4df04803d959e2c9affe0b4 SHA1 646d7a1fb10980e704fb8ed39f1acb3d70c2b55e SHA256 9aa8a6e64f914d8beeeb44dd1453ebe9dcbe2a7e7c7a913e651df7e2d3613e95
 EBUILD bind-9.8.0_p2-r1.ebuild 12181 RMD160 c4622d839bdb3799a6812777185c459f782cbe02 SHA1 8294dab01a089b4e8a5b542aed465cab45f62af5 SHA256 eeeb2f22e5591ba1e44b0266291ddd4a7c71bfc4e6cdcdd1fcef5675b97f5587
-MISC ChangeLog 58042 RMD160 8d6c939a5245d831dc39a01efd96dabe7d580364 SHA1 f2dc06342d5d07b9cea27614b5b87e1153181278 SHA256 47911a02714dfd52824b83322acd0778348ad4ed1cb0677e77a1b4fe99f35dd0
+MISC ChangeLog 58173 RMD160 7997b0f022ab6c9eda18162ea88233dc862256e7 SHA1 59f7ee3fc8c05bb2ee6e8a60fd6783d2aa3c93d7 SHA256 dde5925d811e997aa504712980b0f92a80bdf4a0fc48dffbc6269c5ed5324bfa
 MISC metadata.xml 686 RMD160 04372d2e822125106bfbec86f7f754b2f8381250 SHA1 efe392ad948d348fb8c1a9a38558fb3cc3e892c8 SHA256 ac17c78fd6d997049a1b1e49be8142e78514bec66e85099c8e946b300fde7c4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJN+lFaAAoJEMOx0zmdw4Z14wMH/320T9D4uBULt4sAW+oMZQ0N
-1kAkCQAaRQ4DPreCNkRqDmjxBJx/uzi3qK+QhWZN7GeSn2fI/7gjU76ejH7qqlrI
-4Cc+fqsNXGaVcmb8Fs54zasmbNrOM0ww5ru4JReaayIJo5t8i31x88noxy4Bhcu7
-N3u48+c9SQjTtYu/3i+hxn46nB6cbDnVISqK5qvMEN+yPDO5tqAtksypu+hxBpSs
-bhjNe7pJhq0Gkv9L3qfWbnfFlJkqBwdA2aIFskNkDFxXxw4rqPlKYA0eS4Qfzrxj
-UvJBXIv962rTcuAd/DAb7erx8oQDyC5lEPtj6RvudJZ94bykwhUYLGTVapMtyE4=
-=h2qg
+iQEcBAEBCAAGBQJN+lHOAAoJEMOx0zmdw4Z1Hw4H/0TeHdj/BmDIum+oZV+1Ik4B
+MS1pKYP4plF9wmwI4yvHXjQh+9ySurMfrHQ28R9sBcAOS/bRUB3qqRHxXXXMOgNr
+L8n5cFx92Ht3shMevEUnfGh+pV3nFjeGkh2/9ta6/CYJnkZc+DmBVko9CshCcyZc
+00smHbEWvWTEY3p2d6OZFODs0dO3HU95ovAU3auTE1qJGLCHNBYJjew/OAPQ92E9
+EfpnW7SN/NDUmcVKckSLJ1o4PEk4wni2wNNuboRvrUg9iWjf+EMOi39uskm4aJvy
+uqe3cbyYrJypIRDx/jMfC/Vs4MfVywBlpiXNqyp0I6/BVg/Dt07WM85D+YoyGt4=
+=Nmlf
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/files/named.init-r11 b/net-dns/bind/files/named.init-r11
index 23bf582645a6..15f744e84b08 100644
--- a/net-dns/bind/files/named.init-r11
+++ b/net-dns/bind/files/named.init-r11
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.1 2011/06/16 18:54:12 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.2 2011/06/16 18:56:09 idl0r Exp $
 
 opts="start stop reload restart checkconfig checkzones"
 
@@ -65,7 +65,7 @@ _umount() {
 _get_pidfile() {
 	# as suggested in bug #107724, bug 335398#c17
 	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
-			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
+			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
 	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/var/run/named/named.pid
 }
 
@@ -99,7 +99,7 @@ checkconfig() {
 		return 1
 	fi
 
-	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} || {
+	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || {
 		eerror "named-checkconf failed! Please fix your config first."
 		return 1
 	}
@@ -110,7 +110,7 @@ checkconfig() {
 
 checkzones() {
 	ebegin "Checking named configuration and zones"
-	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}}
+	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}}
 	eend $?
 }