Remove bashisms from init script, bug #169636.

Package-Manager: portage-2.1.2.2

3 files changed, 31 insertions, 19 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index af318018a84e..e4ef131da418 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/pdns
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.40 2006/11/23 17:19:49 vivo Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.41 2007/03/12 19:56:07 swegener Exp $
+
+  12 Mar 2007; Sven Wegener <swegener@gentoo.org> files/pdns:
+  Remove bashisms from init script, bug #169636.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> pdns-2.9.20-r1.ebuild,
   pdns-2.9.20-r2.ebuild:
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7e19d6a83089..f9ba56c0ef48 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b SHA1 d265706bb723f1a878a65c7c0db59a88e67f0816 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151
 MD5 90fb32e843326d14359c508cef855929 files/2.9.18-default-mysql-options.patch 606
 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b files/2.9.18-default-mysql-options.patch 606
@@ -6,10 +9,10 @@ AUX 2.9.20-ldap-deprecated.patch 457 RMD160 edcb367abfc83853e4739cc6646ca593ae7d
 MD5 2cc96f8436323eca57fb95a63ea39efd files/2.9.20-ldap-deprecated.patch 457
 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e files/2.9.20-ldap-deprecated.patch 457
 SHA256 862728373669f7ea5544de7021c394cc0efa3ff5c65551d6657dad85cb654097 files/2.9.20-ldap-deprecated.patch 457
-AUX pdns 1239 RMD160 f93c9433ab4bfa0ac99ce7cdd271bd8ed17eacc3 SHA1 a8708f242bc87286a6f20be9a3a12a3ee9a9a864 SHA256 7661254d3a82ee8f51998fdfe0bce8dde7923c593cac01c17a2d5211b2f5a12c
-MD5 6fa5c2c010c4375afd1687a92d84e9bc files/pdns 1239
-RMD160 f93c9433ab4bfa0ac99ce7cdd271bd8ed17eacc3 files/pdns 1239
-SHA256 7661254d3a82ee8f51998fdfe0bce8dde7923c593cac01c17a2d5211b2f5a12c files/pdns 1239
+AUX pdns 1248 RMD160 458039f6772760d1b127e13ec6c3155d75d8e88a SHA1 0b518c1cc20abb3afd63e05292b693bd8868eb32 SHA256 d5315848fee9983511b8ad9d34611c734260fb0e25093f7443cb5a6b373a57c7
+MD5 ae88ae9c09aa025bb501c60a7b0ad8eb files/pdns 1248
+RMD160 458039f6772760d1b127e13ec6c3155d75d8e88a files/pdns 1248
+SHA256 d5315848fee9983511b8ad9d34611c734260fb0e25093f7443cb5a6b373a57c7 files/pdns 1248
 AUX precursor 488 RMD160 f6805c9603959c22a4cc8b7a33e3fbf7ff58cd04 SHA1 bcd434a5b185673eb751d2b8e057898c50910c81 SHA256 a9c7af4dcc8cf51c8a4cc0e3ca94ca6e9da13dbd6f69bf9169e23790b831da32
 MD5 8e0042dfb20242b87780089a6ace2faf files/precursor 488
 RMD160 f6805c9603959c22a4cc8b7a33e3fbf7ff58cd04 files/precursor 488
@@ -27,10 +30,10 @@ EBUILD pdns-2.9.20-r2.ebuild 2621 RMD160 9d415587ffb54ffff397d62fb7ec37065e6282d
 MD5 5b5e6d42c233861497e29635ffe6194b pdns-2.9.20-r2.ebuild 2621
 RMD160 9d415587ffb54ffff397d62fb7ec37065e6282df pdns-2.9.20-r2.ebuild 2621
 SHA256 5d68a24a324f4da34a8208cbb821cd4369cc28cb0e1f5cd1902b83d784879b9e pdns-2.9.20-r2.ebuild 2621
-MISC ChangeLog 6704 RMD160 1ec4d46e1d03171f747c167d8696ff0e09df0899 SHA1 d05d258e1d2b4b4f4f8a0bd35839477c97627adb SHA256 855b835d878db3c6527e904f83f48623c179ab80b7f455041dc7cc2ba856a2f0
-MD5 55ff1662f04fda9bcaa4817ac2193d5c ChangeLog 6704
-RMD160 1ec4d46e1d03171f747c167d8696ff0e09df0899 ChangeLog 6704
-SHA256 855b835d878db3c6527e904f83f48623c179ab80b7f455041dc7cc2ba856a2f0 ChangeLog 6704
+MISC ChangeLog 6820 RMD160 1d34511d153c2bda9fdea7f1179011d3dfec2f50 SHA1 3f65c98c80209a2a93951001a3148e5d00a2d1b0 SHA256 5ffd5479f4ba9142c6f3cf119333411563cfaf4020cd612a1ce7b169786617aa
+MD5 3306e07192e141e972d1e16880a467ba ChangeLog 6820
+RMD160 1d34511d153c2bda9fdea7f1179011d3dfec2f50 ChangeLog 6820
+SHA256 5ffd5479f4ba9142c6f3cf119333411563cfaf4020cd612a1ce7b169786617aa ChangeLog 6820
 MISC metadata.xml 573 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 SHA1 01c4329b63991b54af3559d2220251520cb7147a SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3
 MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 metadata.xml 573
@@ -41,3 +44,10 @@ SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/di
 MD5 4d4c82f77383d45b0f3c812506353f02 files/digest-pdns-2.9.20-r2 235
 RMD160 dcc067109bce2032ef801cb2f77a19cf70b863dc files/digest-pdns-2.9.20-r2 235
 SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/digest-pdns-2.9.20-r2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9bBfI1lqEGTUzyQRAmuiAJ9DGftirZM4odDeXoa0paso+5IQ2wCgklMi
+ECvv49bERB+AHT0euqZRY4g=
+=SVU7
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 2d8373b3475b..2543bfded3e1 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,19 +1,18 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.8 2006/08/15 19:35:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.9 2007/03/12 19:56:07 swegener Exp $
 
-opts="${opts} reload monitor dump"
+opts="reload monitor dump"
 
-# Default instance
-PDNS_INSTANCE="default"
+PDNS_INSTANCE="${SVCNAME#pdns[.-]}"
 PDNS_CONFIG=""
 
-# Multiple instances support
-if [[ ${SVCNAME:0:5} = pdns[.-] && -n ${SVCNAME:5} ]]
+if [ -n "${PDNS_INSTANCE}" ] && [ "${PDNS_INSTANCE}" != "pdns" ]
 then
-	PDNS_INSTANCE="${SVCNAME:5}"
 	PDNS_CONFIG="--config-name=${PDNS_INSTANCE}"
+else
+	PDNS_INSTANCE="default"
 fi
 
 depend() {
@@ -46,6 +45,6 @@ dump() {
 
 monitor() {
        ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
-       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9
+       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9 --log-dns-details=yes --query-logging=yes
        eend $?
 }