1.3.4_rc version bump

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

4 files changed, 63 insertions, 38 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index df3cea2d13e8..c7b2e8eb78f6 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,22 @@
 # 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.266 2011/04/04 20:39:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.267 2011/04/04 20:56:08 voyageur Exp $
+
+*proftpd-1.3.4_rc2 (04 Apr 2011)
+
+  04 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -proftpd-1.3.4_rc1-r1.ebuild, +proftpd-1.3.4_rc2.ebuild:
+  Proxy commit, version bump:
+  * Replace mod_wrap with mod_wrap2. You have to adjust your configuration
+  before restarting ProFTPD! Suggested in Gentoo Bug #235940.
+  * Compatible with Gentoo FreeBSD (g/fbsd). Thanks to Dmitri Bogomolov. Fixes
+  Gentoo Bug #235940 and the half of Gentoo Bug #354295.
+  * Add ~amd64-fbsd keyword.
+  * Add memcache support with USE=memcache.
+  * Add pcre support with USE=+pcre.
+  * Fix QA warnings which were reported in Gentoo Bug #354080 c5.
+  * mod_ban requires ctrls support. Fixes Gentoo Bug #355013.
+  * Some stylistic changes.
 
 *proftpd-1.3.3e (04 Apr 2011)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index ba353beeecaa..11f6faa2e815 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -9,7 +9,7 @@ DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
 DIST proftpd-1.3.3d.tar.bz2 4177511 RMD160 8aa4e1c0456c771ae77e8682bd612b1229d05f4b SHA1 b2ee3ffdaa971c24327ad66412f2d71b628eddab SHA256 667fdf757f426517cb5fd69c3830f2b9f996febff51f59a208e46f5f1bd66606
 DIST proftpd-1.3.3e.tar.bz2 4180369 RMD160 12eef0bd466cdb1dbdd342cda8e93c1cb619dd07 SHA1 b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f SHA256 f6c65fe9fea6577ac309f4e9e36c80def271fa5c91c4053fb0758824506127b6
-DIST proftpd-1.3.4rc1.tar.bz2 59290802 RMD160 523d0b5f248d96efa408fe348b88ace8a1057e33 SHA1 859ae759f2f2588a2c9339fa033993c0934fef32 SHA256 2ed112264b8810ff76806a93d73a5e8c714508088c4938f7a96e2b9d23df809f
+DIST proftpd-1.3.4rc2.tar.bz2 6748120 RMD160 c0c5d5b447486e636c8c1de0cc62d1fc393182ac SHA1 693abfc85aa93729c87cf87f53221e95dc0f86d7 SHA256 72f3e85b2bc59b3cb94128065901f95c13c0150da1390a79864abf8d5c94e2ca
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036
@@ -17,13 +17,13 @@ DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922
 DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf
 EBUILD proftpd-1.3.3d-r1.ebuild 7253 RMD160 ca1d91eeb105d6da0ccb82742fbdf52845cef96c SHA1 b4f3aee22a594fcdebc06feae036351657ae95f2 SHA256 6b2a3798c2239647495eeee8b6ca105bb3ba14857afdcab8d836f3139b01c8ad
 EBUILD proftpd-1.3.3e.ebuild 7199 RMD160 8b9f86c636f92c05fd1243468a8479d978fec279 SHA1 5faf3af39d144375a12071939e9de29a680783d9 SHA256 3bfb7f05d78c13169097dfa83ea53a661fed5242a7f533caa050daab4ed9413a
-EBUILD proftpd-1.3.4_rc1-r1.ebuild 6652 RMD160 45514d8cfbd526114c291dda6fc176598c66bd97 SHA1 e02cc2d06c71b27d0d798fb171b8af8593d6b839 SHA256 3811641fe3dce2520ed62d88aef5e3f860700f1aec25831191d22ca71e99c86f
-MISC ChangeLog 45116 RMD160 0ea1537914c598638f2710124b4d0cf5a365611d SHA1 da7a817f68e431eb4e980b5af940f8d42e9aa191 SHA256 737f41b03a71e38b9167da24be9d1f74308ca4bdfb7ef5b03efd62d402a782ad
-MISC metadata.xml 2184 RMD160 6a97d72e3dd11c2b2cb4908326597e53d3f633eb SHA1 e143b7933c4bab599da60a8b1f3155e5779a0916 SHA256 50176a9f3ecf06378fe12d1273ad56b186c868331df48fd6b42b22311ca3222c
+EBUILD proftpd-1.3.4_rc2.ebuild 7137 RMD160 b932f080752ad3f96ec6ecd0c5bfaea42fc9b633 SHA1 7c3c282881ad523972ce4e83f0e751f31415097b SHA256 20a66c046638164d6c57f1d65377c8e16b3c34ec6f81ce2f5c055248eb51a5f9
+MISC ChangeLog 45834 RMD160 e1a4b263fbd82aa8cb717f070f4d104711303a11 SHA1 0de9f4736545721487242543d38cf643aad731f2 SHA256 5cf9a5c772d8a5c56ef8b69b1ae51e50262cb4dd0c9cc04df7425df698858f21
+MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2aLJsACgkQFYEBGcdFJfLsVgEAqijH/IvpkmS/SWWbDSsn8nrI
-ssdJd+szxdVaWjLwGmABAKMSzG3nLp7KA4g1UzKcLWi2YrkW7+VONe2+gEo/FXQ5
-=ks2d
+iF4EAREIAAYFAk2aMHkACgkQFYEBGcdFJfI16AD6AlXFHwqk3WJicwwa6I0Q5qf9
+2bdpMtvTl7b+M81HdNEA/jeUQ5cmnBg2gYOmDbB+JrxJV1HFEh2nN/yZAEOLG0hC
+=cGsm
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 0e9b8c90d24d..803b30233381 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -28,6 +28,7 @@ server.</longdescription>
 	<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='memcache'>Enable support for the mod_memcache module, for using memcached servers</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.4_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild
index 05b832887e8a..2c3683f91640 100644
--- a/net-ftp/proftpd/proftpd-1.3.4_rc1-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/02/14 15:00:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4_rc2.ebuild,v 1.1 2011/04/04 20:56:08 voyageur Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -25,24 +25,26 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 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"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident
+	ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre 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 )
+	memcache? ( >=dev-libs/libmemcached-0.37 )
 	mysql? ( virtual/mysql )
+	nls? ( virtual/libiconv )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( virtual/pam )
+	pcre? ( dev-libs/libpcre )
 	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
@@ -65,10 +67,6 @@ src_prepare() {
 	fi
 	use vroot && __prepare_module mod_vroot
 
-	# Fix ProFTPD Bug #3586
-	epatch "${FILESDIR}"/proftpd-bug3586.patch
-
-	# 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
 
@@ -89,7 +87,7 @@ src_configure() {
 	use case && mym="${mym}:mod_case"
 	use clamav && mym="${mym}:mod_clamav"
 	use copy && mym="${mym}:mod_copy"
-	if use ctrls || use shaper ; then
+	if use ctrls || use ban || use shaper ; then
 		myc="${myc} --enable-ctrls"
 		mym="${mym}:mod_ctrls_admin"
 	fi
@@ -104,6 +102,7 @@ src_configure() {
 		mym="${mym}:mod_diskuse"
 	fi
 	use exec && mym="${mym}:mod_exec"
+	use ifsession && mym="${mym}:mod_ifsession"
 	use ifversion && mym="${mym}:mod_ifversion"
 	if use kerberos ; then
 		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
@@ -122,7 +121,7 @@ src_configure() {
 		mym="${mym}:mod_gss:mod_auth_gss"
 	fi
 	if use ldap ; then
-		myl="${myl} -lresolv"
+		use elibc_glibc && myl="${myl} -lresolv"
 		mym="${mym}:mod_ldap"
 	fi
 	if use mysql || use postgres || use sqlite ; then
@@ -136,17 +135,11 @@ src_configure() {
 	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
+	use sftp || use ssl && myc="${myc} --enable-openssl"
 	if use sftp ; then
 		mym="${mym}:mod_sftp"
 		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres || use sqlite ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
+		use mysql || use postgres || use sqlite && mym="${mym}:mod_sftp_sql"
 	fi
 	use shaper && mym="${mym}:mod_shaper"
 	use sitemisc && mym="${mym}:mod_site_misc"
@@ -154,28 +147,34 @@ src_configure() {
 		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
+		use mysql || use postgres || use sqlite && mym="${mym}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		mym="${mym}:mod_tls:mod_tls_shmcache"
+		use memcache && mym="${mym}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		mym="${mym}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && mym="${mym}:mod_wrap2_sql"
 	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} \
+	LIBS="${myl:1}" econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd \
 		$(use_enable acl facl) \
 		$(use_enable authfile auth-file) \
 		$(use_enable caps cap) \
 		$(use_enable ident) \
 		$(use_enable ipv6) \
+		$(use_enable memcache) \
 		$(use_enable ncurses) \
 		$(use_enable nls) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
 		$(use_enable trace) \
-		$(use_enable pam auth-pam)
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${myc:1}
 }
 
 src_install() {
@@ -207,4 +206,13 @@ pkg_postinst() {
 		ewarn "You have been warned! Use this module at your own risk!"
 		ewarn
 	fi
+	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
 }