summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-03-22 19:41:47 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-03-22 19:41:47 +0000
commiteaee665a4ea70f13b62dc451c2b0f1d945fbfc52 (patch)
treedb22deba726577dbd8cca0ab9613926b15be5ee5 /net-ftp
parentVersion bump. (diff)
downloadhistorical-eaee665a4ea70f13b62dc451c2b0f1d945fbfc52.tar.gz
historical-eaee665a4ea70f13b62dc451c2b0f1d945fbfc52.tar.bz2
historical-eaee665a4ea70f13b62dc451c2b0f1d945fbfc52.zip
Revert rc7 init script changes for 1.0.28 stable request, create rc8 for 1.0.29, spotted by Polynomial-C
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/pure-ftpd/ChangeLog7
-rw-r--r--net-ftp/pure-ftpd/Manifest7
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc74
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc852
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild4
5 files changed, 66 insertions, 8 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/Manifest b/net-ftp/pure-ftpd/Manifest
index d1583f4c047b..69be3581e394 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -4,7 +4,8 @@ AUX pure-ftpd-1.0.22-pam.patch 568 RMD160 510901acb42629a948124bc2e4618b073c6de7
AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
AUX pure-ftpd.rc6 1455 RMD160 5bb57d4e162e08d113da9c349cf57480244948f7 SHA1 54b0abe7e27f10bdec9a22917e57f5ed625ebca3 SHA256 d554e4bab0c11a23c19e8fac9070c2550ca461dce72047745ca9f3fcf2660770
-AUX pure-ftpd.rc7 1524 RMD160 c139d58ead26d313cb35e588918bdda24154aaf5 SHA1 725a99b2e4b28c614e7034126f37cb06d22d3a6a SHA256 01d8c4dd8380402c7441f8286d1342a59205f724196140ff19f02a9cf897b684
+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.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
DIST pure-ftpd-1.0.21.tar.bz2 476117 RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 SHA1 1405ff2b9b9c3616c4e390eb99779884173a3347 SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
DIST pure-ftpd-1.0.22.tar.bz2 497237 RMD160 e7715813f66a561024911b3f8064d1f067969e7f SHA1 38b88f9645cef6c1b6f20a2f7e73ef9289e3314b SHA256 64659df4da59aa2ef5f455674ae1c3b4b56b4649bac1cac582b895942d0059cf
@@ -17,6 +18,6 @@ EBUILD pure-ftpd-1.0.22-r1.ebuild 3785 RMD160 c274c99c5e297e62b61b88b7ddc1e15eaf
EBUILD pure-ftpd-1.0.26.ebuild 3732 RMD160 5f7ef7bd208bcd9972ee0b1d7850350da09ef37c SHA1 4ad2381df161fa784827511feb24d1e9581ed973 SHA256 3d66261f2124dfb03151101a5b17aa5346d3ab1eaca31fd1f9daf8c9bb53893a
EBUILD pure-ftpd-1.0.27-r1.ebuild 3735 RMD160 c5a373298f2db6c2def76f296b6873f5de5be53e SHA1 06362b7de6d0ee13cded041f7ede48905c133c63 SHA256 de9fbd982f62aca7457a8a82144cf63dbdc740658554fb44d812c38dd2be8eec
EBUILD pure-ftpd-1.0.28.ebuild 3729 RMD160 d5d34ebe25b5e7d66631ebb0c489c0342c3b4f83 SHA1 8611e4bd2f4fcb8b6a178f9099f0ab8b162b4bc6 SHA256 335688b45702d7f86017348eac7ca3920e732fc5ee0536e7580c9d5d0b7274cb
-EBUILD pure-ftpd-1.0.29.ebuild 3732 RMD160 0e487451c3c05e9d8e911fa302e0c0437db84e55 SHA1 2c208527674c6a89257bc5835f0d133c81983948 SHA256 e35c40b7276d8f62a833d616ab0f9239988154c5b0ef6f4894477670a6826d35
-MISC ChangeLog 13354 RMD160 eed3200c5d9c00b65a0809e61d1d9bb8cad8e449 SHA1 528df9c3b3e14a2b84c3c63698d84e43f4567426 SHA256 c5574cff1746b012c39329ab1e0d78829f9f2ad298fb2cf5b2a0e03200e824eb
+EBUILD pure-ftpd-1.0.29.ebuild 3732 RMD160 1a35bb6996014dc4bac65c4ae6edca7cb4d252e5 SHA1 432f26fe83de7959288b2d3d8af267dff8f25673 SHA256 2399038ffa1bc4bcb77586a91a0e351bac1eab785f94169752d4ccec622bc26f
+MISC ChangeLog 13591 RMD160 41f074e95f73052499efa3d92bf0025d935d931b SHA1 a3bed65b342adaeba0d4028a74f7dcdc89f01f98 SHA256 a5b1ba18aa0af17e477f8fc151bc15630d6d6493cb6f6b8fb560987f8b9455f4
MISC metadata.xml 1048 RMD160 20c962a5b9b6a0fe6e75346847cc67a079e66870 SHA1 6423ca1d2067eeb0f009b7d8b0a7a35c94ff14b7 SHA256 1d0113e0866ac5d9c4df3a690d141881ad75baf0ad394959025c798bf3af4be0
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