summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-03-29 11:33:22 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-03-29 11:33:22 +0000
commita4d7f621745bf11bdc71cf419ae7fed7ea043c9e (patch)
tree42218d272019e90d4d74d0c183c16113a6a28cb9 /net-ftp/pure-ftpd
parentVersion bump to 0.9.1. #404309 (diff)
downloadgentoo-2-a4d7f621745bf11bdc71cf419ae7fed7ea043c9e.tar.gz
gentoo-2-a4d7f621745bf11bdc71cf419ae7fed7ea043c9e.tar.bz2
gentoo-2-a4d7f621745bf11bdc71cf419ae7fed7ea043c9e.zip
Whitespace fixes
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pure-ftpd')
-rw-r--r--net-ftp/pure-ftpd/ChangeLog7
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc118
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild22
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild24
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild24
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild22
6 files changed, 56 insertions, 51 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index ed5a7f6ead8b..4c676342199f 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.130 2012/03/29 11:10:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.131 2012/03/29 11:33:22 polynomial-c Exp $
+
+ 29 Mar 2012; Lars Wendler <polynomial-c@gentoo.org>
+ pure-ftpd-1.0.29-r1.ebuild, pure-ftpd-1.0.32-r2.ebuild,
+ pure-ftpd-1.0.35.ebuild, pure-ftpd-1.0.36.ebuild, files/pure-ftpd.rc11:
+ Whitespace fixes.
*pure-ftpd-1.0.36 (27 Mar 2012)
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index e564dd30fe6c..0c4737e80cd0 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
+# Copyright 1999-2012 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.3 2011/10/18 17:04:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.4 2012/03/29 11:33:22 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} \
- -- $( echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
+ -- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
result=$?
if [ $result -ne 0 ] ; then
eend 1 "Could not launch Pure-FTPd"
@@ -51,7 +51,7 @@ start() {
eend $result
if [ -n "$UPLOADSCRIPT" ] ; then
ebegin "Starting Pure-FTPd upload script"
- start-stop-daemon --start --quiet --make-pidfile\
+ start-stop-daemon --start --quiet --make-pidfile \
--pidfile ${script_pidfile} \
--exec ${script_daemon} --background ${WAIT} \
-- -r $UPLOADSCRIPT
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
index 0f42f0d6dfaa..f4a1c2271489 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r1.ebuild,v 1.4 2011/04/22 12:04:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.5 2012/03/29 11:33:22 polynomial-c Exp $
EAPI=2
inherit eutils confutils flag-o-matic
@@ -17,17 +17,17 @@ SLOT="0"
IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres selinux ssl vchroot xinetd"
DEPEND="caps? ( sys-libs/libcap )
- charconv? ( virtual/libiconv )
- ldap? ( >=net-nds/openldap-2.0.25 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql-base )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- xinetd? ( virtual/inetd )"
+ charconv? ( virtual/libiconv )
+ ldap? ( >=net-nds/openldap-2.0.25 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql-base )
+ ssl? ( >=dev-libs/openssl-0.9.6g )
+ xinetd? ( virtual/inetd )"
RDEPEND="${DEPEND}
- net-ftp/ftpbase
- selinux? ( sec-policy/selinux-ftpd )"
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftpd )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
index 3ae72881185e..42da2d6c06e3 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r2.ebuild,v 1.7 2011/08/20 16:02:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r2.ebuild,v 1.8 2012/03/29 11:33:22 polynomial-c Exp $
EAPI=2
inherit eutils confutils flag-o-matic
@@ -18,18 +18,18 @@ SLOT="0"
IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
DEPEND="caps? ( sys-libs/libcap )
- charconv? ( virtual/libiconv )
- ldap? ( >=net-nds/openldap-2.0.25 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql-base )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- sysquota? ( sys-fs/quota[-rpc] )
- xinetd? ( virtual/inetd )"
+ charconv? ( virtual/libiconv )
+ ldap? ( >=net-nds/openldap-2.0.25 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql-base )
+ ssl? ( >=dev-libs/openssl-0.9.6g )
+ sysquota? ( sys-fs/quota[-rpc] )
+ xinetd? ( virtual/inetd )"
RDEPEND="${DEPEND}
- net-ftp/ftpbase
- selinux? ( sec-policy/selinux-ftpd )"
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftpd )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
index 6ffcc00ded33..558deeb20308 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.35.ebuild,v 1.1 2011/12/08 13:49:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild,v 1.2 2012/03/29 11:33:22 polynomial-c Exp $
EAPI=2
inherit eutils confutils flag-o-matic
@@ -18,18 +18,18 @@ SLOT="0"
IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
DEPEND="caps? ( sys-libs/libcap )
- charconv? ( virtual/libiconv )
- ldap? ( >=net-nds/openldap-2.0.25 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql-base )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- sysquota? ( sys-fs/quota[-rpc] )
- xinetd? ( virtual/inetd )"
+ charconv? ( virtual/libiconv )
+ ldap? ( >=net-nds/openldap-2.0.25 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql-base )
+ ssl? ( >=dev-libs/openssl-0.9.6g )
+ sysquota? ( sys-fs/quota[-rpc] )
+ xinetd? ( virtual/inetd )"
RDEPEND="${DEPEND}
- net-ftp/ftpbase
- selinux? ( sec-policy/selinux-ftpd )"
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftpd )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
index 744f5ff4a817..407294de127b 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.36.ebuild,v 1.1 2012/03/29 11:10:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.2 2012/03/29 11:33:22 polynomial-c Exp $
EAPI=2
inherit eutils confutils flag-o-matic
@@ -18,18 +18,18 @@ SLOT="0"
IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
DEPEND="caps? ( sys-libs/libcap )
- charconv? ( virtual/libiconv )
- ldap? ( >=net-nds/openldap-2.0.25 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql-base )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- sysquota? ( sys-fs/quota[-rpc] )
- xinetd? ( virtual/inetd )"
+ charconv? ( virtual/libiconv )
+ ldap? ( >=net-nds/openldap-2.0.25 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql-base )
+ ssl? ( >=dev-libs/openssl-0.9.6g )
+ sysquota? ( sys-fs/quota[-rpc] )
+ xinetd? ( virtual/inetd )"
RDEPEND="${DEPEND}
- net-ftp/ftpbase
- selinux? ( sec-policy/selinux-ftpd )"
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftpd )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch