Security bump

Package-Manager: portage-2.2.0_alpha30/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 8da6c341ddb7..a7fbdc4356e9 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.111 2011/04/27 11:54:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.112 2011/05/02 20:40:08 polynomial-c Exp $
+
+*pure-ftpd-1.0.32 (02 May 2011)
+
+  02 May 2011; Lars Wendler <polynomial-c@gentoo.org> +pure-ftpd-1.0.32.ebuild:
+  Security bump. Thanks to Mark Wagner for reporting this issue in bug #365751.
 
 *pure-ftpd-1.0.31 (27 Apr 2011)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index a7a768762cb3..e6c254cb5eaa 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -8,25 +8,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.30.tar.bz2 475402 RMD160 137c38d491b311e826076a85589e0ce4f1b46826 SHA1 0b73b80f102f2b62f97e6c7de55fa3e1eba1feaa SHA256 9b85cf5f6290f6cbed18ede22862922a8701c691abee78b15e9aa40da63de0fe
 DIST pure-ftpd-1.0.31.tar.bz2 466831 RMD160 f9f26e2694a5f15bb90fe421b392b068710fe61d SHA1 a91bd38a868a3e7665821a051924589540a4d7fb SHA256 1d901a7dd3962ece9c68ced756c09cb17d17458adbfcdb89f65917df32d68932
+DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4b8ef SHA1 589f5e35771f6b481d3b56b466282bd1f50da7c9 SHA256 f1b99a9b238c330a3efea03af2f15d56b2447e6028e3b68ce9a2d261c0d520a4
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3713 RMD160 54cc89fff265c7e1a19f02e5843a01f19ff6bf8f SHA1 a1711891e305a6b9fdf2b755851915b6f4f2b175 SHA256 422ec6c7d817238ed65f5d02b3fff7d28469524c5e14e0aa1c1414936c89fc91
 EBUILD pure-ftpd-1.0.30-r1.ebuild 3915 RMD160 12c646b8ca2391715a51cb2ea2590b73a8f33da4 SHA1 633a92e2a68d95781a30615d57757581fee775a9 SHA256 2ade0a33d4544bdea49d90472e9dbfc4687838297598572cacc598bd6e331a08
 EBUILD pure-ftpd-1.0.31.ebuild 3983 RMD160 d7a688c355fa3267ca82b89cc539893ee4c58d74 SHA1 1f5e96e63666831b21af804768de3a6909738350 SHA256 5197a98f8671ebab38837465fd3b07c4a0e008ffb69858e4f88fde39ad5b9cf2
-MISC ChangeLog 17833 RMD160 698c7dda84639769e3248fa8325c38608dc96c40 SHA1 1f305c5c99f5d50162cca0585a08a81f52b5a157 SHA256 4ca68c42413e133e66a6524563d597de4fe512f58b575c869bb95f707a7b46ff
+EBUILD pure-ftpd-1.0.32.ebuild 3983 RMD160 678b72e1ef7bd0df3d126d3c0006fb0b1af8a7f3 SHA1 75763fb2752a3c45af4536545b8790b748dfca7c SHA256 a6aa056ec202d798791973240432a94cea17689e6ba26bd00903ed0513fe7598
+MISC ChangeLog 18027 RMD160 6532ef17855c868b03d748f196fbc3dd22a60267 SHA1 6f1843e59df967c73796efe5730bf93c6091b363 SHA256 fdb553e5372f41bb344b5b1e77705326a24df4b57d88e6257352d58e0bcc09d9
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNuAQIAAoJEPiazRVxLXTFT3YP+wbS6EbLO87n/PNAzAAYc9Wm
-nH2ixt347kaiTntOAOYyu9WlltQGRD6YE2ntpbJUKH5E+kJOAGvFAB8mlA4YoSxN
-yPkkHeQXHPbLG2e7Bk/zLHy+PB5XCQyK+mUYxT13z371nVysRY0oxIf+SWg51Cks
-AS6A8yHaEzAXZC3t1VmBgAW7UeQ/P6fkz7gGIpJZTaXmY9BXi5fXa5KA48QPXh3W
-98wkQ9J/b2Lyj9knOSZLB1cf0/XTQR3ACH0/5WVKknk0rYOliK+O0liCOtJIcGEt
-m7FwhYYdyKRvpMZRp2A85rf7gFxXhXPF3DL2o9eyKxoHzwupgyJjzxFn1RRlDuE6
-ewlziSwRtqXlhO2G08cxziIfnSWRr323yEj0D/7C0LkmfhePHS/PPi3qmrfl6OnW
-fVj24I8JHgHHlmKtGlnzgWA16rhS3r1onU1aJ0VJ+WOAACPzv+OM0W9r9ZSF8U7t
-WoJ9vpHEAhPOa1XBqHrJusH4J92kdf9HFB5KINLFWAhDqbTK99k0h8QSU2U9Zy3Q
-WuZaAvAK7ez811S+Uv6rztlAJUg3sw0nghDO6FnBZxKGf6fp3x7n8hSQYLZ4MITN
-D5FrdBYrv03OBdYhVEj000e9Pg6e3mNe8/jpR3nqeTg98RJIlJ7XaLf0132n7R4S
-O18VWyqtI0C8zVz4AK7w
-=Np2A
+iQIcBAEBCgAGBQJNvxatAAoJEPiazRVxLXTFYtYP/3HR9xNYqECIXaL/ed895NR9
+BO+/+v9PiY0KNfzRyCnRPXmzk+n7VUpraQAmSqZ9Gux5iMv11QmaMhkmLnknc/r5
+gKmFMxYYJKS8Sd8x3q9PJnEhqHxZeuU6sk05yO1lWYEBtnIOyVE0GypyDM3sEc7x
+lMl+IaAFw39gtoBa/PiPVZ0dt7gmgu56kH5uHpATFzn6LXdzKHHi+xuIOMy5DxJU
+xdvbFFVt0Z8+KwLyElhRUFBHW+aCHUW5S7qVLH/47AgKv/U1w52rdSBJVp80KBMN
+lhGjCXcMpyHVnXD0s/1+q5jOEWtvwkU19l/q5OOFRcNVmQyQCp3E6HyMuG7p7zNt
+gX5Tbo2SV5lB/90lJ9riDx+DVzaTWu9YdwKvLJeZx6fvPlLSfyE8AXoLX7dsr4NL
+SSCvnfbXbDOXtbMLZRvrdKXfFAOllqU7gahVjpWbwc/96KLe0u1xSoJr00pGmyXm
+9SOXGxg4+gUt0uZVWqPhKtPtZoCdOcvEv0s2syL9aFS0sCmLIzXGvMJV7P/jGuMX
+17zD/Ibz8X/kcOb5qlDFNYWnv28LJ3sHJEJldzNXbJp6PitJ9ygoceMoV2OAApE/
+FP4yNlBivb2zP8HzHHqnOOs03wPOm4oU/KV+ABsxJZPhVIj77WBdZ54DFvYuG1+S
+4VKHJeQSc1PFhcvvWA7S
+=BAtC
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.32.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32.ebuild
new file mode 100644
index 000000000000..42445ffd25c1
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32.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.32.ebuild,v 1.1 2011/05/02 20:40:08 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-2" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-ftpd.rc10" 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
+}