Version bumps, fix bug #295545

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

4 files changed, 292 insertions, 5 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 07fe0b773208..0bb35289d39d 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.218 2009/11/06 14:07:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.219 2009/12/15 18:57:25 voyageur Exp $
+
+*proftpd-1.3.3_rc3 (15 Dec 2009)
+*proftpd-1.3.2c (15 Dec 2009)
+
+  15 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +proftpd-1.3.2c.ebuild, -proftpd-1.3.3_rc2.ebuild,
+  +proftpd-1.3.3_rc3.ebuild:
+  Version bumps, fix bug #295545
 
   06 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -proftpd-1.3.2-r2.ebuild, -files/proftpd-1.3.2-upstream-bug-3183.patch:
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 59927d690f44..b52402fd944f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -9,13 +9,15 @@ AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1b
 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 proftpd-1.3.2b.tar.bz2 2507569 RMD160 eac9ebe625c60b362d96965cc72a0fbb4e2479bb SHA1 facd51ff9c35fa8bf2959d2829da1304a63c646a SHA256 ac99969b0bb12f02098dcdf5c23d45c85b05ba2453b78f56fce5e7352d0ac192
-DIST proftpd-1.3.3rc2.tar.bz2 4136569 RMD160 c45497aeffcb90716e3df2d1d7168e463637b3bf SHA1 0d9145ff8eab61b2f1d8797534226886f86172d9 SHA256 9ba5c1acaede560b21a2ee6113e6ffd31722f23340c24150a10d65ed9e15f9ee
+DIST proftpd-1.3.2c.tar.bz2 2536105 RMD160 0754e3e9a6915ca497924448899238d60226ca63 SHA1 d81c4b988fc70109a82804852378bfd6f28602a6 SHA256 4238ade6978ff578735b070667ff798ac10edf97af9d56d33528ebdc500916f9
+DIST proftpd-1.3.3rc3.tar.bz2 4123639 RMD160 3dbb81287ec9be8b810a196d4334bb1a036d90bc SHA1 2bf2b4d602e79e36470039a762d914a90c3f385a SHA256 127e3b9e3a0f7c0a7955cc82d3669bd4b98c351312a7a0b340a292d7a407b3a2
 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-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.3_rc2.ebuild 7143 RMD160 a46f7e5e01812b8cc74947b651dccf8e2b84b6e9 SHA1 0634774df493c6a30a3d639774f24b684379456b SHA256 a8dbebbd4482334b0295b49aea25f07afa7fae5c16ccb4e78c50ee4c84382655
-MISC ChangeLog 36931 RMD160 7fdfd1f9b3a28c98aa141b65ba79abf9f056b077 SHA1 5576b029e38010fc4d84ac9de14458da6cfdff25 SHA256 70fc2482c5318ee2324b865e5ef810f2262f912f7ccd163bf3caed06596e220d
+EBUILD proftpd-1.3.2c.ebuild 8248 RMD160 9c535f463b6c7612be770547ab8746f474b34fc8 SHA1 b0b35908036f6389e431f433f6443d23fe02f428 SHA256 82e49468c8b453a2140f47455feceee11885598b819e473e3289dcfd584a1d40
+EBUILD proftpd-1.3.3_rc3.ebuild 7143 RMD160 8f9b2542010f4d8fe19d5b581478ac376072ea69 SHA1 926c3b49593993e49f2198494c64ad4f27e3beb7 SHA256 fe95428974efa5bd5dae7a25c797e9619dd3360ccf00ba51e53f750294000707
+MISC ChangeLog 37166 RMD160 52901d028350920e134f4b34819d43d33f5e7ab5 SHA1 ef0ea3e357c839f0ead8a1d62b15fa717da967bd SHA256 029c8d02f48bed28e213110b89666a77632e03c4f9e35d026a372522e8064c8a
 MISC metadata.xml 1903 RMD160 a15236976f8f0d3f1102ca97f5d9ee1d3e9abe42 SHA1 7cad7067da6c4fe1a5e882792f1516b8a0bb53a6 SHA256 0283e9ccb80ad1b1892a1ee84074210add15433c59b6e4daad5a55d39ff30fd7
diff --git a/net-ftp/proftpd/proftpd-1.3.2c.ebuild b/net-ftp/proftpd/proftpd-1.3.2c.ebuild
new file mode 100644
index 000000000000..0a7462fc9e48
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.2c.ebuild
@@ -0,0 +1,277 @@
+# 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.2c.ebuild,v 1.1 2009/12/15 18:57:25 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_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild
index aca916653e59..818caac4911d 100644
--- a/net-ftp/proftpd/proftpd-1.3.3_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild
@@ -1,6 +1,6 @@
 # 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_rc2.ebuild,v 1.1 2009/10/26 15:06:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3_rc3.ebuild,v 1.1 2009/12/15 18:57:25 voyageur Exp $
 
 EAPI="2"
 inherit eutils