Drop vulnerable versions, version bump for security bug #361963

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

4 files changed, 27 insertions, 230 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 16e6b60eda97..df3cea2d13e8 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.265 2011/02/26 17:49:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.266 2011/04/04 20:39:41 voyageur Exp $
+
+*proftpd-1.3.3e (04 Apr 2011)
+
+  04 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org> -proftpd-1.3.3c.ebuild,
+  -proftpd-1.3.3d.ebuild, +proftpd-1.3.3e.ebuild:
+  Remove vulnerable versions, proxy commit for 1.3.3e:
+  * Bump mod_vroot to 0.9.2.
+  * Fix QA warnings which were reported in Gentoo Bug #354080 c5.
+  * mod_ban requires ctrls support. Fixes Gentoo Bug #355013.
 
   26 Feb 2011; Raúl Porcel <armin76@gentoo.org> proftpd-1.3.3d-r1.ebuild:
   alpha stable wrt #354080
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 0389ae4b54af..ba353beeecaa 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,20 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX proftpd-bug3586.patch 5507 RMD160 8843d2f0d4378151b34263834f7bfd88271eaece SHA1 70af05ef5c852c590a50551e7d72a16a6cd1b7ba SHA256 4e748700d4262c2340e485844d3dff76715853f3c27db877298c8eda098a4ed8
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
 AUX proftpd.initd 1563 RMD160 c30ab2c000ca31a348e0c9d92e07d93c5cba8d4e SHA1 7462aaec25c6f44928339458d450f7e386b147d4 SHA256 fe36a50fcf1a2d7b820edde94349cd68204e7b14c8a5d34f710af68ed1ce8315
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
-DIST proftpd-1.3.3c.tar.bz2 4166609 RMD160 08a6fac94aa3449192e92848c6271cca33ea26cc SHA1 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f SHA256 ea7f02e21f81e6ce79ebde8bbbd334bd269a039ac9137196a35309f791b24db1
 DIST proftpd-1.3.3d.tar.bz2 4177511 RMD160 8aa4e1c0456c771ae77e8682bd612b1229d05f4b SHA1 b2ee3ffdaa971c24327ad66412f2d71b628eddab SHA256 667fdf757f426517cb5fd69c3830f2b9f996febff51f59a208e46f5f1bd66606
+DIST proftpd-1.3.3e.tar.bz2 4180369 RMD160 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07 SHA1 b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f SHA256 f6c65fe9fea6577ac309f4e9e36c80def271fa5c91c4053fb0758824506127b6
 DIST proftpd-1.3.4rc1.tar.bz2 59290802 RMD160 523d0b5f248d96efa408fe348b88ace8a1057e33 SHA1 859ae759f2f2588a2c9339fa033993c0934fef32 SHA256 2ed112264b8810ff76806a93d73a5e8c714508088c4938f7a96e2b9d23df809f
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036
 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
 DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf
-EBUILD proftpd-1.3.3c.ebuild 7180 RMD160 0224857289f16e1a9a9115b6640754f07a3fb35c SHA1 0b66f216073618128dd4f5cc04701178db963083 SHA256 581675c43c65aeb100a6abe8427bce2af571df256ec2d93a1746bf49a3311bc9
 EBUILD proftpd-1.3.3d-r1.ebuild 7253 RMD160 ca1d91eeb105d6da0ccb82742fbdf52845cef96c SHA1 b4f3aee22a594fcdebc06feae036351657ae95f2 SHA256 6b2a3798c2239647495eeee8b6ca105bb3ba14857afdcab8d836f3139b01c8ad
-EBUILD proftpd-1.3.3d.ebuild 7180 RMD160 0943645e8d96938d5b8b8a271bc2671c5bba58d8 SHA1 7b6f33d8145eeb14d24dde47c95e1530c5513c04 SHA256 95c5a481fa5a892b43d4e817b02df1cce13bf444987fed38949af4e9c500d0b9
+EBUILD proftpd-1.3.3e.ebuild 7199 RMD160 8b9f86c636f92c05fd1243468a8479d978fec279 SHA1 5faf3af39d144375a12071939e9de29a680783d9 SHA256 3bfb7f05d78c13169097dfa83ea53a661fed5242a7f533caa050daab4ed9413a
 EBUILD proftpd-1.3.4_rc1-r1.ebuild 6652 RMD160 45514d8cfbd526114c291dda6fc176598c66bd97 SHA1 e02cc2d06c71b27d0d798fb171b8af8593d6b839 SHA256 3811641fe3dce2520ed62d88aef5e3f860700f1aec25831191d22ca71e99c86f
-MISC ChangeLog 44742 RMD160 c9d126f6e1174afcdacc8031a55f496ed26d5dc4 SHA1 a45e72cdd790cf7aa1447de68b6bba87a827f2be SHA256 20d626a56aef30a24f4349c8978efdf5855b6e7e96865eaec647c7af8d617feb
+MISC ChangeLog 45116 RMD160 0ea1537914c598638f2710124b4d0cf5a365611d SHA1 da7a817f68e431eb4e980b5af940f8d42e9aa191 SHA256 737f41b03a71e38b9167da24be9d1f74308ca4bdfb7ef5b03efd62d402a782ad
 MISC metadata.xml 2184 RMD160 6a97d72e3dd11c2b2cb4908326597e53d3f633eb SHA1 e143b7933c4bab599da60a8b1f3155e5779a0916 SHA256 50176a9f3ecf06378fe12d1273ad56b186c868331df48fd6b42b22311ca3222c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2aLJsACgkQFYEBGcdFJfLsVgEAqijH/IvpkmS/SWWbDSsn8nrI
+ssdJd+szxdVaWjLwGmABAKMSzG3nLp7KA4g1UzKcLWi2YrkW7+VONe2+gEo/FXQ5
+=ks2d
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.3c.ebuild b/net-ftp/proftpd/proftpd-1.3.3c.ebuild
deleted file mode 100644
index af48359627f4..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3c.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3c.ebuild,v 1.7 2010/11/14 17:28:05 armin76 Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-CASE_VER="0.4"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-		sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.3d.ebuild b/net-ftp/proftpd/proftpd-1.3.3e.ebuild
index 6338dfb3d93e..54eaa4eee057 100644
--- a/net-ftp/proftpd/proftpd-1.3.3d.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3d.ebuild,v 1.7 2011/02/12 17:53:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild,v 1.1 2011/04/04 20:39:41 voyageur Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -9,7 +9,7 @@ CASE_VER="0.4"
 CLAMAV_VER="0.11rc"
 DEFLATE_VER="0.5.4"
 GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
+VROOT_VER="0.9.2"
 
 DESCRIPTION="An advanced and very configurable FTP server."
 HOMEPAGE="http://www.proftpd.org/
@@ -25,7 +25,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
@@ -98,7 +98,7 @@ src_configure() {
 	use ban && mym="${mym}:mod_ban"
 	use case && mym="${mym}:mod_case"
 	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
+	if use ctrls || use ban || use shaper ; then
 		myc="${myc} --enable-ctrls"
 		mym="${mym}:mod_ctrls_admin"
 	fi