Remove old version. Fix bugs #173365, #179375 and #182906.

(Portage version: 2.1.5_rc4)

5 files changed, 24 insertions, 133 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 1d6f8cf9115d..d5e4cdcdb296 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/pure-ftpd
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.72 2007/08/02 15:55:22 uberlord Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.73 2008/04/18 11:00:43 chtekk Exp $
+
+  18 Apr 2008; Luca Longinotti <chtekk@gentoo.org> -files/ftpusers,
+  files/pure-ftpd.rc6, -pure-ftpd-1.0.20-r1.ebuild,
+  pure-ftpd-1.0.21-r1.ebuild:
+  Remove old version. Fix bugs #173365, #179375 and #182906.
 
   02 Aug 2007; Roy Marples <uberlord@gentoo.org> pure-ftpd-1.0.20-r1.ebuild,
   pure-ftpd-1.0.21-r1.ebuild:
diff --git a/net-ftp/pure-ftpd/files/ftpusers b/net-ftp/pure-ftpd/files/ftpusers
deleted file mode 100644
index df1b69c0b0ad..000000000000
--- a/net-ftp/pure-ftpd/files/ftpusers
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/ftpusers: list of users disallowed FTP access.
-# 
-
-daemon
-bin
-sys
-sync
-games
-man
-lp
-mail
-news
-uucp
-proxy
-majordom
-postgres
-www-data
-backup
-msql
-operator
-list
-irc
-nobody
-
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc6 b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
index 86bcae35b2ff..8f1d5f38b28d 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc6
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# 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.rc6,v 1.10 2006/09/23 23:12:14 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc6,v 1.11 2008/04/18 11:00:43 chtekk Exp $
 
 depend() {
 	need net
@@ -17,11 +17,13 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	UPSCRIPT=""
+	OKNODO=""
 	if [ -n "$UPLOADSCRIPT" ] ; then
 		UPSCRIPT="--uploadscript"
+		OKNODO="--oknodo"
 	fi
 	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-ftpd.pid --exec /usr/sbin/pure-ftpd -- $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
+	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-ftpd.pid $OKNODO --exec /usr/sbin/pure-ftpd -- $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/pure-ftpd-1.0.20-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
deleted file mode 100644
index 264f708a87c0..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 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.20-r1.ebuild,v 1.16 2007/08/02 15:55:22 uberlord Exp $
-
-inherit eutils confutils
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="caps ldap mysql pam postgres selinux ssl vchroot"
-
-DEPEND="caps? ( sys-libs/libcap )
-		ldap? ( >=net-nds/openldap-2.0.25 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( >=dev-db/postgresql-7.2.2 )
-		ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND="${DEPEND}
-		selinux? ( sec-policy/selinux-ftpd )"
-
-src_compile() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" -i "${S}/src/ftpd.h" || die "sed failed"
-
-	local my_conf=""
-
-	# Let's configure the USE-enabled stuff
-	enable_extension_without	"capabilities"	"caps"
-	enable_extension_with		"ldap"			"ldap"			0
-	enable_extension_with		"mysql"			"mysql"			0
-	enable_extension_with		"pam"			"pam"			0
-	enable_extension_with		"pgsql"			"postgres"		0
-	enable_extension_with		"tls"			"ssl"			0
-	enable_extension_with		"virtualchroot"	"vchroot"		0
-
-	econf \
-		--with-altlog \
-		--with-cookie \
-		--with-diraliases \
-		--with-extauth \
-		--with-ftpwho \
-		--with-largefile \
-		--with-peruserlimits \
-		--with-privsep \
-		--with-puredb \
-		--with-quotas \
-		--with-ratios \
-		--with-throttling \
-		--with-uploadscript \
-		--with-virtualhosts \
-		${my_conf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
-
-	if use pam ; then
-		cp -f "${FILESDIR}/ftpusers" "${D}/etc/ftpusers"
-		insinto /etc/pam.d
-		doins pam/pure-ftpd
-	fi
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
-
-	newconfd "${FILESDIR}/pure-ftpd.conf_d" pure-ftpd
-
-	newinitd "${FILESDIR}/pure-ftpd.rc6" pure-ftpd
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-	elog
-	ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-	ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-	ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
index 066cb6ce4316..faf184f263d3 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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/pure-ftpd-1.0.21-r1.ebuild,v 1.13 2007/08/02 15:55:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild,v 1.14 2008/04/18 11:00:43 chtekk Exp $
 
-inherit eutils confutils
+inherit eutils confutils flag-o-matic
 
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
@@ -13,16 +13,16 @@ SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-IUSE="caps charconv ldap mysql noiplog pam paranoidmsg postgres selinux ssl vchroot xinetd"
+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-7.2.2 )
+		postgres? ( dev-db/postgresql )
 		ssl? ( >=dev-libs/openssl-0.9.6g )
-		xinetd? ( sys-apps/xinetd )"
+		xinetd? ( virtual/inetd )"
 
 RDEPEND="${DEPEND}
 		net-ftp/ftpbase
@@ -59,6 +59,12 @@ src_compile() {
 	# so we handle it manually, as confutils can't do that
 	use noiplog && my_conf="${my_conf} --without-iplogging"
 
+	# Those features are only configurable like this, see bug #179375.
+	use anondel && append-cppflags -DANON_CAN_DELETE
+	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren && append-cppflags -DANON_CAN_RENAME
+	use anonres && append-cppflags -DANON_CAN_RESUME
+
 	econf \
 		--with-altlog \
 		--with-cookie \