Added a new init script which should wrk with both baselayout-1 and openrc.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 71 insertions, 5 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index a6db855ca6ba..b3ef4730422a 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.95 2010/07/17 08:59:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.96 2010/07/17 12:22:29 polynomial-c Exp $
+
+  17 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+  pure-ftpd-1.0.29.ebuild, +files/pure-ftpd.rc9:
+  Added a new init script which should wrk with both baselayout-1 and
+  openrc. Keep the old (now unused) init script for a while until we can be
+  sure the new one causes no regressions.
 
   17 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
   -pure-ftpd-1.0.21-r1.ebuild, -files/pure-ftpd-1.0.21-pam.patch,
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 0ec89b542255..a8e171c40abf 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -2,10 +2,11 @@ AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55
 AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
 AUX pure-ftpd.rc7 1514 RMD160 2a9d672cc22a53b778a595f81724d75a3b682e74 SHA1 59cd580846a60d340f5d945c4d83637879aae09d SHA256 39deccfc5322ab7adf848d455bfbb08937779ee593cd60ccfa801a504cd22895
 AUX pure-ftpd.rc8 1525 RMD160 493bb88ed4fcd2a6cf0bd0f878e365c54dd2f37f SHA1 881ae446be0cb7eabf537ffd4933e19dcab4c77d SHA256 2ce7c27ffeff40d02f3ef7f6b7f15cfbd218d4942b6da49506451f7acd975612
+AUX pure-ftpd.rc9 1622 RMD160 6d4120cd45f74b8b8fe93d2ec9e1629bcefc82d4 SHA1 38cb67d24af6fb673f2e1ce9dc6ea98bba5a55ce SHA256 9f01e308b7ebea9a34803e1f8b93c6f482e7a347f598a427772ac6fd408e5bfc
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
 DIST pure-ftpd-1.0.28.tar.bz2 465887 RMD160 1a75ea239129de1f2bcd52a34d1b379928e790f6 SHA1 199580574257f144bc958d05c166c23066bfed3c SHA256 1c8e0f4ddac3731ecb2432631d7af342b3800499d7ea7f8442c3e79e3e4c27d8
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 EBUILD pure-ftpd-1.0.28.ebuild 3721 RMD160 67af40e1e03c1a7142a91377a78b6d7bec393bf8 SHA1 1bf4deeddae2cbe6bab839d0f509374f20c104be SHA256 af1b24c251810c542a552ead29b7979fd2966375a44de6595889a23785e5558a
-EBUILD pure-ftpd-1.0.29.ebuild 3730 RMD160 f619bd9eaa142fb845775d47307ebcbfa346a07a SHA1 52298b59ca2de800ab616f750cb7ea3da4f26964 SHA256 fd2a060d4b2c6278785d6bf1ffcbf6ca518f464f3a0c5aa634a460811802f8cd
-MISC ChangeLog 14744 RMD160 4595ed305b5fdf991053a540dff2d59be6981525 SHA1 75652988e428f06d733305d60bb240fec3dab272 SHA256 d040c150922ffec4793a555f86d7f187198276715020c38a81dcc264933223eb
+EBUILD pure-ftpd-1.0.29.ebuild 3735 RMD160 c02bc2dbbbcdb7a82a5f7ad4d84cdcda0b498d1b SHA1 b465042fbd0b4a6b2f5b0422b26a65f2c3965fe6 SHA256 cd9c4b5c51ad2fe37a261ddc00b936a482c29768a07199777015067c1176bb0f
+MISC ChangeLog 15036 RMD160 a363c3230fe492a84dde06647ba8099a1bccf85a SHA1 4d292cfc95d2ec80117d99994b51cfb7e4b2b9cb SHA256 51f8174a65b415844bbba49e4f673d99d445fe6168829d6ba5a13b462a9d5ced
 MISC metadata.xml 1051 RMD160 d27a44ab81aa6b193a4b68abc6283bc8d1c874c7 SHA1 04bd0e08ccb869060d6654c735963ec70225c237 SHA256 bb94d642cc078247b871cd16bad43aa4d74a5abd204eaa30421ade04e7ad8785
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc9 b/net-ftp/pure-ftpd/files/pure-ftpd.rc9
new file mode 100644
index 000000000000..46c7ea70c0f7
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc9
@@ -0,0 +1,59 @@
+#!/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.rc9,v 1.1 2010/07/17 12:22:30 polynomial-c 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
+
+	# only works with openrc
+	WAIT=""
+	if [ -f /etc/init.d/sysfs ]; then
+		WAIT="--wait 100"
+	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
+	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 be17305c09f7..387f6568e25b 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.3 2010/06/17 20:46:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild,v 1.4 2010/07/17 12:22:29 polynomial-c 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.rc8" pure-ftpd
+	newinitd "${FILESDIR}/pure-ftpd.rc9" pure-ftpd
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d