From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 5 Aug 2011 09:30:34 +0000 (+0000)
Subject: Removed --oknodo from rc10 init script
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6e0682330073f6da9d4b817699fcc38891b8d86e;p=gentoo.git

Removed --oknodo from rc10 init script

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

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 8a933f963107..ae33b22a8c2b 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.121 2011/08/02 15:13:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.122 2011/08/05 09:30:34 polynomial-c Exp $
+
+  05 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> files/pure-ftpd.rc10:
+  Removed --oknodo from rc10 init script
 
   02 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   pure-ftpd-1.0.32-r2.ebuild:
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index f93d2f698236..9a38185169ef 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -4,7 +4,7 @@ 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 2055 RMD160 125a410ddc5d63067b7f8c91f1babc7a349da1a3 SHA1 0f7d077b2531e8e9857d3baeeba8b67cc624e99c SHA256 72e8df706f2c856229617daae24dd98e522f11f3420eb515f4627244b63bde7f
+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.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
@@ -12,22 +12,22 @@ DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3713 RMD160 54cc89fff265c7e1a19f02e5843a01f19ff6bf8f SHA1 a1711891e305a6b9fdf2b755851915b6f4f2b175 SHA256 422ec6c7d817238ed65f5d02b3fff7d28469524c5e14e0aa1c1414936c89fc91
 EBUILD pure-ftpd-1.0.32-r2.ebuild 3979 RMD160 f7e94ffaf1c71f36000f55dbc3f662e81aeff9e1 SHA1 f3d2c221f29ba545f614b14a654d3f00d398c9bd SHA256 0431b05bee2b4cd002911d1f0b8b804e6e68100322e41ef218e83453b321f790
 EBUILD pure-ftpd-1.0.32.ebuild 3972 RMD160 e12ad29fd40a1a1064587c965316ffa46038ca20 SHA1 82c2741a239ccd099ff0b601089d486676aab228 SHA256 bd5b8b63340a0038d067f9a01e37ddd8a5dc4fbe0f593f19f5e4552404940ece
-MISC ChangeLog 19540 RMD160 4979291d67873d57012727dede28f9391f0c4d44 SHA1 1fe7b6ca9c06ee234911a3215cccfd80a495a847 SHA256 51c5e2896466f03d6096b07dca02305c6c2edac0200c51b1240fc8be8cd8d26b
+MISC ChangeLog 19662 RMD160 2cbe98b77c85d39f9702ee4e639b7d646dce07dd SHA1 051188790343fcb9b33a1a924d9299e297684422 SHA256 612bb72a07bea8bcd7187c787d0834dcc5cd5077e56ca47bcef67783b72e326c
 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)
 
-iQIcBAEBCgAGBQJOOBQDAAoJEPqDWhW0r/LCTFAP/jfLdutMPoaNbK2NSawD+T3k
-YDaHHZ/kcdCxfOGFHVryOrOpdohAUZzMJbkyZ+A14Rbq4QKzrO9FIdgLvmWBQacq
-THWJ3vGzNg6TAyrIsT6qRNTTS+nwnlxbhTIAgcXaZI4ou7YXjzNxqXKNYlts9KNh
-0eruf1INUOAJGp/ImJ2fD0oQSGMEIt/ycMbfpgI/Y0LTAXom/v0P0KtTSyuut8pF
-CVOpb0zoElKVEl5HGuGA/eZAwd06roK/+PwnzfO+9qvd3cRsjiwSW/UvnUkc8wbY
-awXePFFpivjSpKOmJU8n9kXt4HSzKLO2xaARD6KA95vMzY6sUBBUk7l5EtVtVtcY
-dGj2xWwdundIUQUA89BKywxhjccfcnuD5y2fPD0vpAKJMI0yHkk86Ul3KHWxqb0U
-jGAkRl9VE9QP1K29QZAnloexHe5+tkwimjojcPzgn+/UZt4w3mg53/RASm/g2JR3
-J6u2goWMD+rbJFuLkCSIIkRPKQi4Ia4rLlAPP5J+16kTYL7P6ydxiFunuADdMfPg
-inA/ePo8PWRXAORsbrIOs7CesTTyzFRvnZ2M6FUBsl9Kv9dO1qbKmmOKGiPOpGkJ
-2MgUK5T7eeBUyBnILExJ4m+bDTNik1Ts53KXZzEK8Ol0izCgs2Rme3McLxdpzGPM
-nUcJBWpTRll+GNEov3Gh
-=L6/L
+iQIcBAEBCgAGBQJOO7g/AAoJEPiazRVxLXTFZkYP/iivqHqPn8pfvL+5L+NouuyI
+eq/h6tEMfGcHwgmwSxF9Rhbg25IdcwLEDeZ/BfFaJ4kJEg/gn2WocHepgD8/2y3b
+alugCvwH/U8gQeaMR0NBcqigHZdVPBTC51HqMZEfk7l5lX49oNc0g+Q1s0SzfJBS
+f3blnl+n44WsTY1snV/Jfghwl5xOw361SHkCjDxT++Ekt9WScFf6T0wRmd2fEZ4p
+GTWR/RrDUqZfIcV2N05VxdOAmSriLt59iEf0GSxYskOxsBKAtWkz6vn9nUwE25aE
+7askn/HVYvgEFh9uj0GuqVXHYkzWYJz+Wxspyw2Jw/CUXnXJv0Sss4e8dHye71AR
+sdk7vxwKhTIuyPta45EPQqXAK6i0ve/TPuzgCeGgc6I3TzowfaFnNDqJ3hWkt4Zh
+LLEt9b39tdBFH8rHHKaSUNfz90IZ6JQSqIq2Ab26F8HYr3NPrm11VBK9FSFcAVb8
+XotWNimD6XpcZXsafi4R90wFCwuRAFpJaxndWxlDFi2qNSsJIqsOG3Gj5S5DXJQz
+PckWSfcZNQ9bX5LhNrZCWumPREHPsKUi8p/KNmyHQxpBoa9C2L/N+f07PdxXIa3y
+Hz4iprJkHVuWo/pDWnmgnFQb1lgt19Uo0PV6WkptKw4nAsmiNT9Yz8NnBogKv1Wm
+Jd+P0NuIE8xAQPPRjSOr
+=qbQY
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc10 b/net-ftp/pure-ftpd/files/pure-ftpd.rc10
index 768c565efda6..961ce187402f 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc10
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc10
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# 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.rc10,v 1.1 2010/08/19 08:07:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc10,v 1.2 2011/08/05 09:30:34 polynomial-c Exp $
 
 ftpd_pidfile="/var/run/pure-ftpd.pid"
 script_pidfile="/var/run/pure-uploadscript.pid"
@@ -35,13 +35,11 @@ start() {
 	fi
 
 	UPSCRIPT=""
-	OKNODO=""
 	if [ -n "$UPLOADSCRIPT" ] ; then
 		UPSCRIPT="--uploadscript"
-		OKNODO="--oknodo"
 	fi
 	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
+	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
 	result=$?
 	if [ $result -ne 0 ] ; then
 		eend 1 "Could not launch Pure-FTPd"