Fixed init script once again to be POSIX compliant

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

3 files changed, 23 insertions, 10 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index a7b520fb7a77..520e521be83d 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.126 2011/08/20 16:02:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.127 2011/10/18 17:04:00 polynomial-c Exp $
+
+  18 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> files/pure-ftpd.rc11:
+  Fixed init script once again to be POSIX compliant.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> pure-ftpd-1.0.32-r2.ebuild:
   Stable for HPPA (bug #376529).
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index d9a9659fc3be..e7663157b7c6 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,23 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
 AUX pure-ftpd.conf_d-2 3778 RMD160 4e7d6c5fffd56ee3b0dffc6e5873f3d854b9bfaa SHA1 631030ed9249101594c1cb08e549bf34c99c5105 SHA256 8e48df3365bd74a1d8fa7c394e035c69bf7953a70ccc417377c9c881097bddca
 AUX pure-ftpd.conf_d-3 3728 RMD160 b5ebccffeb17232819bf794348549d0400e930ae SHA1 5ae244dacc725d617444dd1712a22399f1f02cb7 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b25edb7a85f1bb88e5fa
 AUX pure-ftpd.rc10 2016 RMD160 d15fa13a71a13121810dd45f1a2d9f8e895a65b3 SHA1 35f31d1c443989f8e14d277dcc3adffaca955b1b SHA256 fa04d693578ff449a36f291ced5ee553f6f27f0995e1243acdfe53d666eb2f8a
-AUX pure-ftpd.rc11 2073 RMD160 55ae17d0f54e7ddf9c4e975740222c90ce896eb3 SHA1 0029972912abe776842429cde0500a046b0ae692 SHA256 237c6c2c98046a7fcf58f82b4e7b8fd9d09df5ff1cce44b3ed64eaea7415ff04
+AUX pure-ftpd.rc11 2136 RMD160 50d9b81fc91fbd974972a0371bed53666bfe5813 SHA1 1c717b495a3d7a267476286ca90b856ef2823427 SHA256 0c0aeff81858c61a10389062942ae1b936cf13406e4e41edd27c5f6524f30fc0
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4b8ef SHA1 589f5e35771f6b481d3b56b466282bd1f50da7c9 SHA256 f1b99a9b238c330a3efea03af2f15d56b2447e6028e3b68ce9a2d261c0d520a4
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3713 RMD160 54cc89fff265c7e1a19f02e5843a01f19ff6bf8f SHA1 a1711891e305a6b9fdf2b755851915b6f4f2b175 SHA256 422ec6c7d817238ed65f5d02b3fff7d28469524c5e14e0aa1c1414936c89fc91
 EBUILD pure-ftpd-1.0.32-r2.ebuild 3968 RMD160 781ed4ce6ceaa9c3acf8bd62114472cbc9f41b53 SHA1 eeae05bd969e97bbb4738d420cc05f651625344d SHA256 362d366d470e9ee986a6494fa835615f22bc0721078f9efbe150f232ad0d2de8
 EBUILD pure-ftpd-1.0.32.ebuild 3972 RMD160 e12ad29fd40a1a1064587c965316ffa46038ca20 SHA1 82c2741a239ccd099ff0b601089d486676aab228 SHA256 bd5b8b63340a0038d067f9a01e37ddd8a5dc4fbe0f593f19f5e4552404940ece
-MISC ChangeLog 20096 RMD160 a1b4c48db91e1cdac17c2439ab6422e25abdf499 SHA1 e63a9a9c11780518a8ee3515b0896666dacecdba SHA256 6af1834a96bbafe08486db90ee991c5c0c4284a61c231cb7ed196163645dc189
+MISC ChangeLog 20236 RMD160 8b3ff846a621c30fa41e9884485a189cada0eea2 SHA1 2e96b93069171ef0d7391e1bc576f091add2233b SHA256 49b1b5da4ea6b9b98aa5329541f7de15d116bb65381f85faee989562c66a3244
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5P2pwACgkQVWmRsqeSphPZPQCeIcZYiDoWSGZxRVveAo9oIQqj
-TBoAn0Dz5Ae7qGiTvULn8lQg84swoVRM
-=CWNQ
+iQIcBAEBCgAGBQJOnbGFAAoJEPiazRVxLXTFgoQQAOAr6uKsKws86esaDSMKyDLB
+tZROnIISmqjQvj7T0w+azXAil/8p18dJ98NPCL2B/0+tEZi0LqWnHjR0uABNrqtp
+u13d7r+XEQqGVFMbEYF+wuhEzXNrL8MaaetWpeZQaJ2l+k1HGRY6GDw+w44OZa1M
+PrHl/ALpjXYpkg49h8Aa5A+dJyq7tY4GStBZY20aa8DHraJhvqB+O4BUN9gBl+QG
+xIYTAhrkxt5C0g9NW+Z3G4UXaQvn0WYJUORtCB0hjAXychdQil6zeHP/cnbWnzBY
+ZKIHzAa85aQxwHRpsNoGv8N6qz3Rj114GxhRpK4Kj8tpr8gvMNvr1bdgpqLnjOXl
+oAMe78cHdMIKFYyq6lGRWuE7puyRV9+D8HIYHV/wigUZtc1udqp59Be5mSBUu2Eg
+ZbJcvkGftFFDCTJQS/0DExq3Nhk3xpeYegNQg4VldQoqOSHtZkOqBKvC2CAknBmC
+KAmbwLmtgslIwAalxW93nabJQTezqty2OVSUOcxbUJHwTLNRNiVAHETZ5kZKWpxC
+eluZf2lawtdivSVZuA3wqcoAQx87/gqe+fngmZ0B6Unf7/V6c+o8wmBqbG6ChFz/
+LpuGmjbA2m9aToiyN1IZVb0u5uBQ7vLn8B3N401FnNj5Y+fpGIwpkKPFxbMOaEY+
+iAoaUYBgeqWaSRrv5/rX
+=agl3
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index 3957e96c9b66..e564dd30fe6c 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
@@ -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-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.2 2011/05/17 15:09:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.3 2011/10/18 17:04:00 polynomial-c Exp $
 
 ftpd_pidfile="/var/run/pure-ftpd.pid"
 script_pidfile="/var/run/pure-uploadscript.pid"
@@ -43,7 +43,7 @@ start() {
 	ebegin "Starting Pure-FTPd"
 	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
 		--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
-		-- ${FTPD_CONFIG//-B}
+		-- $( echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
 	result=$?
 	if [ $result -ne 0 ] ; then
 		eend 1 "Could not launch Pure-FTPd"