Proxy-commit revision bump for multiple fixes, including bugs #391021, #391401 and #403639

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

4 files changed, 258 insertions, 7 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 93dfa727b46b..3f9afce6e30f 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,18 @@
 # 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.287 2011/12/29 23:30:13 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.288 2012/03/19 19:58:44 voyageur Exp $
+
+*proftpd-1.3.4a-r1 (19 Mar 2012)
+
+  19 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +proftpd-1.3.4a-r1.ebuild:
+  Revision bump, fixes:
+  * Support LINGUAS. Fix Gentoo Bug #403639.
+  * Add mod_dso support with USE=dso. Fix Gentoo Bug #391401.
+  * USE=kerberos: Replace 'rpm' with actual paths. Fix Gentoo Bug 
+  #391021.
+  * Simplify configure logic by introducing REQUIRED_USE and USE=openssl.
+  * Some cleanups.
 
   29 Dec 2011; Bernard Cafarelli <voyageur@gentoo.org> proftpd-1.3.4a.ebuild,
   +files/proftpd-1.3.4a-ubug-3682.patch, +files/proftpd-1.3.4a-ubug-3728.patch:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 95922528265f..9cfcb703662f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -20,13 +20,14 @@ DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a
 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.3g.ebuild 7180 RMD160 3e765eabf5d392c5f87d92b723e67ff656fe5a3d SHA1 89dfe43be743c732e16d404123c8dfad7483e9ea SHA256 5370228efc6e02633a8d350662892ebd48e5a29306b7785d21a91a2b325ac4a0
+EBUILD proftpd-1.3.4a-r1.ebuild 7302 RMD160 ffa85c7a2df1f15a078459adb4716ad07757808a SHA1 c87334f1130c6c5c8da1ec745786d3813c636070 SHA256 0a67ceba0f68b8293d98ac99cb3c28e763571190d656620d561170491bd1cc9f
 EBUILD proftpd-1.3.4a.ebuild 6742 RMD160 729a988d4ff73138531a6ce8c0c6089d560f4c86 SHA1 fda08bed7b8bb8d8d328147c754c8b501ada5786 SHA256 faaaab9366104d67150c328ac6e7088d074a9ab671f7389664b9d6badc3fbdc7
-MISC ChangeLog 49743 RMD160 826c557fc3d2efc5280d8b3986ce0406cecd2461 SHA1 56998f49a1b17c6e00d78356ab4dd2c9b014283f SHA256 57d65bc448b89a67908f3992847375b7ab32a56f7a2122b519e29f9d82be32bd
-MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
+MISC ChangeLog 50164 RMD160 843877cb2082602caa94866f6e8895019200e8bf SHA1 7082504c93c8fe27abc80fca3cdb93029122dec8 SHA256 a346a194ef0e105a8fbdeaa9e0e30a1cb309bc675aa2b3f0ecbf0390d745d054
+MISC metadata.xml 2731 RMD160 92b7e5bc9e157f58383fbf8a143046e5ee59de5c SHA1 21dc2b2c1047dcd431f14f2110634d766e83353c SHA256 7f93382caca116f2a5daf9a8656096f262c926aee5fe246595e17250793a381d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk78+BAACgkQFYEBGcdFJfLLIQEAi9JWSYGCz7NVwsQJoQyJ+08I
-s4ZQenxrjxKzektFbzQA/iDJintfrqXY3Lkho8RPpHNEJCKpV/zp1Nimm2V1QnZ8
-=Xepy
+iF4EAREIAAYFAk9nj/4ACgkQFYEBGcdFJfJ5DgD/Q2tSqvhmZXXIOQ0ZWy/jDJ0p
+qVGK6qGfbG6zTVvmlBABAIPeBDcWnuR3iQL1g413nqBRP7zQZLvxJZEZOTDmsOrw
+=DOKR
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 803b30233381..6b60d01256f4 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -24,11 +24,18 @@ server.</longdescription>
 	<flag name='copy'>Enable support for the mod_copy module</flag>
 	<flag name='deflate'>Enable support for the mod_deflate module</flag>
 	<flag name='diskuse'>Enable support for the mod_diskuse module</flag>
+	<flag name='dso'>Enable support for the mod_dso module</flag>
 	<flag name='exec'>Enable support for the mod_exec module. WARNING: this could be a security risk</flag>
 	<flag name='ident'>Enable support for the mod_ident module</flag>
 	<flag name='ifsession'>Enable support for the ifsession module</flag>
 	<flag name='ifversion'>Enable support for the mod_ifversion module</flag>
+	<flag name='linguas_bg_BG'>Language support for bg_BG</flag>
+	<flag name='linguas_fr_FR'>Language support for fr_FR</flag>
+	<flag name='linguas_it_IT'>Language support for it_IT</flag>
+	<flag name='linguas_ja_JP'>Language support for ja_JP</flag>
+	<flag name='linguas_ru_RU'>Language support for ru_RU</flag>
 	<flag name='memcache'>Enable support for the mod_memcache module, for using memcached servers</flag>
+	<flag name='openssl'>Enable <pkg>dev-libs/openssl</pkg> support</flag>
 	<flag name='qos'>Enable support for the mod_qos module</flag>
 	<flag name='ratio'>Enable support for the mod_ratio module</flag>
 	<flag name='readme'>Enable support for the mod_readme module</flag>
diff --git a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
new file mode 100644
index 000000000000..0dda8cb08a26
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild,v 1.1 2012/03/19 19:58:44 voyageur Exp $
+
+EAPI=4
+inherit eutils
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.11rc"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.3"
+MOD_VROOT="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-${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 )
+	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-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 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 memcache mysql ncurses nls openssl pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
+REQUIRED_USE="ban? ( 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 )
+	pam? ( virtual/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	xinetd? ( virtual/inetd )"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	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 -r "${WORKDIR}"/$1
+}
+
+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 vroot && __prepare_module mod_vroot
+
+	# Fix Gentoo Bug #354295 / ProFTPD Bug #3682
+	epatch "${FILESDIR}"/${P}-ubug-3682.patch
+
+	# Fix Gentoo Bug #393189 / ProFTPD Bug #3728
+	epatch "${FILESDIR}"/${P}-ubug-3728.patch
+
+	# 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 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"
+	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"
+	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 vroot && m="${m}:mod_vroot"
+
+	[ -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
+	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
+}
+
+pkg_postinst() {
+	if use tcpd ; then
+		ewarn
+		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
+		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
+		ewarn "portable.  But you have to adjust your configuration before restaring"
+		ewarn "ProFTPD. On the following website you can find more information:"
+		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
+		ewarn
+	fi
+}