Version bump and fix quiet mode in init script, thanks Lommerzheim <bernd@lommerzheim.com>, bugs #314055 and #330253

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

4 files changed, 242 insertions, 7 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index a62873a3694d..428706a0b5bb 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.231 2010/06/23 13:37:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.232 2010/07/29 21:50:32 voyageur Exp $
+
+*proftpd-1.3.3a (29 Jul 2010)
+
+  29 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +proftpd-1.3.3a.ebuild, files/proftpd.initd:
+  Version bump and fix quiet mode in init script, thanks Lommerzheim
+  <bernd@lommerzheim.com>, bugs #314055 and #330253
 
 *proftpd-1.3.3-r1 (23 Jun 2010)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 744207efe1cb..acc09d9975ba 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,7 +4,7 @@ AUX proftpd-1.3.2-system-libltdl.patch 1932 RMD160 135045db34d87dfdb62ff64386477
 AUX proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch 581 RMD160 82170fc75ffd9a41bea7cec2e157ed50f63c2745 SHA1 12b4507c43c45c8448f37d76359bf59e327879f2 SHA256 2bdc2a215242f440902995bc9533ff9d42972535550d0cedaf25b7594f39ac19
 AUX proftpd.conf 1968 RMD160 10394bf0fcaa201c59873c1a518a75f7f9d7b53c SHA1 6d3c932efa5a16c3772b49d68bc46e0239472b0b SHA256 82ebf842526eb5b1e6ac2126511063b8242ad66a271095b2ab5d1f18f908c192
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
-AUX proftpd.initd 1430 RMD160 12af3b64787f067f162496f4f79ad47bc0b6336a SHA1 947bedbe31b44b9e99dcc5f0ef0b49e4bf15c160 SHA256 fe06e962106420a89e67797a09c14418190f6468c13d36a93cbb3afff6008f67
+AUX proftpd.initd 1628 RMD160 944b3e8e4ffd008d7fef55a09e8d374f5ca74597 SHA1 fa39e5a2a06bbf3fdf5c50be55c8d3c7f87a23f2 SHA256 167fac1a864179a53e4ea26377ec2fe9b5e60d9ba564f37f5b86474b18c2fd43
 AUX proftpd.rc6 1192 RMD160 09e2e7b9429b123da51331c5cb29b7f79fe03989 SHA1 b7605beebe10749e1adc3204f7a48e45f653690a SHA256 674d614bfaaea90cf9444d84688b8c77e9af482b148bf460919783627ad17918
 AUX proftpd.rc7 1398 RMD160 e3b0f22e40aec815e9e307c49b343689322c1b5b SHA1 497faab41e2966f731ec2a68e45948008f7984b9 SHA256 1c8f8cbbdb1982a1a6ec2d74b00bc40c7a198f9b64f5bc53baa49f41d7a0d0dd
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
@@ -14,7 +14,9 @@ DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30
 DIST proftpd-1.3.2d.tar.bz2 2545428 RMD160 878f830b3dc1af9f630a8c527c8d132252daa592 SHA1 b02dacf74e3b5d4e510df67ea26063278176a690 SHA256 64be10d5190d3b596c04c04fa5764fd79ce212628b58e64a1ecbee743d17531f
 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-1.3.3a.tar.bz2 4157983 RMD160 a900502b02518fcad7595d19bb14bbd74c6690ba SHA1 89b6f42b6d14b53b1e35f365ed60aa3f06d116b8 SHA256 c1f73e7b189c22fe2f33a0cd6f9d3f3ad10ee73c23a1347cd13daf87fea729f7
 DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
+DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-deflate-0.4.tar.gz 2779844 RMD160 e6c7689b281ef015ceefa1d2939f5cf0a6fffc72 SHA1 2f42c3761445657e032739ea67c1cf359e527a98 SHA256 4451d9af02900aabe769f0d8a5efa80bdf2973efc4db2d138623b01b3ef72b69
 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
@@ -24,5 +26,6 @@ EBUILD proftpd-1.3.2d.ebuild 8239 RMD160 41eda9307fe524840dafd90c876f0449005a03b
 EBUILD proftpd-1.3.2e.ebuild 8246 RMD160 3e5d405db4d2da8daeed31e7853abda8a03dc032 SHA1 2781c8dec53c45ff47bb57e8172ead1352260725 SHA256 5830695bda8d099cf0e5d6984124b131eecb1fe49991af6561caee6bca7485e4
 EBUILD proftpd-1.3.3-r1.ebuild 7276 RMD160 d8a9357e896df752923fcf8d637f10632c510e94 SHA1 35f2ed96824739a475ea6690f6b31f0508d75ad8 SHA256 adc301d288ea9ce7a4c4960598f5fdd2e915fb6eea674a53a4755210721c0bfd
 EBUILD proftpd-1.3.3.ebuild 7087 RMD160 1f93876a995e5caf2145f8a03047de839ba8b507 SHA1 d03bf525d997c485226186f3a4cb901165c73723 SHA256 54eb92d72aaea49232ce31da936c14cd80cdec8de64201fe03b671b7478f93d8
-MISC ChangeLog 39299 RMD160 f5888e3ac460a54562007eaaa57598bece01a61b SHA1 1dea6eeebd08d5f07254b3a37f86e91a3ca68da8 SHA256 846c5551034e4afdd15a7f8ff3859fb9d970ddceed2a718f4d6417167e4c2002
+EBUILD proftpd-1.3.3a.ebuild 7183 RMD160 aefd29718fdd5d3d1e5396455057fe0860e938c9 SHA1 3af20bcf33156c0e98f0cd32fbca8971f0fa914d SHA256 756599394a1ba5f5f9d4f69f6fc3bcbe403e8156fefe19bac4dbffa524f2707c
+MISC ChangeLog 39554 RMD160 3215f4999d7a966f2a3fd440dc9f4b82623a72c6 SHA1 d85924c85b1b3ad458037c90e2b3cc55a36979b9 SHA256 a4be98cec45786635f1c0e1813ed3bac2272225d85c38803d3e376f1a2f7c71e
 MISC metadata.xml 1812 RMD160 79f9109e0364ddcff30da3f86af3c889f4ea1cee SHA1 dacd8d433d5f42e4dd7b6cb33ec9131f07abd98b SHA256 313c3786f11cc6311966be048d4290cf363e46c5e7dc31b5ed6890c7071efdbf
diff --git a/net-ftp/proftpd/files/proftpd.initd b/net-ftp/proftpd/files/proftpd.initd
index 1e2f9b2c8f66..d5a0eb79807c 100644
--- a/net-ftp/proftpd/files/proftpd.initd
+++ b/net-ftp/proftpd/files/proftpd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.1 2010/02/17 12:28:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.2 2010/07/29 21:50:32 voyageur Exp $
 
 opts="reload"
 
@@ -16,9 +16,13 @@ check_configuration() {
 		eerror "file. In /etc/proftpd you can find a sample configuration."
 		return 1
 	fi
-	ebegin "Checking ProFTPD configuration"
-	/usr/sbin/proftpd -t
-	eend $? "A configuration error was found. You have to fix your configuration file."
+ 	/usr/sbin/proftpd -t &>/dev/null
+ 	if [ $? -ne 0 ] ; then
+ 		eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to"
+ 		eerror "fix your configuration in order to run the ProFTPD server. For more information"
+ 		eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'."
+ 		return 2
+ 	fi
 }
 
 start() {
diff --git a/net-ftp/proftpd/proftpd-1.3.3a.ebuild b/net-ftp/proftpd/proftpd-1.3.3a.ebuild
new file mode 100644
index 000000000000..e661755b1207
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.3a.ebuild
@@ -0,0 +1,221 @@
+# 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.3a.ebuild,v 1.1 2010/07/29 21:50:32 voyageur Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+CASE_VER="0.4"
+CLAMAV_VER="0.11rc"
+DEFLATE_VER="0.5.4"
+GSS_VER="1.3.3"
+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? ( 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 )
+	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 MySQL includes
+	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
+
+	# 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-${GSS_VER}
+		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"
+	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 ; 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: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 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
+}