diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-05-17 15:09:50 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-05-17 15:09:50 +0000 |
| commit | 5eb1ff8cf1b999270ed6ce78d35b80ae0a91afc0 (patch) | |
| tree | e3a01566dabaa4c0790cd6882eed89678061af35 /net-ftp/pure-ftpd | |
| parent | whitespace (diff) | |
| download | gentoo-2-5eb1ff8cf1b999270ed6ce78d35b80ae0a91afc0.tar.gz gentoo-2-5eb1ff8cf1b999270ed6ce78d35b80ae0a91afc0.tar.bz2 gentoo-2-5eb1ff8cf1b999270ed6ce78d35b80ae0a91afc0.zip | |
Fixed --uploadscript parameter in init script
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pure-ftpd')
| -rw-r--r-- | net-ftp/pure-ftpd/ChangeLog | 9 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd.rc11 | 15 | ||||
| -rw-r--r-- | net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild (renamed from net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild) | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog index a8bdba1efbb4..ff0cfe552075 100644 --- a/net-ftp/pure-ftpd/ChangeLog +++ b/net-ftp/pure-ftpd/ChangeLog @@ -1,6 +1,13 @@ # 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.118 2011/05/16 14:54:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.119 2011/05/17 15:09:50 polynomial-c Exp $ + +*pure-ftpd-1.0.32-r2 (17 May 2011) + + 17 May 2011; Lars Wendler <polynomial-c@gentoo.org> + -pure-ftpd-1.0.32-r1.ebuild, +pure-ftpd-1.0.32-r2.ebuild, + files/pure-ftpd.rc11: + Fixed --uploadscript parameter in init script. *pure-ftpd-1.0.32-r1 (16 May 2011) diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11 index 49ebf84fb961..3957e96c9b66 100644 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11 @@ -1,7 +1,7 @@ #!/sbin/runscript # 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.rc11,v 1.1 2011/05/16 14:54:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.2 2011/05/17 15:09:50 polynomial-c Exp $ ftpd_pidfile="/var/run/pure-ftpd.pid" script_pidfile="/var/run/pure-uploadscript.pid" @@ -23,9 +23,16 @@ checkconfig() { start() { checkconfig || return 1 + UPSCRIPT="" + if [ -n "$UPLOADSCRIPT" ] ; then + UPSCRIPT="--uploadscript" + fi + FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT" + WAIT="--wait 100" + if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then [ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}" einfo "Mounting tmpfs on ${ftpd_rundir}" @@ -33,12 +40,6 @@ start() { || eerror "Unable to mount tmpfs" fi - WAIT="--wait 100" - - UPSCRIPT="" - if [ -n "$UPLOADSCRIPT" ] ; then - UPSCRIPT="--uploadscript" - fi ebegin "Starting Pure-FTPd" start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \ --make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \ diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild index 6ab4b14c047b..ea262503130f 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild @@ -1,6 +1,6 @@ # 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/pure-ftpd-1.0.32-r1.ebuild,v 1.1 2011/05/16 14:54:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild,v 1.1 2011/05/17 15:09:50 polynomial-c Exp $ EAPI=2 inherit eutils confutils flag-o-matic |