Enable 'dynmasq' and 'msg' modules for real (bug #533028 by Till Schäfer).

Package-Manager: portage-2.2.14/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 c2141076a6de..1c1d47eed629 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.325 2014/11/20 15:38:01 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.326 2014/12/19 21:19:21 slyfox Exp $
+
+*proftpd-1.3.5-r1 (19 Dec 2014)
+
+  19 Dec 2014; Sergei Trofimovich <slyfox@gentoo.org> +proftpd-1.3.5-r1.ebuild:
+  Enable 'dynmasq' and 'msg' modules for real (bug #533028 by Till Schäfer).
 
   20 Nov 2014; Tobias Klausmann <klausman@gentoo.org> proftpd-1.3.5.ebuild:
   Stable on alpha, bug 518290
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 155496203eab..0c2841742ac3 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -21,15 +21,14 @@ DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965f
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906
 EBUILD proftpd-1.3.4d.ebuild 7745 SHA256 270e826df0c2583ecae409bb04c97423d409b353753ee75150697862e776a3d2 SHA512 493a2a3e2a81fc60c274ab889734a5888b9643ed41add3c2e61e1f775e946cafba31ca530abefedf9221528b7a636fa12b04753ee623966d9ea41843f1363759 WHIRLPOOL fa48f51836484ea501d8a21ad166457d9dff17b66fc95d6b878451f76044422b313a54e34208abb42e3821397bd777d6dcadeb78efc9ad15ad70ece4af9ee25f
 EBUILD proftpd-1.3.4e.ebuild 7762 SHA256 b6e00c48dec2330c0aa5d6439ed0e554516a788dcd9e4a701ae937a937cf08ba SHA512 911049fc6745c7101337dc4dc84fc7af3d15cbe4b0c63933e5426d622b7c7420f95012a5a1607db8de966671c8cab4e64dc981a1c737d84931a2c5350060a02b WHIRLPOOL 3dd77fdf66c65a192a9bb7fc7ae958237c7f590a5e465a445cb06b4c162516135ea46a7d38e6bc23dc4b4fabe45d3f71b5cdbb1f8014537add2f0135a9f90692
+EBUILD proftpd-1.3.5-r1.ebuild 7592 SHA256 1bb6f8f202c23c2ee86545f9fac30e1af902592a3cf6cd3cfe40ad454cfcb1fa SHA512 db456d601a2d4018ebab153cbec60470cd462e35461b57c713f30ab97a7f3aaa32d4cafa9783b9c9c110a78387f24e071513e894acff9271e263d0ca0459dea2 WHIRLPOOL 797bcfa3ae0e2d755aab23d29c307485b5af4730700a84a1f2a36baa994e7757aedd7eb57897b2690f85a94d30f4fb1389164880c5206a3963deef37f983dfc8
 EBUILD proftpd-1.3.5.ebuild 7593 SHA256 cdd280a5a91acd2bfa5700fc3d2c2a9f55c27034180dd8dabeff88b6c9fe30f6 SHA512 9fca84e136e6c42406f89014655b8a01992c3e1f58539c5203a95888c9a87cdcbadbd857a62c0c90e5af56e12bdfeaf1452f0a5c25d564fc1785a65f78808f6d WHIRLPOOL c6af7436ccbed78dafcaeb668a7223a21af2ff9c8a2cebad2d1a4acaa06c99842e37896bf329d8309216ce7461487b04902b6d34a92bf8e6a6a08d70c4a08531
-MISC ChangeLog 55787 SHA256 73ff6330d4a470b44f5aac63ad3faf53b6db08d80c43f27fbceab6c8bbb2df42 SHA512 4a9bc120810b63c230f12ad3fffa69810bbf22a3ce1c6f09aca51cd4810b1d9fa94b9d2d806f54ebab0bdca60fdc0f36322e9cbfa373291bc1e08c9feb994c24 WHIRLPOOL d5540f4aa5f5959eb663b55f41c2d658fd474c1db8d819d46138fbd9d5a9cf840bb729b7b4ce0872ac4c6d3736da4228b78bfb7b39ca27080c6e38407423d3a4
+MISC ChangeLog 55977 SHA256 1441ae726b8afaf943e37e614d9df8aae89a872e35b21edfae7cdb8f22e4ed30 SHA512 b4d2d9155da4301307cc677690fcc4edd7191a6a1a0016fe069b6292da3218b354c76b7e6796f2cfc804f442e77631d1202c9f0e7817ab91b8434d4fd75e7639 WHIRLPOOL 403eaf326222f769518374f4e7511638f0c8a93b985382196361f684893707cbb10682f57cea2ce16ee8bd6cd09c6e3274cb948f7adc23e1469f2c42ab50b44b
 MISC metadata.xml 3411 SHA256 ec37973d72776d25452672149710748670540c4d17ee283712819810a4ee4c13 SHA512 a803fc0b237660f028baf4a5c013f0dfbf17ff5ad1763b4ab1ff87c45105c307966a448989e04d43e57459f33f00297ebbc9d3e936b72752ec293e2ed0f5f6ab WHIRLPOOL bf7ef105c1e9d6af85e5c5aa9d1ae2dd556d9de35b92cfe4be2ef466ec83f67e1928df854efbf2af4a84409b9ebe29e1bc3dd7b5aa02cca4885f3c0806168598
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlRuCtpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjx4wCaA5J29P+0Wc6JgQJ2GCdtm1NB
-Tn4AnAsdfESZteVJZwEyjcNBMXIT6WBc
-=Z/FO
+iEYEAREIAAYFAlSUll0ACgkQcaHudmEf86peCwCePn4nyEdhs/8GgyElkNK6EHdo
+paQAn333Y7IXhyBoCj8Mzi0p2QeJlRWP
+=eb82
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..1ba29a6271b9
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild,v 1.1 2014/12/19 21:19:21 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 )
+	pam? ( virtual/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( virtual/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() {
+	epatch "${FILESDIR}"/${P}-netaddr-segv.patch
+
+	# 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
+}