Version bumps, security bug #390075 (including final 1.3.4). Remove previous rc

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

4 files changed, 241 insertions, 12 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 88eb433625ab..118f0db4924c 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.279 2011/11/07 12:23:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.280 2011/11/14 10:17:48 voyageur Exp $
+
+*proftpd-1.3.4 (14 Nov 2011)
+*proftpd-1.3.3g (14 Nov 2011)
+
+  14 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> +proftpd-1.3.3g.ebuild,
+  -proftpd-1.3.4_rc3.ebuild, +proftpd-1.3.4.ebuild:
+  Version bumps, security bug #390075 (including final 1.3.4). Remove previous
+  rc
 
   07 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> proftpd-1.3.3e.ebuild,
   proftpd-1.3.3f.ebuild:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index b0f5aaf81fe6..ad3844d0d48d 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -8,7 +8,8 @@ DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
 DIST proftpd-1.3.3e.tar.bz2 4180369 RMD160 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07 SHA1 b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f SHA256 f6c65fe9fea6577ac309f4e9e36c80def271fa5c91c4053fb0758824506127b6
 DIST proftpd-1.3.3f.tar.bz2 4202825 RMD160 1f371ff14fb8c777dc8432f5a8d18fa5584a22cd SHA1 55083ab9bbe1e9ef83084ca9dc9d8cdeac5f6a1c SHA256 3494c1902234bbcdb33b058340e73e9745a0d7f8bbbd60d5941ce2b752421b0b
-DIST proftpd-1.3.4rc3.tar.bz2 6797444 RMD160 7095ab3c00d9079c4c48945702f098984491e8a1 SHA1 2be68af15b1e09d9dba06ef03d8426a320956fa8 SHA256 a0b981d50d72ad797d2ae0482feb45661f4874cd9f7029c0ee559cdffafb5ed6
+DIST proftpd-1.3.3g.tar.bz2 4204504 RMD160 29bdade06f63ace05811e809b0a3600ea6ed61fe SHA1 70489c2b32c87b3637fd0cf2520773c5229f4ae3 SHA256 b1104a91e5e4dfafb0aa876492c073cf24b7d00b3e8528fa4443c108d963ae15
+DIST proftpd-1.3.4.tar.bz2 6804530 RMD160 fb86eb43b44d8bb272337436580ddef2182b86b5 SHA1 72d20ba6071e06455cbad5390a02fd9ec1c09de5 SHA256 863fb545a9387646fcf090217bdfc914eb84334b7e25f4fe4089f58a7292a7ed
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-case-0.7.tar.gz 13184 RMD160 9514b003b21999a97df59b2fe8b24a71d585047b SHA1 665b25a1673edc34faac87bd48fb193687c131bc SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
@@ -16,13 +17,14 @@ DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3
 DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf
 EBUILD proftpd-1.3.3e.ebuild 7181 RMD160 452f01da3094782974a7cc1c8f2788cdc6127425 SHA1 0a31b7522788638f6a97f57e7e46cd0b91a55ca2 SHA256 1b12ff82ea60f7b18e4b6af606f79d42517ba8ecb7f393f0e6f0400d55ac61f4
 EBUILD proftpd-1.3.3f.ebuild 7187 RMD160 10d00838dc9840d6632674c2cd7ee9db0636a678 SHA1 1c554d29d90275d5fa307e5a6a8282296f98e259 SHA256 f71b0593ff70248b834bf006e062dd7b62090f32b847d53dfadd6d63a9943db3
-EBUILD proftpd-1.3.4_rc3.ebuild 6580 RMD160 463d7d9d65e2365dedad0b5797aa9af41f55a947 SHA1 38d4e7fad5dd27abb24004114ac39c97b3c09fca SHA256 889d27a7999ff3c3590175ba5d09be22813aed9909b0efe072669af6951f02e7
-MISC ChangeLog 48350 RMD160 3b9f5754fad921ff8192bfc1c2878b322b3800cc SHA1 06e0e289d48fdc72285e3e43201fb81698a2b11c SHA256 dd122d523ad493329eab6bd013dcd95414d0153b47ece9c443589501ec434ecf
+EBUILD proftpd-1.3.3g.ebuild 7188 RMD160 7e743b102f3dd48f034250c85baec427e8c0f91d SHA1 9c37dd39af45b0b8741e7ea75fa2c0d7a4c3c94e SHA256 b38bdcab482a46c5fedbb8e370d96e9a8ba31fc959660d0b300982be911e64a9
+EBUILD proftpd-1.3.4.ebuild 6557 RMD160 0482611ad31e89a230719e59569b53d67a2fed91 SHA1 bffcedc2df65d0ebddfe9d1b58d277bb4f4c265a SHA256 0a4d929498f63e442b341d4de71a1fb11e1d4c8b4ff1529f43d5e30932e57375
+MISC ChangeLog 48626 RMD160 b7894ba0325b0fd81fcf68d760ea2f9dd71e85ea SHA1 9db96fa25506c1dcd739920bdecb47fbbf45d0d4 SHA256 07a6a85b6d6d30a942aa67e974e7bbc39d1f4d0556d20b17914f24d23d720644
 MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk63ze0ACgkQFYEBGcdFJfKeBwEAkPggLJSrxZ7ozvlV706m934b
-cW6HcFWTmQHelRjSZTUBAKh5o8rkryQmk6s2wFLkKYr9XAGeMfILRhr/sZc92Ujm
-=CUer
+iF4EAREIAAYFAk7A6t0ACgkQFYEBGcdFJfKYqQEAprx5P0ul/5qp/bumSTKmHYK/
+XeuE09Xh8NgKkHYLhqkA/i/K29MfiVj+FXHE/0Rt2fAbZOB5Pa8ofDqhU/7hKL3X
+=OPso
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.3g.ebuild b/net-ftp/proftpd/proftpd-1.3.3g.ebuild
new file mode 100644
index 000000000000..421723fc1823
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.3g.ebuild
@@ -0,0 +1,220 @@
+# 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.3g.ebuild,v 1.1 2011/11/14 10:17:48 voyageur 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.9.2"
+
+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 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 ban || 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 || die "install failed"
+
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+	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.4_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.4.ebuild
index f7db14b15d68..120e6cd3e1e4 100644
--- a/net-ftp/proftpd/proftpd-1.3.4_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4.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.4_rc3.ebuild,v 1.1 2011/09/28 09:47:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4.ebuild,v 1.1 2011/11/14 10:17:48 voyageur Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -30,7 +30,7 @@ IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifs
 	ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite
 	selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
 
-COMMON_DEPEND="acl? ( virtual/acl )
+CDEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
 	kerberos? ( virtual/krb5 )
@@ -46,10 +46,9 @@ COMMON_DEPEND="acl? ( virtual/acl )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl )
 	xinetd? ( virtual/inetd )"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
 	test? ( dev-libs/check )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	net-ftp/ftpbase
 	selinux? ( sec-policy/selinux-ftpd )"