Version bump (with EAPI2 and largefile configure fix), bug #243290. Also fixes bugs #277439 and #289060

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 146 insertions, 2 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 256927238efa..d3c0d2e5de41 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.79 2009/10/16 11:26:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.80 2009/10/16 12:42:37 voyageur Exp $
+
+*pure-ftpd-1.0.22 (16 Oct 2009)
+
+  16 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +pure-ftpd-1.0.22.ebuild, +files/pure-ftpd-1.0.22-pam.patch:
+  Version bump (with EAPI2 and largefile configure fix), bug #243290. Also
+  fixes bugs #277439 and #289060
 
   16 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml:
   Add net-ftp herd
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 139060536c2a..9d0a7e02810e 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,8 +1,11 @@
 AUX pure-ftpd-1.0.21-pam.patch 586 RMD160 3246183eb4914dd605c181da17aa02c8e1e99726 SHA1 df99422a026e403ccecfe95ae9a1e13a7138b4d2 SHA256 4eab3ab63c403e02782df0b07d2f83b741b0b07cb10e37046dc2c874682509a6
+AUX pure-ftpd-1.0.22-pam.patch 568 RMD160 510901acb42629a948124bc2e4618b073c6de746 SHA1 fcfc8662096d6bf62626f508117f1d3dc9327353 SHA256 37c4dba7711769da29504840cfdddc5acf8fd970117f8b26bc4caeec4d00e58b
 AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
 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.21.tar.bz2 476117 RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 SHA1 1405ff2b9b9c3616c4e390eb99779884173a3347 SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
+DIST pure-ftpd-1.0.22.tar.bz2 497237 RMD160 e7715813f66a561024911b3f8064d1f067969e7f SHA1 38b88f9645cef6c1b6f20a2f7e73ef9289e3314b SHA256 64659df4da59aa2ef5f455674ae1c3b4b56b4649bac1cac582b895942d0059cf
 EBUILD pure-ftpd-1.0.21-r1.ebuild 3761 RMD160 78c15227586a89745901fd77bbb147c4f5716fba SHA1 034df50ad5f5eeaa729b78c6c45efdeeeab1ab55 SHA256 44b581e4633283fd356a58050ecf464bcbf34c9e9875cc670f4cb7afc3478b54
-MISC ChangeLog 11622 RMD160 50d2f3e70902c87e8a112b1026218dca804a698b SHA1 9aa9debe71efc84d488e3edb7e1ce54467f070a9 SHA256 0ce123d2d8a19c3e9d1098880b9668cd34494a12313f6e89207727adbd734ff6
+EBUILD pure-ftpd-1.0.22.ebuild 3724 RMD160 34620f8fc78915dc36aa13fdd9e54294920a21be SHA1 e7393bd59d85d01a567b1e7159adfb3112a699ed SHA256 6922a22ade21ef114678fd3016fe3b5d70fc40858af0dcd9911b101cb89138a6
+MISC ChangeLog 11882 RMD160 4a4fd8b642ab29c78de65d7be56f74813c41e54d SHA1 55d110d0115e887f79f8457355f079072a9982e1 SHA256 3ea62d5414b850b8449f2530343ee92d9b8921fab3cf1f4d290bcac2680c4131
 MISC metadata.xml 1048 RMD160 20c962a5b9b6a0fe6e75346847cc67a079e66870 SHA1 6423ca1d2067eeb0f009b7d8b0a7a35c94ff14b7 SHA256 1d0113e0866ac5d9c4df3a690d141881ad75baf0ad394959025c798bf3af4be0
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.22-pam.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.22-pam.patch
new file mode 100644
index 000000000000..43afeb16c376
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.22-pam.patch
@@ -0,0 +1,15 @@
+--- src/log_pam.c.original	2009-05-18 14:05:58.409532683 +0200
++++ src/log_pam.c	2009-05-18 14:06:24.348921783 +0200
+@@ -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
+ # ifdef PAM_RUSER
+     (void) pam_set_item(pamh, PAM_RUSER, user);
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.22.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.22.ebuild
new file mode 100644
index 000000000000..20720fe6d1e4
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.22.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 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.22.ebuild,v 1.1 2009/10/16 12:42:37 voyageur Exp $
+
+EAPI=2
+inherit eutils confutils flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~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="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? ( virtual/postgresql-base )
+		ssl? ( >=dev-libs/openssl-0.9.6g )
+		xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pam.patch
+}
+
+src_configure() {
+	# 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		"rfc2640"		"charconv"		0
+	enable_extension_with		"ldap"			"ldap"			0
+	enable_extension_with		"mysql"			"mysql"			0
+	enable_extension_with		"pam"			"pam"			0
+	enable_extension_with		"paranoidmsg"	"paranoidmsg"	0
+	enable_extension_with		"pgsql"			"postgres"		0
+	enable_extension_with		"tls"			"ssl"			0
+	enable_extension_with		"virtualchroot"	"vchroot"		0
+	enable_extension_without	"inetd"			"xinetd"
+
+	# noiplog is a negative flag, we don't want that enabled by default,
+	# 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 \
+		--with-diraliases \
+		--with-extauth \
+		--with-ftpwho \
+		--with-language=${PUREFTPD_LANG:=english} \
+		--with-peruserlimits \
+		--with-privsep \
+		--with-puredb \
+		--with-quotas \
+		--with-ratios \
+		--with-throttling \
+		--with-uploadscript \
+		--with-virtualhosts \
+		--enable-largefile \
+		${my_conf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
+
+	newconfd "${FILESDIR}/pure-ftpd.conf_d" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-ftpd.rc6" pure-ftpd
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
+	fi
+
+	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."
+	ewarn
+	if use charconv ; then
+		ewarn "Charset conversion is an *experimental* feature!"
+		ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+	fi
+}