Maintenance release for 1.3.2, and final 1.3.3 release, bug #307075. Also remove 1.3.3 RCs

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

5 files changed, 297 insertions, 241 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 1ee3a4cce12c..6b662dcbb46a 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.223 2010/03/07 15:04:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.224 2010/03/08 13:38:46 voyageur Exp $
+
+*proftpd-1.3.3 (08 Mar 2010)
+*proftpd-1.3.2e (08 Mar 2010)
+
+  08 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +proftpd-1.3.2e.ebuild, -proftpd-1.3.3_rc3-r1.ebuild,
+  -proftpd-1.3.3_rc4.ebuild, +proftpd-1.3.3.ebuild:
+  Maintenance release for 1.3.2, and final 1.3.3 release, bug #307075. Also
+  remove 1.3.3 RCs
 
   07 Mar 2010; Markus Meier <maekke@gentoo.org> proftpd-1.3.2d.ebuild:
   amd64 stable, bug #305343
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 2fc679afdc9a..95d8868dffa0 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX proftpd-1.3.2-mysql-include.patch 363 RMD160 4406e4ff522580962662f9aa00310a75f4984cbd SHA1 979f0c1272c25e34fe489ac4227f2dce2db35804 SHA256 5be06884923c23ff4e44e5e9e87d27a88aaee2d10bc341daba6cd21d26543330
 AUX proftpd-1.3.2-parallel-build.patch 786 RMD160 ff9df4ca01c5d95664bc00650996896300ada1d7 SHA1 c0d6d23c8da22cf6b9b882d01ab6e562d51dd1b3 SHA256 a429b3f7c79d46a279d77357481208f962b6e93fcea5424b2b030e366fe3c662
 AUX proftpd-1.3.2-system-libltdl.patch 1932 RMD160 135045db34d87dfdb62ff643864778c3884fa013 SHA1 6e1fe98fd9e3b92aaa2886536646b7bb58765c89 SHA256 74bcb197a66b7767d8b5d327e955d979d5676be6bc3d17794be8ddc09879f2b4
@@ -13,28 +10,22 @@ AUX proftpd.rc7 1398 RMD160 e3b0f22e40aec815e9e307c49b343689322c1b5b SHA1 497faa
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
 DIST mod_gss-1.3.2.tar.gz 114142 RMD160 5dba4a716fd2abd99a83a7b263f53c07062ada9d SHA1 9f1c4530ba8ce9d96141bcb18cc123adbc04e505 SHA256 e66ee593628880e38bd0694ab256244c40fe80baa6663ea96003ce73b94e1336
+DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
 DIST proftpd-1.3.2b.tar.bz2 2507569 RMD160 eac9ebe625c60b362d96965cc72a0fbb4e2479bb SHA1 facd51ff9c35fa8bf2959d2829da1304a63c646a SHA256 ac99969b0bb12f02098dcdf5c23d45c85b05ba2453b78f56fce5e7352d0ac192
 DIST proftpd-1.3.2c.tar.bz2 2536105 RMD160 0754e3e9a6915ca497924448899238d60226ca63 SHA1 d81c4b988fc70109a82804852378bfd6f28602a6 SHA256 4238ade6978ff578735b070667ff798ac10edf97af9d56d33528ebdc500916f9
 DIST proftpd-1.3.2d.tar.bz2 2545428 RMD160 878f830b3dc1af9f630a8c527c8d132252daa592 SHA1 b02dacf74e3b5d4e510df67ea26063278176a690 SHA256 64be10d5190d3b596c04c04fa5764fd79ce212628b58e64a1ecbee743d17531f
-DIST proftpd-1.3.3rc3.tar.bz2 4123639 RMD160 3dbb81287ec9be8b810a196d4334bb1a036d90bc SHA1 2bf2b4d602e79e36470039a762d914a90c3f385a SHA256 127e3b9e3a0f7c0a7955cc82d3669bd4b98c351312a7a0b340a292d7a407b3a2
-DIST proftpd-1.3.3rc4.tar.bz2 4131381 RMD160 5640517adff260ceb355db86b6e981fcf866bbff SHA1 2be66bb66bf9704d7489b08de4a84784811fbe0a SHA256 b60d9c2c99d159e307ce433700188337079de82a694b0b29cca0b07077d7a46f
+DIST proftpd-1.3.2e.tar.bz2 2545499 RMD160 31e814b7d009251bfa1a459066574c741309da4c SHA1 6e9bcb9d413e8c59c15de230346eada63399b2a3 SHA256 23fbb10b0f85a6141987dfd52010f7efdd723b84068964cb085cdfb97c0effdf
+DIST proftpd-1.3.3.tar.bz2 4132650 RMD160 01c9226f694129561dd35a03631c6a2b8bd593dc SHA1 ce7c1f96648f94e32d5d104cd1405e6778aae045 SHA256 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c
 DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
 DIST proftpd-mod-deflate-0.4.tar.gz 2779844 RMD160 e6c7689b281ef015ceefa1d2939f5cf0a6fffc72 SHA1 2f42c3761445657e032739ea67c1cf359e527a98 SHA256 4451d9af02900aabe769f0d8a5efa80bdf2973efc4db2d138623b01b3ef72b69
-DIST proftpd-mod-deflate-0.5.tar.gz 55218571 RMD160 c24c60d9219970e3f8c27a96a1572559f2191788 SHA1 4f76815a94c1454c2867781b6bb2fce558898d2d SHA256 8d0c245a1b51481f6d5ca95fc4e857655da9a6dbe8dce2d81a59e0d2ef5f0f92
+DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
 DIST proftpd-mod-shaper-0.6.5.tar.gz 19175 RMD160 233f399c08c18514b0f23dcc3b0fd0d0670dca42 SHA1 7c841543e7ac3005c914b0f77670c94dc7a8d51f SHA256 dc69e352b0ffd7d76f4d08cad631b6401ed9a67447995f3ce47752e4fc69e935
 DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28fc4bf9f85 SHA1 c5448ca0a7c2f1a73093ae6834f6516092cd1508 SHA256 ed3031d8330467e4c1ccb7a395b41a1d5628a89f4fcde80e3bb7ed62e987d85a
 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
 EBUILD proftpd-1.3.2b.ebuild 8239 RMD160 6b7bf9da71617d2498e31ba5d367bf63c5c65760 SHA1 29a7288885dae9b010485b98582c673058b74c58 SHA256 0ae557d3d679af92471592a144f8eb31f77a9878a590c6e47d859fd6fc5c6a9f
 EBUILD proftpd-1.3.2c.ebuild 8248 RMD160 9c535f463b6c7612be770547ab8746f474b34fc8 SHA1 b0b35908036f6389e431f433f6443d23fe02f428 SHA256 82e49468c8b453a2140f47455feceee11885598b819e473e3289dcfd584a1d40
 EBUILD proftpd-1.3.2d.ebuild 8244 RMD160 773ab5169379bc40b73a5c3aa9dd392ade4c8a96 SHA1 fe9fb7cf94ef965e574343d4b0a693fa005a7b24 SHA256 8d675028c5baf5afb37f0e020e0bd1b9633a1faf1b32c8062ee7f2fa6c36be4d
-EBUILD proftpd-1.3.3_rc3-r1.ebuild 7251 RMD160 5f9caf219713db906515a50816c0deb11ad08a08 SHA1 ae260e2cdd3ec5a136184d09c59b5bce278a3e74 SHA256 e169ccec382a8ff65cef03510caf538f2d31525087c57eead500eabbb137af61
-EBUILD proftpd-1.3.3_rc4.ebuild 7091 RMD160 2fe91a9e39c73a80504b76afb4df17b6a6e3d7bb SHA1 69375a5e6e84431705e38b375fb42b39d8335ca6 SHA256 bcdf98cb6e0372a9c70b7601c4697d345d014e5365d1ffddcca2eb234a6b2057
-MISC ChangeLog 37951 RMD160 a8a26ed820a562f56d5da38730f5fd794ad08277 SHA1 fb9850fdff4a73b178d7f2e21d1092836f889c37 SHA256 7918f10189f04bd331a3a23e3d56349b85d79962d4eb82e7b73b6d76c873762f
+EBUILD proftpd-1.3.2e.ebuild 8248 RMD160 dc38e19ee4396282ec337056b011938011a45c70 SHA1 e011d5966fa112debe518e4587b0bbfc7053ed9e SHA256 69cdaa2a4ea3029df74a148aab6af2287cd30c93dde2b34f9e9529218a06f0c7
+EBUILD proftpd-1.3.3.ebuild 7089 RMD160 86cfb5ed27e73a61c680e25fdecbfe37c9869050 SHA1 b9ebe8b7f440da9be537ded3c2557fa06e7ff143 SHA256 8a031f163adca8fd43f40f392bbf8c46801b75be76ece28bac9da9f10cff9c02
+MISC ChangeLog 38272 RMD160 9821f2b05d7ba5179f2aec219d10637379cb6812 SHA1 4355dca17051e68924ea4e125a131bbd3ef80be3 SHA256 89be9c87dafbdc539bc285f7dad7595e2828baf85edfefef3c2a6875e862fa7d
 MISC metadata.xml 1903 RMD160 a15236976f8f0d3f1102ca97f5d9ee1d3e9abe42 SHA1 7cad7067da6c4fe1a5e882792f1516b8a0bb53a6 SHA256 0283e9ccb80ad1b1892a1ee84074210add15433c59b6e4daad5a55d39ff30fd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuTwDEACgkQkKaRLQcq0GK2QwCcDF0LbEmh7KoP1V2h1GKu2Bik
-HcoAn2m02rIxAsvr7DAwCk2x4vOhDpeo
-=6iSb
------END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.2e.ebuild b/net-ftp/proftpd/proftpd-1.3.2e.ebuild
new file mode 100644
index 000000000000..14a0f70e4ece
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.2e.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2e.ebuild,v 1.1 2010/03/08 13:38:46 voyageur Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+
+CASE_VER="0.3"
+CLAMAV_VER="0.11rc"
+DEFLATE_VER="0.4"
+MODGSS_VER="1.3.2"
+SHAPER_VER="0.6.5"
+VROOT_VER="0.8.3"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+
+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-${MODGSS_VER}.tar.gz )
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+
+HOMEPAGE="http://www.proftpd.org/
+		http://www.castaglia.org/proftpd/
+		http://www.thrallingpenguin.com/resources/mod_clamav.htm
+		http://gssmod.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+		clamav? ( app-antivirus/clamav )
+		kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		ncurses? ( sys-libs/ncurses )
+		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+		pam? ( virtual/pam )
+		postgres? ( virtual/postgresql-base )
+		ssl? ( >=dev-libs/openssl-0.9.6f )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+		xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+	# Add the proftpd user to make the default config
+	# work out-of-the-box
+	enewgroup proftpd
+	enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+	unpack ${P/_/}.tar.bz2
+	cd "${S}"
+
+	# Fix parallel build (committed upstream in 1.3.3rc1)
+	epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch
+	# Fix mysql include when both backends are enabled
+	epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch
+	# Do not use bundled libltdl when compiling mod_dso
+	epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch
+
+	# Fix stripping of files
+	sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+	if use case ; then
+		unpack ${PN}-mod-case-${CASE_VER}.tar.gz
+		cp -f mod_case/mod_case.c contrib/
+		cp -f mod_case/mod_case.html doc/
+	fi
+
+	if use clamav ; then
+		unpack mod_clamav-${CLAMAV_VER}.tar.gz
+		cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
+		epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
+	fi
+
+	if use deflate ; then
+		unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
+		cp -f mod_deflate/mod_deflate.c contrib/
+		cp -f mod_deflate/mod_deflate.html doc/
+	fi
+
+	if use kerberos ; then
+		unpack mod_gss-${MODGSS_VER}.tar.gz
+	fi
+
+	if use shaper ; then
+		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+		cp -f mod_shaper/mod_shaper.c contrib/
+		cp -f mod_shaper/mod_shaper.html doc/
+	fi
+
+	if use vroot ; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp -f mod_vroot/mod_vroot.c contrib/
+		cp -f mod_vroot/mod_vroot.html doc/
+	fi
+
+	# Fix bug #221275
+	# extract custom PR_ macros from aclocal.m4 to acinclude.m4
+	# and delete the provided aclocal.m4 before running autoreconf
+	einfo "Extract custom m4 macros from aclocal.m4 ..."
+	sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4
+	rm -f aclocal.m4
+
+	eautoreconf
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf mylibs
+
+	modules="mod_ratio:mod_readme:mod_ctrls_admin"
+	use acl && modules="${modules}:mod_facl"
+	use ban && modules="${modules}:mod_ban"
+	use case && modules="${modules}:mod_case"
+	use clamav && modules="${modules}:mod_clamav"
+	use deflate && modules="${modules}:mod_deflate"
+	use pam && modules="${modules}:mod_auth_pam"
+	use radius && modules="${modules}:mod_radius"
+	use rewrite && modules="${modules}:mod_rewrite"
+	use shaper && modules="${modules}:mod_shaper"
+	use sitemisc && modules="${modules}:mod_site_misc"
+	use ssl && modules="${modules}:mod_tls"
+	use tcpd && modules="${modules}:mod_wrap"
+	use vroot && modules="${modules}:mod_vroot"
+
+	# pam needs to be explicitely disabled
+	use pam || myconf="${myconf} --enable-auth-pam=no"
+
+	if use ldap ; then
+		modules="${modules}:mod_ldap"
+		mylibs="${mylibs} -lresolv"
+		use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
+	fi
+
+	if use opensslcrypt ; then
+		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+		mylibs="${mylibs} -lcrypto"
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+	fi
+
+	use nls && myconf="${myconf} --enable-nls"
+
+	if use mysql || use postgres ; then
+		modules="${modules}:mod_sql"
+		if use mysql ; then
+			modules="${modules}:mod_sql_mysql"
+			myconf="${myconf} --with-includes=/usr/include/mysql"
+		fi
+		if use postgres ; then
+			modules="${modules}:mod_sql_postgres"
+			myconf="${myconf} --with-includes=/usr/include/postgresql"
+		fi
+	fi
+
+	if use softquota ; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres ; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use radius ; then
+			modules="${modules}:mod_quotatab_radius"
+		fi
+		if use ldap ; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# mod_ifsession should be the last module in the --with-modules list
+	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+	use ifsession && modules="${modules}:mod_ifsession"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	gcc-specs-pie && echo > lib/libcap/cap_sys.c
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	if use kerberos ; then
+		cd "${S}"/mod_gss-${MODGSS_VER}
+		# Generate source files for installed virtual/krb5 provider
+		if has_version app-crypt/mit-krb5; then
+			econf --enable-mit
+		else
+			econf --enable-heimdal
+		fi
+		cd "${S}"
+		# copy the generated files
+		cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/
+		cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/
+		cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/
+
+		myconf="${myconf} --enable-dso  --with-shared=mod_gss:mod_auth_gss"
+	fi
+
+	LIBS="${mylibs}" econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /var/run/proftpd
+
+	dodoc "${FILESDIR}/proftpd.conf" \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/license.txt
+	dohtml doc/*.html
+	dohtml doc/howto/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
+
+	insinto /etc/proftpd
+	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/proftpd.xinetd" proftpd
+	fi
+
+	newinitd "${FILESDIR}/proftpd.rc6" proftpd
+}
+
+pkg_postinst() {
+	elog
+	elog "You can find the config files in /etc/proftpd"
+	elog
+	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+	ewarn "Remember to change that in the configuration file."
+	ewarn
+	if use mysql && use postgres ; then
+		ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules."
+		ewarn "You can use the 'SQLBackend' directive to specify the used SQL"
+		ewarn "backend. Without this directive the default backend is MySQL."
+		ewarn
+	fi
+	if use clamav ; then
+		ewarn "mod_clamav was updated to a new version, which uses Clamd"
+		ewarn "only for virus scanning, so you'll have to set Clamd up"
+		ewarn "and start it, also re-check the mod_clamav docs."
+		ewarn
+	fi
+}
diff --git a/net-ftp/proftpd/proftpd-1.3.3_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.3.ebuild
index 935e6d8063f4..f6ec2e71a27d 100644
--- a/net-ftp/proftpd/proftpd-1.3.3_rc4.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc4.ebuild,v 1.1 2010/02/17 12:28:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3.ebuild,v 1.1 2010/03/08 13:38:46 voyageur Exp $
 
 EAPI="2"
 inherit eutils
 
 CASE_VER="0.3"
 CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5"
-GSS_VER="1.3.2"
+DEFLATE_VER="0.5.4"
+GSS_VER="1.3.3"
 VROOT_VER="0.8.5"
 
 DESCRIPTION="An advanced and very configurable FTP server."
diff --git a/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild
deleted file mode 100644
index 513558c25289..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc3-r1.ebuild,v 1.1 2009/12/18 23:13:25 voyageur Exp $
-
-EAPI="2"
-inherit eutils
-
-CASE_VER="0.3"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.4"
-GSS_VER="1.3.2"
-VROOT_VER="0.8.5"
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened 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? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( virtual/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 segfault on conf check, Gentoo bug #297310
-	epatch "${FILESDIR}"/${P}-tls-shmcache-bug3359.patch
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Fix Gentoo Bug #284853
-	use kerberos && sed -i -e "s/krb5_principal2principalname/_\0/" \
-		"${WORKDIR}"/mod_gss-${GSS_VER}/mod_auth_gss.c.in
-
-	# 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
-}
-
-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 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-1.7 ; 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}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow \
-		$(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) \
-		${myc:1} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.rc7 proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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
-}