Finally add Bernd Lommerzheim <bernd@lommerzheim.com> as maintainer, with myself as proxy maintainer. Version bump

(Portage version: 2.2.0_alpha18/cvs/Linux x86_64)

3 files changed, 240 insertions, 1 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 146d574d7a3b..44357690d6a4 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,24 @@
 # 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.255 2011/01/18 18:00:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.256 2011/01/21 20:38:01 voyageur Exp $
+
+*proftpd-1.3.4_rc1 (21 Jan 2011)
+
+  21 Jan 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +proftpd-1.3.4_rc1.ebuild, metadata.xml:
+  Finally add Bernd Lommerzheim <bernd@lommerzheim.com> as maintainer, with
+  myself as proxy maintainer
+  Version bump, including:
+  * Bump mod_vroot to 0.9.2.
+  * Move mod_deflate from an external module to a contrib module.
+  * Add support for the new mod_copy, mod_ifversion and mod_qos modules.
+  * Add support for the mod_diskuse module. Fixes Gentoo Bug #349289.
+  * Add support for the mod_sql_sqlite module. Fixes Gentoo Bug #351558.
+  * Add support for automatically finding the MySQL and PostgreSQL headers and
+  libraries
+  * Remove blocking check for a running ProFTPD pre 1.3.3. Workaround for
+  Gentoo Bug #334097.
+  * Some stylistic changes.
 
   18 Jan 2011; Jeroen Roovers <jer@gentoo.org> proftpd-1.3.3d.ebuild:
   Stable for HPPA (bug #348998).
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index aee1b7efaf29..0e9b8c90d24d 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+
+<maintainer>
+	<email>bernd@lommerzheim.com</email>
+	<name>Bernd Lommerzheim</name>
+</maintainer>
+<maintainer>
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+	<description>Proxy maintainer</description>
+</maintainer>
 <herd>net-ftp</herd>
+
 <longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>
@@ -10,10 +21,14 @@ server.</longdescription>
 	<flag name='ban'>Enable support for the mod_ban module</flag>
 	<flag name='case'>Enable support for the mod_case module</flag>
 	<flag name='ctrls'>Enable support for the mod_ctrls and mod_ctrls_admin modules</flag>
+	<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='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='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>
 	<flag name='rewrite'>Enable support for the rewrite module</flag>
diff --git a/net-ftp/proftpd/proftpd-1.3.4_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.4_rc1.ebuild
new file mode 100644
index 000000000000..b9a45420b7c3
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.4_rc1.ebuild
@@ -0,0 +1,206 @@
+# 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_rc1.ebuild,v 1.1 2011/01/21 20:38:02 voyageur Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+MOD_CASE="0.4"
+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"
+IUSE="acl authfile ban +caps case clamav copy +ctrls deflate diskuse doc exec hardened ifsession ifversion ident ipv6 kerberos ldap mysql ncurses nls pam postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite 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 )
+	sqlite? ( dev-db/sqlite:3 )
+	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
+}
+
+src_prepare() {
+	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 -rf "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
+	fi
+	use vroot && __prepare_module mod_vroot
+
+	# 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-${MOD_GSS}
+		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"
+	use copy && mym="${mym}:mod_copy"
+	if use ctrls || use shaper ; then
+		myc="${myc} --enable-ctrls"
+		mym="${mym}:mod_ctrls_admin"
+	fi
+	use deflate && mym="${mym}: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 -rf "${WORKDIR}"/mod_diskuse
+		mym="${mym}:mod_diskuse"
+	fi
+	use exec && mym="${mym}:mod_exec"
+	use ifversion && mym="${mym}: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 -rf "${WORKDIR}"/mod_gss-${MOD_GSS}
+		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 || use sqlite ; then
+		mym="${mym}:mod_sql:mod_sql_passwd"
+		use mysql && mym="${mym}:mod_sql_mysql"
+		use postgres && mym="${mym}:mod_sql_postgres"
+		use sqlite && mym="${mym}:mod_sql_sqlite"
+	fi
+	use qos && mym="${mym}:mod_qos"
+	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 || use ssl ; then
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
+		myl="${myl} -lcrypto"
+	fi
+	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 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
+}