Adding sysquota support per request in bug #340133.

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

4 files changed, 134 insertions, 3 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 8daf791cc685..901f84f84df7 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.98 2010/08/19 08:07:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.99 2010/10/11 05:41:02 polynomial-c Exp $
+
+*pure-ftpd-1.0.29-r2 (11 Oct 2010)
+
+  11 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +pure-ftpd-1.0.29-r2.ebuild, metadata.xml:
+  Adding sysquota support per request in bug #340133. Thanks to Martin
+  Korous for the ebuild patch.
 
   19 Aug 2010; Lars Wendler <polynomial-c@gentoo.org>
   pure-ftpd-1.0.29-r1.ebuild, +files/pure-ftpd.conf_d-2,
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index f9cf5aeb3934..95d8fefde2ee 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -10,5 +10,6 @@ DIST pure-ftpd-1.0.28.tar.bz2 465887 RMD160 1a75ea239129de1f2bcd52a34d1b379928e7
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 EBUILD pure-ftpd-1.0.28.ebuild 3721 RMD160 67af40e1e03c1a7142a91377a78b6d7bec393bf8 SHA1 1bf4deeddae2cbe6bab839d0f509374f20c104be SHA256 af1b24c251810c542a552ead29b7979fd2966375a44de6595889a23785e5558a
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3741 RMD160 44bd21d2618be740b0469e02e294df28f65f9d19 SHA1 830571dd0b7d111d514f1d59ffe7365a21cd1961 SHA256 173e1aef572089af2ea2631c83dd90061c5d6726ecb4a9b6015a8e77e83638cc
-MISC ChangeLog 15706 RMD160 1ad09d5f73fc446a8b308a715c8bde01e42f4422 SHA1 49882f2bcaabe5d933f4e53e034e80ab7747d29b SHA256 2b74ff12ce2d139cf800d1d447351ca3068364433d27bd9ab787a828ca75652f
-MISC metadata.xml 1051 RMD160 d27a44ab81aa6b193a4b68abc6283bc8d1c874c7 SHA1 04bd0e08ccb869060d6654c735963ec70225c237 SHA256 bb94d642cc078247b871cd16bad43aa4d74a5abd204eaa30421ade04e7ad8785
+EBUILD pure-ftpd-1.0.29-r2.ebuild 3818 RMD160 a25ea5510bc99b9e0234e5e8ed9cf4be2506dd00 SHA1 121e2c6d4fb619f55b30c1a181f9e275af3704cf SHA256 93fa03ae83d941472019c45124b6e78fd6f00636664783b8d15788c2ca5a4aa6
+MISC ChangeLog 15944 RMD160 53d1386dfa440f4c57e5fcd4fc8841ffd42d5770 SHA1 1525f68fd4f5e65ddb455383d540786a6aa39ad0 SHA256 6d870c6b0e16aecdc42242d3b65cf297914059a0d2df0b61afd4a79eb5f2630a
+MISC metadata.xml 1134 RMD160 0d3611148db3d6787e646194ce4004b46f3f745f SHA1 cb205e5dbeff7abf7884d3df99d9215ebdc70882 SHA256 03e19d03fa50bcea482a0d395397a99c1bcdf40c5fe6550ca31183f12bfd206a
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 33ac2574fd45..e151f13b5bc6 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -16,6 +16,8 @@
 	<flag name='noiplog'>Disables logging of IP addresses</flag>
 	<flag name='paranoidmsg'>Display paranoid messages instead of normal
 		ones</flag>
+	<flag name='sysquota'>Enables system quota support (needs sys-fs/quota)
+		</flag>
 	<flag name='vchroot'>Enable support for virtual chroot (possible security
 		risk)</flag>
 </use>
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild
new file mode 100644
index 000000000000..39db4e06662f
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2010 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.29-r2.ebuild,v 1.1 2010/10/11 05:41:02 polynomial-c Exp $
+
+EAPI=2
+inherit eutils confutils flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+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 sysquota 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-base )
+		ssl? ( >=dev-libs/openssl-0.9.6g )
+		sysquota? ( sys-fs/quota[-rpc] )
+		xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.28-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_with		"sysquotas"		"sysquota"		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-2" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-ftpd.rc10" 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
+}