summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-10-18 17:04:00 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-10-18 17:04:00 +0000
commitddc22068a8b54a130ffb53588b45577c42a7a28a (patch)
tree79e4020224a33a119ea90067829a198e1ad6f422 /net-ftp/pure-ftpd
parentRemove unused description for USE="java" (diff)
downloadgentoo-2-ddc22068a8b54a130ffb53588b45577c42a7a28a.tar.gz
gentoo-2-ddc22068a8b54a130ffb53588b45577c42a7a28a.tar.bz2
gentoo-2-ddc22068a8b54a130ffb53588b45577c42a7a28a.zip
Fixed init script once again to be POSIX compliant
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pure-ftpd')
-rw-r--r--net-ftp/pure-ftpd/ChangeLog5
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc114
2 files changed, 6 insertions, 3 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index a7b520fb7a77..520e521be83d 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,9 @@
# 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.126 2011/08/20 16:02:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.127 2011/10/18 17:04:00 polynomial-c Exp $
+
+ 18 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> files/pure-ftpd.rc11:
+ Fixed init script once again to be POSIX compliant.
20 Aug 2011; Jeroen Roovers <jer@gentoo.org> pure-ftpd-1.0.32-r2.ebuild:
Stable for HPPA (bug #376529).
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index 3957e96c9b66..e564dd30fe6c 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.2 2011/05/17 15:09:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.3 2011/10/18 17:04:00 polynomial-c Exp $
ftpd_pidfile="/var/run/pure-ftpd.pid"
script_pidfile="/var/run/pure-uploadscript.pid"
@@ -43,7 +43,7 @@ start() {
ebegin "Starting Pure-FTPd"
start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
- -- ${FTPD_CONFIG//-B}
+ -- $( echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
result=$?
if [ $result -ne 0 ] ; then
eend 1 "Could not launch Pure-FTPd"