Second try to fix bashisms in dante-sockd script (#260151).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 21 insertions, 15 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 8bd6b0aa90b0..31da1cc33fb0 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.44 2009/02/28 09:53:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.45 2009/03/05 19:31:13 mrness Exp $
+
+*dante-1.1.19-r4 (05 Mar 2009)
+
+  05 Mar 2009; Alin Năstac <mrness@gentoo.org> files/dante-sockd-init,
+  -dante-1.1.19-r3.ebuild, +dante-1.1.19-r4.ebuild:
+  Second try to fix bashisms in dante-sockd script (#260151).
 
 *dante-1.1.19-r3 (28 Feb 2009)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 2646cdb50e21..f2db8062004d 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -4,20 +4,20 @@ Hash: SHA1
 AUX dante-1.1.19-libpam.patch 1913 RMD160 6733683c8dae0a201908eca05d2b824442e2dff8 SHA1 c86f7c3ce3a10c3ca12fd4327f2026a56dbfee77 SHA256 324e36fdbaf3b2756d53f48f379121151db8c840546d0986a90f881fba119781
 AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
 AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
-AUX dante-sockd-init 1663 RMD160 d78329e5d5828b4b92ffea83995619eabac475a5 SHA1 f1df222eaba564cffb867082ef4293b89fa75d64 SHA256 7b43c6d417f001efea881ce53dd2a5be9e43201e93619a6fe18520ecf486680e
+AUX dante-sockd-init 1660 RMD160 8fe9aed45d614a691709ead7e72542cfa76417f5 SHA1 1143e90a30d470e3d91146c9ac588d82eaa2e263 SHA256 3297ab1d5a5b1d3324fdac27a626f34ca281aa2664ee9a779aa161dfa41fc2fa
 AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
 AUX sockd.conf-with-libwrap.patch 870 RMD160 f34216f2542bf51563334e1fcaf87f9f687d6fe8 SHA1 c97d9843ef93184c91a69c78b9c09195c5cff232 SHA256 ba4bb30ad5933b890d1b09c6468708f37abf012de3f8696482d1c46c5c1f2978
 AUX sockd.conf-with-pam.patch 295 RMD160 67950c8d3fca41399540644ea47f549631868795 SHA1 599a82ffc4d52e93658dafc13682c9e8530c8a02 SHA256 e67499de8b976e17a9c7c0556e999e03f4bf06e8e57b78ba6dd41a128de0b719
 AUX socks.conf 4185 RMD160 1eaacd974befc24a22fa5f157528fffbfc54992c SHA1 f0f598706e44532f9884dbcadd54942b7acca45e SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f19e0e8a5a9d8
 DIST dante-1.1.19.tar.gz 895713 RMD160 3649207b061b95fdd5b0950ea1ece9219eb8af4c SHA1 e366a60a880ceff6205f7cd87249c7322b844d3c SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
 EBUILD dante-1.1.19-r1.ebuild 2292 RMD160 5dae53e970be15a5c92a627a605cbd8a7650a94e SHA1 e551442998b7a1d6f62086963578ef807d91b62d SHA256 2c216c6c16c810cc76ed60367b4316da8ccf1dd422d4605b5eff527587f440ef
-EBUILD dante-1.1.19-r3.ebuild 2332 RMD160 9e6779e2c70b8a1c955c6d5ff1ffc95823cd70a5 SHA1 cb8ee2f5aad0dde61748d72f08314319616fbf8a SHA256 8b9fa5197bf880b987a10d079ae80839a1673755950250b1ca9222d2d439ff99
-MISC ChangeLog 13298 RMD160 fc7f1e94e2c8f6060aed1e666fac0251a3d48e66 SHA1 5f29e7bcaaf369a4271d6a14de30ac2bbf19f8c3 SHA256 23dfe0bee46144ad6ca1fb2b6b9b100ed5b4d09e669201aedeebb40cba0c6bb3
+EBUILD dante-1.1.19-r4.ebuild 2332 RMD160 fc5920c8d0d726137fa148c4b71087571207b425 SHA1 05f2018d168fb39c561d29e26322a67c5e0fb94e SHA256 1963674bb40b3592673bf2226af92a3a3833fb1b817156a7fb4d477cd68729f8
+MISC ChangeLog 13517 RMD160 99b9a02cd1465cdd967a91e32d7ed9da2c92c1b7 SHA1 52309e941befcfee8cc0b343000772f6d34b2720 SHA256 95f54c181fe2e4d3db027400df75c365c44c937f9e9f608e9aed9c9e910c231e
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmpCawACgkQts85UDFmaOWdFwCfbEvArJdTttyWBrgu4GTxAT7i
-Al4AniaVe51+iB3NtufoL5qnNaQAyDlL
-=0yH/
+iEYEARECAAYFAkmwKIoACgkQts85UDFmaOX0NACeI77Iu51HsRnFSlDU+Y2FQVkt
+n2gAniI2t8rfb4zdJBYgwsyi0ubqC93Y
+=EdlV
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.1.19-r3.ebuild b/net-proxy/dante/dante-1.1.19-r4.ebuild
index 563581d41b6d..0d9da65dd5b8 100644
--- a/net-proxy/dante/dante-1.1.19-r3.ebuild
+++ b/net-proxy/dante/dante-1.1.19-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r3.ebuild,v 1.1 2009/02/28 09:53:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r4.ebuild,v 1.1 2009/03/05 19:31:13 mrness Exp $
 
 inherit eutils autotools
 
diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init
index 336432f938fe..66d02bd6fb2c 100644
--- a/net-proxy/dante/files/dante-sockd-init
+++ b/net-proxy/dante/files/dante-sockd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.5 2009/02/28 09:53:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.6 2009/03/05 19:31:13 mrness Exp $
 
 SOCKD_OPT="-D"
 [ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
@@ -21,8 +21,8 @@ checkconfig() {
 		eerror "for more info, see: man sockd.conf"
 		return 1
 	fi
-	
-	/usr/sbin/sockd -V 2>&1 >/tmp/dante-sockd.checkconf
+
+	/usr/sbin/sockd -V >/tmp/dante-sockd.checkconf 2>&1
 	if [ $? -ne 0 ]; then
 		cat /tmp/dante-sockd.checkconf
 		eerror "Something is wrong with your configuration file"
@@ -30,13 +30,13 @@ checkconfig() {
 		return 1
 	fi
 	rm /tmp/dante-sockd.checkconf
-	
+
 	#Create pidfile with owner set to daemon's uid
 	DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf`
 	if [ -n "$DAEMON_UID" ]; then
 		touch $PIDFILE && chown $DAEMON_UID $PIDFILE 
 	fi
-	
+
 	return 0
 }
 
@@ -44,7 +44,7 @@ start() {
 	checkconfig || return 1
 	ebegin "Starting dante sockd"
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} 2>&1 >/dev/null
+		--make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1
 	eend $? "Failed to start sockd"
 }