Version bump

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 147 insertions, 15 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 5100fff8d710..7900d739b551 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.128 2011/11/02 13:16:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.129 2011/12/08 13:49:40 polynomial-c Exp $
+
+*pure-ftpd-1.0.35 (08 Dec 2011)
+
+  08 Dec 2011; Lars Wendler <polynomial-c@gentoo.org> +pure-ftpd-1.0.35.ebuild:
+  Version bump.
 
 *pure-ftpd-1.0.34 (02 Nov 2011)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 5f810cd9d5b2..abae528d7678 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -10,25 +10,27 @@ AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a6
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4b8ef SHA1 589f5e35771f6b481d3b56b466282bd1f50da7c9 SHA256 f1b99a9b238c330a3efea03af2f15d56b2447e6028e3b68ce9a2d261c0d520a4
 DIST pure-ftpd-1.0.34.tar.bz2 474704 RMD160 d5c34de5d39010280eeafc3aae2dab9721077acc SHA1 1d10217e82cfb00cc74dec1796cf1e75deffc83a SHA256 434e1fd72470964e6652502455449cccf26550212d9dd4955ebe49624137d42f
+DIST pure-ftpd-1.0.35.tar.bz2 482387 RMD160 525ae8c4564b7a8f29ec09b882eacaa7a025a911 SHA1 e470bd886af68903ffba61832002fe90611f5756 SHA256 cbbdf6185480491618817710ba4a19bd58e2854c61e643967bd0841f89d0e79c
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3713 RMD160 54cc89fff265c7e1a19f02e5843a01f19ff6bf8f SHA1 a1711891e305a6b9fdf2b755851915b6f4f2b175 SHA256 422ec6c7d817238ed65f5d02b3fff7d28469524c5e14e0aa1c1414936c89fc91
 EBUILD pure-ftpd-1.0.32-r2.ebuild 3968 RMD160 781ed4ce6ceaa9c3acf8bd62114472cbc9f41b53 SHA1 eeae05bd969e97bbb4738d420cc05f651625344d SHA256 362d366d470e9ee986a6494fa835615f22bc0721078f9efbe150f232ad0d2de8
 EBUILD pure-ftpd-1.0.34.ebuild 3983 RMD160 a41ef5b501845522d41a021b8c047f84aa8a838c SHA1 b0e910b022c8ca8ee8f8c905d9d639235cf14088 SHA256 bffebde0317b4f037d9bffb564f45d66a8b572d6cfe7d3402820cc749591da58
-MISC ChangeLog 20407 RMD160 fcf74b466a608ec9d059ce77b692e9245a634ea0 SHA1 de85acc533a49d6d9b7a7e467d30c2dd045a5ceb SHA256 16a447afb4a51b4a07a671669f9e2fe360fd4631f6f12a58b61078b488f94891
+EBUILD pure-ftpd-1.0.35.ebuild 3983 RMD160 d0dbeeaacd1ec13b81dea169de96bda06050a4c7 SHA1 6efce0e24efcaa71cbdc0aa4fec828b2eb5c30ca SHA256 e2eead89288992fb946be70800ca08e5b8d6fb8e416cf82045240959c9a45d92
+MISC ChangeLog 20537 RMD160 f218e60b672d67d59f73b64ed07fb0366d6bfae7 SHA1 b828a86d8281752df2924963c6f717621224d2f9 SHA256 2ed0c5c9e3454ed204e49e499a54570c942ce05e68c2b2a9716a15102fbd6a34
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOsULLAAoJEPiazRVxLXTFQ38P/0HrTGDVq2LKuYme45JsHdsA
-BgBTNSxgPZvUiMSt4dYX6JH6ahAYhc6OOV4hIz+cIBVkSjQA5F7/Gubn3sJq4yHt
-51iTH3aP/n6G3eb6Xu6r0KKSts/zdFkNzz98HcsOR5j70vAumqrKWoPn8C6Asapb
-cQIKu6Q4zpjG00Ar+GJuNsud8pSAgRN0MnGTw3ThrVlXuTOvD5R4/KVMLXHMLUIq
-d1KmT/+aakYS2m8GM4oUw/mWQCKEyOVCF2J06JYYnM/h2WUg2qTxM3AWxYBRlchE
-jR6DRE7eLP2aXAG0Qt2H67Dv//6emVWU+LQakrKsJzQXIW4N1qBAjxING+m5iNLu
-pf8PJ6c9g1i9+lA9buJM+deNaq6N/5IMNIcGxfxkg7NkSA3WUcSjYO8Tip06WAvc
-t8vBrIOzeKmpVme9JD0WCUOR6yUmkVfPKrsefT9k8M+uFWfzxL6+Nn0Fef6nsaCT
-J16WqMxZ5Qi7/ric1+prRh9JksmNPLJYmjd84wpyO1oF4Thg6ZKIiMSvLUkKwPX8
-sZdMSySdYtcDZq96gK3w8B8l8lHkWNnj2qiyKi5h7b6FcFkXgY4QHwN49VU3ACFB
-5VVhGnbF1RM8nkMFt6QeZnv6p6Yc6CId58SQBbZRSm3FotWEmFxprWroSOJXWIZE
-AK8P8umcxpROb/S4ugYR
-=1X4k
+iQIcBAEBCgAGBQJO4MB5AAoJEPiazRVxLXTF6OgP/jC2tFd8yDnzfOO0ysQQm4in
+4kdHhjIzllcxG/VKyxKO0GvTay13EqjEdWCtCB1QPveW7ny+LzfsAdeMNRXj792b
+01+QDFctNYrOcmnOVgsQL3RhG2LgS3Zca/0fHxFlMZ5sVGL2EHHSwfK/0pxyKgCZ
+7wjyiIXoVOUYeRvpXXF4KVnHWRVULwPK9842lR+6cv1gRtw2g2cR+mjB8URzIu3N
+AcEJHaVBzeQvNLrCNKnXTpuPsfyBmlLzaKEWFaCiUWY7Y8lewTBY7vlpS+fl7ESM
+OewGqqPsRlN2VQ+bJKAxujfJGGySfNAsRnikTr4nbyJNowyAhIi1UUGvrHmjbD5y
+Q4678ZgvP1EKclORn71bamcVROBUjx2JH1OPeI7s4cRDeNvFdPBAX19Oqh5GOTF8
+6/b+MZ7TTDuYPgWOZMn3784k+hBP1ElbTQFOmUpnzcn3l5aaL+SARIWC3wIlAMp4
+x/anTM1Jpcp8UkDzjDukPld6/LBZyopYstEryHZBXidWZ8RwsCLGBYXUauHe2c8U
+qpq2djaQB/+yYpKU7L/OIYhvxKRmnXm/zayiVplxLy2fiYi3Svv3DsAo1bSmr+8o
+Yb1yXg2+KoevlNKx5iX59ty9YyRbhdVPlHyRhVKOlhMzcufjtpGCLO2TbGdTTSm+
+cETd/ADOjCdtv1BTxOtW
+=92hi
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
new file mode 100644
index 000000000000..6ffcc00ded33
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 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.35.ebuild,v 1.1 2011/12/08 13:49:40 polynomial-c Exp $
+
+EAPI=2
+inherit eutils confutils flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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
+	http://download.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 resolveids 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
+	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+
+	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-3" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-ftpd.rc11" pure-ftpd
+
+	dodir /var/lib/run/${PN}
+
+	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
+}