diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-07-18 13:04:34 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-07-18 13:04:34 +0000 |
| commit | ab768289b60029df0da52739628e5d1c9fa3aaf9 (patch) | |
| tree | 7b121369dae23aa2676d261fb742d92be165f545 /net-ftp/pure-ftpd | |
| parent | ppc stable #322445 (diff) | |
| download | gentoo-2-ab768289b60029df0da52739628e5d1c9fa3aaf9.tar.gz gentoo-2-ab768289b60029df0da52739628e5d1c9fa3aaf9.tar.bz2 gentoo-2-ab768289b60029df0da52739628e5d1c9fa3aaf9.zip | |
Fixed bug in init scripts.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pure-ftpd')
| -rw-r--r-- | net-ftp/pure-ftpd/ChangeLog | 12 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd.rc7 | 4 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd.rc9 | 4 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild (renamed from net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild) | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog index b3ef4730422a..1d590cd5bd0f 100644 --- a/net-ftp/pure-ftpd/ChangeLog +++ b/net-ftp/pure-ftpd/ChangeLog @@ -1,6 +1,16 @@ # 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.96 2010/07/17 12:22:29 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.97 2010/07/18 13:04:34 polynomial-c Exp $ + + 18 Jul 2010; Lars Wendler <polynomial-c@gentoo.org> + -pure-ftpd-1.0.29.ebuild, +pure-ftpd-1.0.29-r1.ebuild, + files/pure-ftpd.rc7, files/pure-ftpd.rc9: + Fixed bug in init scripts. pure-uploadscript doesn't create a pidfile on + its own and s-s-d only creates a valid pidfile when the started program + doesn't put itself into background. Thanks to Marcin Mirosław for + pointing this out in bug #328575. + +*pure-ftpd-1.0.29-r1 (18 Jul 2010) 17 Jul 2010; Lars Wendler <polynomial-c@gentoo.org> pure-ftpd-1.0.29.ebuild, +files/pure-ftpd.rc9: diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 b/net-ftp/pure-ftpd/files/pure-ftpd.rc7 index e34cffb68e7b..312357c8cc31 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.5 2010/03/22 19:41:47 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.6 2010/07/18 13:04:34 polynomial-c Exp $ ftpd_pidfile="/var/run/pure-ftpd.pid" script_pidfile="/var/run/pure-uploadscript.pid" @@ -34,7 +34,7 @@ start() { 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 + start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background -- -r $UPLOADSCRIPT eend $? fi fi diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc9 b/net-ftp/pure-ftpd/files/pure-ftpd.rc9 index 46c7ea70c0f7..71adf9758dd9 100644 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc9 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc9 @@ -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.rc9,v 1.1 2010/07/17 12:22:30 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc9,v 1.2 2010/07/18 13:04:34 polynomial-c Exp $ ftpd_pidfile="/var/run/pure-ftpd.pid" script_pidfile="/var/run/pure-uploadscript.pid" @@ -41,7 +41,7 @@ start() { 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 + start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background ${WAIT} -- -r $UPLOADSCRIPT eend $? fi fi diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild index 387f6568e25b..becc7a21d943 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.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.4 2010/07/17 12:22:29 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.1 2010/07/18 13:04:34 polynomial-c Exp $ EAPI=2 inherit eutils confutils flag-o-matic |