Fixed --uploadscript parameter in init script

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

4 files changed, 33 insertions, 25 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index a8bdba1efbb4..ff0cfe552075 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.118 2011/05/16 14:54:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.119 2011/05/17 15:09:50 polynomial-c Exp $
+
+*pure-ftpd-1.0.32-r2 (17 May 2011)
+
+  17 May 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -pure-ftpd-1.0.32-r1.ebuild, +pure-ftpd-1.0.32-r2.ebuild,
+  files/pure-ftpd.rc11:
+  Fixed --uploadscript parameter in init script.
 
 *pure-ftpd-1.0.32-r1 (16 May 2011)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index aa792b597108..897ca991dec4 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -5,29 +5,29 @@ AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55
 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 2055 RMD160 125a410ddc5d63067b7f8c91f1babc7a349da1a3 SHA1 0f7d077b2531e8e9857d3baeeba8b67cc624e99c SHA256 72e8df706f2c856229617daae24dd98e522f11f3420eb515f4627244b63bde7f
-AUX pure-ftpd.rc11 2072 RMD160 dcdc4ce4e3820b0c5f7e86e14a1f2922ad72cd70 SHA1 c43860e7863ac9bc114e693ef4ad16afc10338b2 SHA256 87d3d74f67c3e76af00cb081b20f67fa996a280147ea3fe34140ffab2c801049
+AUX pure-ftpd.rc11 2073 RMD160 55ae17d0f54e7ddf9c4e975740222c90ce896eb3 SHA1 0029972912abe776842429cde0500a046b0ae692 SHA256 237c6c2c98046a7fcf58f82b4e7b8fd9d09df5ff1cce44b3ed64eaea7415ff04
 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-r1.ebuild 3986 RMD160 5b3549b8a7fada72e23a33bfebd9e21d278fb660 SHA1 7fe6567ed4e65306b3cc20dc137033b9f46793ec SHA256 b5701826fbb1a95d3052f3e3d9dd2d5465632c3c053d869df094d2634a721905
+EBUILD pure-ftpd-1.0.32-r2.ebuild 3986 RMD160 10e32f49e3d9674106b83a93a830dc0c0d657eda SHA1 9e5a96e0395f3ad281535ed1f1e2b5f0fc4caf52 SHA256 b135e94810bb4e6a868908f9f5a22facd186d630aee002648c840c3e24909f80
 EBUILD pure-ftpd-1.0.32.ebuild 3972 RMD160 e12ad29fd40a1a1064587c965316ffa46038ca20 SHA1 82c2741a239ccd099ff0b601089d486676aab228 SHA256 bd5b8b63340a0038d067f9a01e37ddd8a5dc4fbe0f593f19f5e4552404940ece
-MISC ChangeLog 19086 RMD160 f56d94f1197403c20bc42ad6686ec971a4a1db5d SHA1 3924a0e1663b14597567104963ccd2f859c6562f SHA256 836bd70c260e215a36f17549917562ad33f2183ee489e86c99c224daf2f1e893
+MISC ChangeLog 19310 RMD160 5126b1ecc8759d5a2bb8512f8d186f58e106efa3 SHA1 4d513b306deeca656b56d2a45eb61a59af080467 SHA256 f42ebe7337b7f291251ab1a1966839ba7b38bb4722d12c26b224073752bc9226
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN0TrCAAoJEPiazRVxLXTFlvoQAKz9tfthpevKJEYy25EXVsCE
-voBxSI9aYri0G/LWhhqfpwHQb2K12bUueNVa6XSWsA/KYrYjt4Ra+WLltJdxy3BC
-fAtNQfjp2z839585IHYVvI9kDtqcXwpXfpVjgSR9pFKbFYw36r0PsVTYBpOuoJbJ
-LHbZpQaLFL+VsHCfXVUSyOoUr/pETcrxMR8cMtsZaQoc+n13Sdym+uAWpmemwVK3
-CHEia5n54ZkFoFP6qSmHrwOYWv7K9En9C1UyPsX5LQ51bf18J9VzGM3AkBUGvB4p
-Yg5fUEtCebRbQ/irCwfPdCv2LP3r6Xeu0Dtf8b/rneM1pCyw2B9q9xpnGBrh6cmh
-k0cX3RHqUz3GDa0TzSW1d5N0KEGkuWOuyqOFNU3mpV+XDFSbxkeC6PmohGXNk5AS
-Wd59JdIhAR3MQ87AGTJd9bUAu5/1vS4G8DwBAegWTp5pKgRbRFtOz25G0GpUbJmB
-ZfdiJBJABtE3YYjThI2pM3Tf1/ATbiuoMzPMq4R2NtAz8NJWhK8XcIeLlcgdX8n0
-6b5cPxPV4zg4YBSY30FkZIjWLDpEkcN7oRNYBl8WW8mTG8x/UrGAUD/v+BBISNNa
-BRFd3sQM4QKNCaA/UiQ1dokGIQgP5sDQclyhWj+K1RAzttpHilHpjFOWiPfWAS6p
-gJlJdjI8gXUYUpibZ7Kt
-=6qeZ
+iQIcBAEBCgAGBQJN0o/EAAoJEPiazRVxLXTFYw8QANu+/0/h8d1zsBaWZeTFeQuW
+QZNNXrdBsLF2iCbW8Xqq3FkqyacKdUGBtCVVBo5IKUV1nRrS9Vj+JrKIkJ4kodvL
+NzoikfXPYSxgA5aDv9/C/znAY/DMRAN9Qdige/IZuy2tw1dZcW3FhZBLHal7a7Zn
+d6DewqJpz0O42v6u4JOMO/V+2pYNdDfqMTQkQQw0fKXOit2ahZAvPkizPa4GScto
+xeQcHCjzxQjCR3hIGLb1nmxd598oUj+MLJJocFa1Ql4u+LlSO6lOmwNYr27pney4
+GEYaQN0OzKMhBNMLdH1aOf1xBD4aTDCM5FyAtwqL/hbQeeDO2dhcoPBRvId5GulG
+Ov9emixAoViAuFUD+9oc3+Hi3/+/ja4yaqE6/1OkjC6g6sklIoQ10foXvrUKA+l1
+3ZsSbYPY6cJNBNFKEMN+Cx5i+2xR/lUmhLPXarCQExwVGgxrqjVsbQIHoVAAZkwy
+/JAD28XhL75EgZY7znETZVDu0PoPzpEsdIwotQg5S1nmib4oCne9PqKORWYza0dL
+gr+eTP39q6hhWNGkuuIqqqnToIrPn7LzxpuQwfDsR38JoIDNmyjSWIOZ6uEaTe91
+jk7GJUglxxY7x5X8xel4T2FU4ggrCLxrK8dSwWe4UfVzcBWpaajor0krIOOj3D2C
+fyusFIp9O7C3DiKMRju2
+=Cx2U
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index 49ebf84fb961..3957e96c9b66 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.1 2011/05/16 14:54:53 polynomial-c Exp $
+# $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 $
 
 ftpd_pidfile="/var/run/pure-ftpd.pid"
 script_pidfile="/var/run/pure-uploadscript.pid"
@@ -23,9 +23,16 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
+	UPSCRIPT=""
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		UPSCRIPT="--uploadscript"
+	fi
+
 	FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH
 		     $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT"
 
+	WAIT="--wait 100"
+
 	if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then
 		[ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}"
 		einfo "Mounting tmpfs on ${ftpd_rundir}"
@@ -33,12 +40,6 @@ start() {
 			|| eerror "Unable to mount tmpfs"
 	fi
 
-	WAIT="--wait 100"
-
-	UPSCRIPT=""
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		UPSCRIPT="--uploadscript"
-	fi
 	ebegin "Starting Pure-FTPd"
 	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
 		--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
index 6ab4b14c047b..ea262503130f 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
@@ -1,6 +1,6 @@
 # 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/pure-ftpd-1.0.32-r1.ebuild,v 1.1 2011/05/16 14:54:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild,v 1.1 2011/05/17 15:09:50 polynomial-c Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic