Revert rc7 init script changes for 1.0.28 stable request, create rc8 for 1.0.29, spotted by Polynomial-C

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 62 insertions, 5 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index aada1a6908db..a2a0970922d8 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.87 2010/03/21 13:19:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.88 2010/03/22 19:41:45 voyageur Exp $
+
+  22 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  pure-ftpd-1.0.29.ebuild, files/pure-ftpd.rc7, +files/pure-ftpd.rc8:
+  Revert rc7 init script changes for 1.0.28 stable request, create rc8 for
+  1.0.29, spotted by Polynomial-C
 
   21 Mar 2010; Brent Baude <ranger@gentoo.org> pure-ftpd-1.0.28.ebuild:
   Marking pure-ftpd-1.0.28 ppc64 for bug 296166
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
index d672e52305ae..e34cffb68e7b 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc7
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 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.rc7,v 1.4 2010/03/19 10:16:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.5 2010/03/22 19:41:47 voyageur Exp $
 
 ftpd_pidfile="/var/run/pure-ftpd.pid"
 script_pidfile="/var/run/pure-uploadscript.pid"
@@ -26,7 +26,7 @@ start() {
 		OKNODO="--oknodo"
 	fi
 	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd --wait 50 -- --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} $OKNODO --exec /usr/sbin/pure-ftpd -- --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"
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc8 b/net-ftp/pure-ftpd/files/pure-ftpd.rc8
new file mode 100644
index 000000000000..50917f39d609
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc8
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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.rc8,v 1.1 2010/03/22 19:41:47 voyageur Exp $
+
+ftpd_pidfile="/var/run/pure-ftpd.pid"
+script_pidfile="/var/run/pure-uploadscript.pid"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "$IS_CONFIGURED" ] ; then
+		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	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 100 -- --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"
+	else
+		eend $result
+		if [ -n "$UPLOADSCRIPT" ] ; then
+			ebegin "Starting Pure-FTPd upload script"
+			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
+			eend $?
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Stopping Pure-FTPd"
+	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
+	eend $?
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		ebegin "Stopping Pure-FTPd upload script"
+		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
+		eend $?
+	fi
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild
index b02988ae13e6..02768db8dd59 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.29.ebuild,v 1.1 2010/03/19 10:16:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild,v 1.2 2010/03/22 19:41:45 voyageur Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -88,7 +88,7 @@ src_install() {
 
 	newconfd "${FILESDIR}/pure-ftpd.conf_d" pure-ftpd
 
-	newinitd "${FILESDIR}/pure-ftpd.rc7" pure-ftpd
+	newinitd "${FILESDIR}/pure-ftpd.rc8" pure-ftpd
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d