bump

(Portage version: 2.1_pre5-r4)

5 files changed, 162 insertions, 8 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index f2b9d205735f..377bd15a3d74 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/pure-ftpd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.53 2005/09/19 11:53:09 uberlord Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.54 2006/03/14 23:24:32 humpback Exp $
+
+*pure-ftpd-1.0.21 (14 Mar 2006)
+
+  14 Mar 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/pure-ftpd-1.0.21-pam.patch, +pure-ftpd-1.0.21.ebuild:
+  Version bump to 10.0.21. Thanks to Charles Sheridan on bug #124933 for
+  reporting.
 
   19 Sep 2005; Roy Marples <uberlord@gentoo.org> pure-ftpd-1.0.20-r1.ebuild,
   pure-ftpd-1.0.20-r2.ebuild:
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index cd634dc8e54c..d5a0abf00b77 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,11 +1,42 @@
 MD5 ea30ef6fd7422d10aa2ebf3e643f13d3 ChangeLog 8081
-MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
-MD5 f864c9b0a924eab2443c67ad734a2135 pure-ftpd-1.0.20-r1.ebuild 2764
-MD5 f8fe6ca5c41f7b54eee2c8b8beab8ee8 pure-ftpd-1.0.20-r2.ebuild 2793
+RMD160 89806d02bec8ccd88bcb8534583e352eb0f2cfaf ChangeLog 8081
+SHA256 6fe8d7cf5c57072e5d5eeb86ba88e02daeafd3c49c223e21e71e92580b1018e6 ChangeLog 8081
+MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r1 69
+RMD160 76bd42d6d274f5eec7b1e8513c99eb8fd47c369e files/digest-pure-ftpd-1.0.20-r1 69
+SHA256 45f55e86f3ddd13605a5fdf843b04f095701754e416079b68e6ef2d2e1077aad files/digest-pure-ftpd-1.0.20-r1 69
+MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r2 69
+RMD160 76bd42d6d274f5eec7b1e8513c99eb8fd47c369e files/digest-pure-ftpd-1.0.20-r2 69
+SHA256 45f55e86f3ddd13605a5fdf843b04f095701754e416079b68e6ef2d2e1077aad files/digest-pure-ftpd-1.0.20-r2 69
+MD5 ae89b1b322a519efee148d4b74e0aa6f files/digest-pure-ftpd-1.0.21 253
+RMD160 e310c21d2ff6e5cdf04497507034ad13496d2e22 files/digest-pure-ftpd-1.0.21 253
+SHA256 8c51d3765557768898da80ab1d4497bb95430c700a76640fe21ce0e89d2cfd1f files/digest-pure-ftpd-1.0.21 253
 MD5 458b5d7567f55f4257ea1a6bfe3ff150 files/ftpusers 177
+RMD160 dea29606ea28414d714453bd9469b375c077badd files/ftpusers 177
+SHA256 fb5ae1383661d9cfef2ace904e65255d725a4b7df07f2d399228758dd5601d26 files/ftpusers 177
+MD5 03fa7e601db23e23915f153f2fecf8a3 files/pure-ftpd-1.0.20-pam.patch 586
+RMD160 b90521a12ddff81cc2333ce0a2d060e257d98b46 files/pure-ftpd-1.0.20-pam.patch 586
+SHA256 a59b96a4c78d1a1d7362f4349290a89da15a4e76a5e9ec6ce40724a52c3788cf files/pure-ftpd-1.0.20-pam.patch 586
+MD5 838eccf3bc6e8cd91e86597d844616d0 files/pure-ftpd-1.0.21-pam.patch 586
+RMD160 3246183eb4914dd605c181da17aa02c8e1e99726 files/pure-ftpd-1.0.21-pam.patch 586
+SHA256 4eab3ab63c403e02782df0b07d2f83b741b0b07cb10e37046dc2c874682509a6 files/pure-ftpd-1.0.21-pam.patch 586
 MD5 88b77efaa5f85e19f351960a5617026d files/pure-ftpd.conf_d 2826
+RMD160 d682f122b83ec4f1cb61f25072297d1c130bb099 files/pure-ftpd.conf_d 2826
+SHA256 40ba72fefc82c88d4faa9c2ab3fe3e3dc8ba92bc1d5931232cd69498b813a356 files/pure-ftpd.conf_d 2826
 MD5 db2ba34b2491a9fb5042f78c029f6386 files/pure-ftpd.rc6-r1 741
+RMD160 141631f6702e512e99031baab1b44f26bd0515c4 files/pure-ftpd.rc6-r1 741
+SHA256 1060a6ba3c2df64fc5aec04db1781cdf717bec146f5f32b438a831e7176b7ac0 files/pure-ftpd.rc6-r1 741
 MD5 86b7638f0ed01530fff30204ba6b5ce7 files/pure-ftpd.xinetd 238
-MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r1 69
-MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r2 69
-MD5 03fa7e601db23e23915f153f2fecf8a3 files/pure-ftpd-1.0.20-pam.patch 586
+RMD160 e0af4056a3e2e9a894c2fab85c73981ba7dbb8f4 files/pure-ftpd.xinetd 238
+SHA256 0682a3bd3cc90d5750001489f3b63522a32752d706309e9ad9bb971f900cbd4f files/pure-ftpd.xinetd 238
+MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
+RMD160 dcdde8fe2ed46439dddd7321fbce2258109183ad metadata.xml 446
+SHA256 c786d2fa92b681327a9a5a9963397280a135e77adc08ee60af1a623127d3851f metadata.xml 446
+MD5 f864c9b0a924eab2443c67ad734a2135 pure-ftpd-1.0.20-r1.ebuild 2764
+RMD160 4a65fa9eba287ac39ef8223541bd80d6b8dfcc93 pure-ftpd-1.0.20-r1.ebuild 2764
+SHA256 0581630bbaa975da18c80e5d7c4b3e7b96fc208104d4a5de1fd6ad877928de07 pure-ftpd-1.0.20-r1.ebuild 2764
+MD5 f8fe6ca5c41f7b54eee2c8b8beab8ee8 pure-ftpd-1.0.20-r2.ebuild 2793
+RMD160 af32cd6dfd4bd81f2effcb9202c3ac8115bf48f0 pure-ftpd-1.0.20-r2.ebuild 2793
+SHA256 fde58619e905088074f4c22040dd7d8c59f453ee242b59dd9060c7e00f6f5cc8 pure-ftpd-1.0.20-r2.ebuild 2793
+MD5 f8fe6ca5c41f7b54eee2c8b8beab8ee8 pure-ftpd-1.0.21.ebuild 2793
+RMD160 af32cd6dfd4bd81f2effcb9202c3ac8115bf48f0 pure-ftpd-1.0.21.ebuild 2793
+SHA256 fde58619e905088074f4c22040dd7d8c59f453ee242b59dd9060c7e00f6f5cc8 pure-ftpd-1.0.21.ebuild 2793
diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21
new file mode 100644
index 000000000000..400607e696eb
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21
@@ -0,0 +1,3 @@
+MD5 ca8a8dbec0cd9c8ea92fc4c37ea9c410 pure-ftpd-1.0.21.tar.bz2 476117
+RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 pure-ftpd-1.0.21.tar.bz2 476117
+SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c pure-ftpd-1.0.21.tar.bz2 476117
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.21-pam.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.21-pam.patch
new file mode 100644
index 000000000000..fefcf86a2e0d
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.21-pam.patch
@@ -0,0 +1,15 @@
+--- src/log_pam.c.original	2006-03-14 23:19:35.000000000 +0000
++++ src/log_pam.c	2006-03-14 23:20:17.000000000 +0000
+@@ -156,10 +156,10 @@
+     result->auth_ok = 0;
+     PAM_password = pass;
+     PAM_username = user;
+-    pam_error = pam_start("pure-ftpd", user, &PAM_conversation, &pamh);
++    pam_error = pam_start("ftp", user, &PAM_conversation, &pamh);
+     PAM_BAIL;
+ # ifdef PAM_TTY
+-    (void) pam_set_item(pamh, PAM_TTY, "pure-ftpd");
++    (void) pam_set_item(pamh, PAM_TTY, "ftp");
+ # endif        
+     /*
+      * PAM doesn't make any distinction between "user not found" and
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.21.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.21.ebuild
new file mode 100644
index 000000000000..29abc8803583
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.21.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/03/14 23:24:32 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam mysql postgres ldap ssl caps vchroot selinux"
+
+DEPEND="virtual/libc
+	net-ftp/ftpbase
+	pam? ( || ( virtual/pam sys-libs/pam ) )
+	mysql? ( >=dev-db/mysql-3 )
+	postgres? ( >=dev-db/postgresql-7.2.2 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-pam.patch
+
+}
+
+src_compile() {
+	local myconf="--with-privsep"
+
+	use pam && myconf="${myconf} --with-pam"
+	use ldap && myconf="${myconf} --with-ldap"
+	use mysql && myconf="${myconf} --with-mysql"
+	use postgres && myconf="${myconf} --with-pgsql"
+	use ssl && myconf="${myconf} --with-tls"
+	use caps && myconf="${myconf} --with-capabilities"
+	!(use caps) && myconf="${myconf} --without-capabilities"
+	use vchroot && myconf="${myconf} --with-virtualchroot"
+	#!(use vchroot) && myconf="${myconf} --without-virtualchroot"
+
+	# 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
+
+	econf \
+		--with-altlog --with-extauth \
+		--with-puredb --with-cookie \
+		--with-throttling --with-ratios \
+		--with-quotas --with-ftpwho \
+		--with-uploadscript --with-virtualhosts \
+		--with-diraliases --with-peruserlimits \
+		--with-largefile \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
+
+	dodir /etc/{conf.d,init.d}
+
+	cp ${FILESDIR}/pure-ftpd.conf_d ${D}/etc/conf.d/pure-ftpd
+
+	exeopts -m 0744
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/pure-ftpd.rc6-r1 pure-ftpd
+
+	insopts -m 0644
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/pure-ftpd.xinetd pure-ftpd
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		doins pureftpd-ldap.conf
+	fi
+}
+
+pkg_postinst() {
+	einfo "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file."
+	echo
+	ewarn "It's *really* important to read the README provided with Pure-FTPd."
+	ewarn "Check out - http://www.pureftpd.org/README"
+	ewarn "And for SSL/TLS help - http://www.pureftpd.org/README.TLS"
+}