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

Package-Manager: portage-2.1.5_rc4

6 files changed, 27 insertions, 139 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/Manifest b/net-ftp/pure-ftpd/Manifest
index f245dcc587a1..380fed2a2c82 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,11 +1,8 @@
-AUX ftpusers 177 RMD160 dea29606ea28414d714453bd9469b375c077badd SHA1 cb60c318c5a21e6dc79ca34470336bb5a390df03 SHA256 fb5ae1383661d9cfef2ace904e65255d725a4b7df07f2d399228758dd5601d26
 AUX pure-ftpd-1.0.21-pam.patch 586 RMD160 3246183eb4914dd605c181da17aa02c8e1e99726 SHA1 df99422a026e403ccecfe95ae9a1e13a7138b4d2 SHA256 4eab3ab63c403e02782df0b07d2f83b741b0b07cb10e37046dc2c874682509a6
 AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
-AUX pure-ftpd.rc6 1416 RMD160 1e84e6c1a37593f30e09ec1bc4211bec9a0e3d52 SHA1 8c779240dc2e84fa6cdde135ec89438c8f886ef3 SHA256 869d2e984a9d0c785df87b39ed05d6a2b83bc0dab61e91d9a35167f053f7a324
+AUX pure-ftpd.rc6 1455 RMD160 5bb57d4e162e08d113da9c349cf57480244948f7 SHA1 54b0abe7e27f10bdec9a22917e57f5ed625ebca3 SHA256 d554e4bab0c11a23c19e8fac9070c2550ca461dce72047745ca9f3fcf2660770
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
-DIST pure-ftpd-1.0.20.tar.bz2 470915 RMD160 194ea5c7cc4a1944da1e0bfe2b1f84cc2ba04c39 SHA1 fbda2b666ee0ebcbe93d0bf477af0bc74c3448c9 SHA256 6b3fd0b7eca88a9ac7f9aba57d75ca6b20d363309be68f600a5a154db7bc24e9
 DIST pure-ftpd-1.0.21.tar.bz2 476117 RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 SHA1 1405ff2b9b9c3616c4e390eb99779884173a3347 SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
-EBUILD pure-ftpd-1.0.20-r1.ebuild 2777 RMD160 d64551b46e9d9d20f7e355c250402115cb4fc3a9 SHA1 3e729650d895df8423964fddf5619f328b7ef64e SHA256 11166af3a8bda72d9a877dda1c76d8cdb328eb18c26922cfa904b5f1385068c9
-EBUILD pure-ftpd-1.0.21-r1.ebuild 3441 RMD160 f48aa75b4921d85ae010804948cd2723fb81c7a2 SHA1 e463f6332813dd3ebb48bdbc045770d3101c16d4 SHA256 545a7ee42b5afd59941a1e71ce3d24c167164ce65767258aa2b5331e65052fc1
-MISC ChangeLog 10735 RMD160 da05a7c347697a73fb0e9c53e8cb4487bb217ebc SHA1 3ccff3cffe819af56e4bb3eb271cb6d05e32406a SHA256 352ca52e44ff9c449889fc2c32495f9a4db7f777f45a3bafc0b5dd4a84d042cc
+EBUILD pure-ftpd-1.0.21-r1.ebuild 3751 RMD160 9725c9d7268c5ac4be1d243cd5a906e9584a57c9 SHA1 4853b17b79c527760d4b18e75f19574f2f9cb83b SHA256 f1535fb4f61c1d0c7fe839001b79c72bb94162c49b6ec630925a8d3bc01b6ddf
+MISC ChangeLog 10945 RMD160 18fccc6e07b62766d6184b7e38d6a3bdb6b75ffb SHA1 d4961c90e614956fe9607923c400fa75147c1155 SHA256 bb6a3a6092c4f631996bc2f303706ae24f415d4c35855ca5f561ee17f58ef8d3
 MISC metadata.xml 443 RMD160 2aa58b2aa257f540938cd12a89a369f44cab6c56 SHA1 ab8d73c1958333dd2f558dfd0c12b415a39dc01b SHA256 9d06ce4c3c8a33afa3ebc3321577f3f184551548ffdc75b66bfd0091844d42ac
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 \