Version bump: fixes security bug #546644 aka CVE-2015-3306: Unauthenticated copying of files via SITE CPFR/CPTO in mod_copy (USE=copy).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 250 insertions, 8 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 51ac966952c8..4527361963ef 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.332 2015/05/30 13:57:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.333 2015/05/30 21:00:27 slyfox Exp $
+
+*proftpd-1.3.5a (30 May 2015)
+
+  30 May 2015; Sergei Trofimovich <slyfox@gentoo.org> +proftpd-1.3.5a.ebuild:
+  Version bump: fixes security bug #546644 aka CVE-2015-3306: Unauthenticated
+  copying of files via SITE CPFR/CPTO in mod_copy (USE=copy).
 
   30 May 2015; Ian Delaney <idella4@gentoo.org> proftpd-1.3.5-r2.ebuild:
   correction to the slot operator setting to dev-libs/openssl, noted by floppym
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 3654a63a473d..4ec5a974612e 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,6 +18,7 @@ DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0e
 DIST proftpd-1.3.4d.tar.gz 7697046 SHA256 c198b53991ce641eae6b3237e856e59f0bfe8330794145b49cae33f85b6f5370 SHA512 29d6d231a1ac2889dd90f64ab27e1db3e7b28b111f3c935be4611689a3808df15e87092da49ef2adf581e0c8165c0cfd8eb58e88434319286ad91d861c5b0d4d WHIRLPOOL 52fad9428329c38800412a1e9852caa436405904346c5ef04b4078accb4f4f9358e152f1b4d8501f0f3111d2417df100df4c5e87b3113546050d2d6a66c12386
 DIST proftpd-1.3.4e.tar.gz 7721545 SHA256 985f040dacced450b5b49a89efedf383eca9ab4fbd3a1e9d8ab4c61a6a19f2ba SHA512 56a1cfae9003485c8f93c3d9fcd2cd7a2d98ae06a477580e9f5eb4a1d2654c6384b7a808ba2f12ee2a3059e9a7f99e14aece927fecdc8466219a08378deb5477 WHIRLPOOL 294b99fc308ea706d68674ed1b4c490da6488080fb5d43354794edee36284331a6825bb308b768cdfd12dcfe05d53bafd906b244337408421a8f8ef7cb35f086
 DIST proftpd-1.3.5.tar.gz 7594509 SHA256 c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715 SHA512 fabc10606f2f6a33c7cbe117e774ed6eba8ef062cb792723f00cc235d4ade6499621f5d546b9b176f76780271c1c881c9e57f9cad67d288b5119fe6ca58c46dd WHIRLPOOL 2e663d8ebf05d36cb8e5fe97be66a39ee5d152bddc3b1ae38aba1d711480be3bb6b58408eff86aa893b808e5c3f8efaac70280d32c69848d861e672f6571f031
+DIST proftpd-1.3.5a.tar.gz 29988477 SHA256 a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 SHA512 d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c WHIRLPOOL 19b361b0481d5a2eab7fbe40de7bb8c9cd320a2ac04343d2fe858fdc9a62a747f89a5d4a619808bd252f6cfd9f15353df28405eb9bdc10c7c9f0162ab093bc1e
 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 WHIRLPOOL aabd1dc23d6c38d308e859ff778beffd0dabfe70d3530c093cf2f95e80b5e9c94b97b6b5ae5109d031f76ff94dffc3822a7aa60fa30df04523d37ebed99730d6
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906
@@ -26,14 +27,13 @@ EBUILD proftpd-1.3.4e.ebuild 7761 SHA256 7025ab23d5b1e4832bc44f6701ec40a980e427a
 EBUILD proftpd-1.3.5-r1.ebuild 7595 SHA256 cb13d7b257445956f949fec661ca39d5ba0fdaf066898732f0668a2aad32d30f SHA512 788dcf95e1d717dc660615b51c840aef3f173529159c45aa43f60b98ae3c740b3ac3b27ecb6ae15e74414cc150b0d1b124e335da6e294caaad5d91ea9e041f4a WHIRLPOOL 21c54afd0d60623932147673abeff29d8b8be76580d18d79462efb37d207d80baf128630cda40a57726ac834de2c7a55379f09d5606fe29a69a8fe3ededcd170
 EBUILD proftpd-1.3.5-r2.ebuild 7874 SHA256 fb167a780bd9e1013f24e71ab3720a3f36bcccb7a8d9732d8b56226a02d5af0c SHA512 eb7f2220cce9763789f1cf889561d3dc79b238efd19bf095af454a61ac43dd4411e22b090ff7544d788d9af4d2b8eb3ab8a57d1a99c99482f8f218fae9365ff9 WHIRLPOOL bde858c62b1d5053abc41db99ff5006c8dfafd0cd8628881cd09a3e7e0f9574af29738d24032fe381a307139bd245e232ca0abfd9bec99f84aa972dc46895470
 EBUILD proftpd-1.3.5.ebuild 7588 SHA256 48e07644e8dee46ac15deca105cf3b0420f4f16a8053eeaefd57c8382f6710fa SHA512 b9efadf7d7fb2f38d968f73cf822a95fde7db51dbb4d51363b6a8b28cf4ab6472621a842a6892c363c9e066b4022b988c09c7159d6c9985033ece62ff5115fd9 WHIRLPOOL fdb272a3802d7fbbec849d3f1a65960bb6807dfea166b664e558d0c90046e44b48aef0eaccace2136225b8ff6351995835571b94e7da69196050a75815792c4c
-MISC ChangeLog 57004 SHA256 599d60defc5d139ba302e984a6ef4b505b50c1f289c1977d27f38abfc166c5f3 SHA512 db48082f891ce87ee9d6f8ead2cbef20e54499f8e05ed8801534a33c9a668784dd9449e485bdd2ba8fb7a3e073f8160327990e474fdd40395a9337ebf522b3d0 WHIRLPOOL 753b7c6555e92f40a8a1b397cb302efb897a579832a0df3f79cd5bd6e8bf2ebc75fd692a343ba6d2658c1a02ec559e3d41cfca37eb520be8d59a49eb8fdf7296
+EBUILD proftpd-1.3.5a.ebuild 7547 SHA256 02558ea04afc8c736abd44bf2608ffdc91db5684476be51ec6f64659e5e8a49c SHA512 d12601784de7aba6c246831607f1d309cbf94d4ada39dc63e332b8260185e4a591a168d043ba3ae43c42a361e6d9c773a9ead0de27c1f0ad281d580d6dad209a WHIRLPOOL eb70db61b4dde3d2aa7e51bf7b63150aec39f885234e32644a97232e5b9517af9f77fe2effd9709ee8df8024693cbd6f296a2fa7f61187527222db2523de9c3b
+MISC ChangeLog 57253 SHA256 33c5c9ef9951d4a302533768d9ac6a83aa72b45a4032d14c5930c5d484cdc8ea SHA512 b5304ac9e945725de5799ebcfbc7aa9863c08c0ada25e7c7bebdc97867a778d59f31cc68dfb5636cc7759b9db743f1152eeba77dd10cf30e3dd45243058358f7 WHIRLPOOL eae395a5d114805b90ab168b8f9276e2d4410468107f5b0823aeeb026737ec1ca47f38013fb31ae01f03035a22e4e000a98bbb774ba6b8dd989a8dfc83067f7c
 MISC metadata.xml 3411 SHA256 ec37973d72776d25452672149710748670540c4d17ee283712819810a4ee4c13 SHA512 a803fc0b237660f028baf4a5c013f0dfbf17ff5ad1763b4ab1ff87c45105c307966a448989e04d43e57459f33f00297ebbc9d3e936b72752ec293e2ed0f5f6ab WHIRLPOOL bf7ef105c1e9d6af85e5c5aa9d1ae2dd556d9de35b92cfe4be2ef466ec83f67e1928df854efbf2af4a84409b9ebe29e1bc3dd7b5aa02cca4885f3c0806168598
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlVpwcZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw0MowCgwhrAuSL1QR2VxpctbHaj9dak
-n04AoMKLyCoz/NRPBF1vSKOzvKfgh5tF
-=RpWe
+iEYEAREIAAYFAlVqJO8ACgkQcaHudmEf86rBrgCggrYHS7+WTQu9W+1p3NCD+Vb7
+g3wAn0P6hNlHqSc153Ljsmi9X6/SHjCZ
+=911V
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
new file mode 100644
index 000000000000..3d01da969db7
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5a.ebuild,v 1.1 2015/05/30 21:00:27 slyfox Exp $
+
+EAPI=5
+inherit eutils multilib systemd
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.11rc"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.3"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.3"
+
+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.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
+	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( openssl )
+	shaper? ( ctrls )
+	ssl? ( openssl )"
+
+CDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( virtual/mysql )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses )
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+	xinetd? ( virtual/inetd )"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+__prepare_module() {
+	local mod_name=$1
+	local mod_topdir=${WORKDIR}/${2:-${mod_name}}
+
+	mv "${mod_topdir}/${mod_name}.c" contrib || die
+	mv "${mod_topdir}/${mod_name}.html" doc/contrib || die
+	rm -r "${mod_topdir}" || die
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
+
+	# Prepare external modules
+	use case && __prepare_module mod_case
+	if use clamav ; then
+		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
+		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
+		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
+	fi
+	use msg && __prepare_module mod_msg
+	use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT}
+
+	# Prepare external kerberos module
+	if use kerberos ; then
+		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
+	fi
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		cd "${WORKDIR}"/mod_diskuse
+		econf
+		mv mod_diskuse.{c,h} "${S}"/contrib
+		mv mod_diskuse.html "${S}"/doc/contrib
+		cd "${S}"
+		rm -r "${WORKDIR}"/mod_diskuse
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
+		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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log_forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique_id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable test tests) \
+		$(use_enable trace) \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	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
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
+}