ftp-base fix

(Portage version: 2.0.51.22-r2)

5 files changed, 124 insertions, 2 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 8798482d917b..049b1b3e3fb3 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2005/08/21 13:26:23 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.52 2005/08/31 12:59:21 humpback Exp $
+
+*pure-ftpd-1.0.20-r2 (31 Aug 2005)
+
+  31 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/pure-ftpd-1.0.20-pam.patch, +pure-ftpd-1.0.20-r2.ebuild:
+  Added ftpbase compatible version that helps close bug #102479
 
   21 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
   files/pure-ftpd.conf_d:
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 434747488516..3d1bc8fa6ba7 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,8 +1,11 @@
+MD5 d4c2f098ab8f3bfa75e4ad089105934e pure-ftpd-1.0.20-r2.ebuild 2754
 MD5 28e68e920aa5281e4896b38b38a1bb7c pure-ftpd-1.0.20-r1.ebuild 2704
-MD5 5fcfb6c349873b1725d5d4143bc20756 ChangeLog 7673
+MD5 411669f52341dea44e3f84e5a6edf351 ChangeLog 7897
 MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
+MD5 03fa7e601db23e23915f153f2fecf8a3 files/pure-ftpd-1.0.20-pam.patch 586
 MD5 458b5d7567f55f4257ea1a6bfe3ff150 files/ftpusers 177
 MD5 88b77efaa5f85e19f351960a5617026d files/pure-ftpd.conf_d 2826
 MD5 db2ba34b2491a9fb5042f78c029f6386 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
diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r2 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r2
new file mode 100644
index 000000000000..4336bc9e524f
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r2
@@ -0,0 +1 @@
+MD5 e928e9e15adf6b52bfe6183fdad20144 pure-ftpd-1.0.20.tar.bz2 470915
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.20-pam.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.20-pam.patch
new file mode 100644
index 000000000000..3890ccb1a4b8
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.20-pam.patch
@@ -0,0 +1,15 @@
+--- src/log_pam.c.original	2005-08-31 12:23:41.000000000 +0100
++++ src/log_pam.c	2005-08-31 12:24:40.000000000 +0100
+@@ -141,10 +141,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.20-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild
new file mode 100644
index 000000000000..1bb9e7b6688b
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/08/31 12:59:21 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"
+
+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"
+
+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"
+}