Version bump to ProFTPd 1.3.1.

Package-Manager: portage-2.1.5_rc4

5 files changed, 93 insertions, 44 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index ae9124cee7b3..7915cb3c9b56 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-ftp/proftpd
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.166 2007/11/11 15:21:30 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.167 2008/04/17 07:57:56 chtekk Exp $
+
+*proftpd-1.3.1 (17 Apr 2008)
+
+  17 Apr 2008; Luca Longinotti <chtekk@gentoo.org>
+  -files/proftpd-1.3.1_rc3-mod_mysql.patch, files/proftpd.rc6,
+  -proftpd-1.3.1_rc3.ebuild, +proftpd-1.3.1.ebuild:
+  Version bump to ProFTPd 1.3.1. Added reload command to init-script as well
+  as improved configuration checking, fixes bug #97896. Added new modules:
+  mod_ban, mod_case, mod_deflate, mod_gzipfs, fixes bug #146888 and bug
+  #177991. Added support for LDAP TLS, fixes bug #203598. Updated mod_clamav
+  to 0.7, fixes bug #212601. Cleaned up ebuild and added support for
+  softquotas via Radius.
 
   11 Nov 2007; Raúl Porcel <armin76@gentoo.org> proftpd-1.3.1_rc3.ebuild:
   Add ~ia64 wrt #198769
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 2e118390234d..52666056730e 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,18 +3,21 @@ AUX proftpd-1.3.1_rc2-bug167003.patch 316 RMD160 7fcade6de378727081d0a14775b2e24
 AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c SHA1 65ea3a861dc493439a8b2e2d3271dba57825bbac SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc
 AUX proftpd-1.3.1_rc2-bug178866.patch 1731 RMD160 11d06f7d5ea2ad4678ff989514daaa10d1b92c2c SHA1 7b15937e55b13985ece4a6275cae4c6487b834cb SHA256 658f2e71e1e062e94e8437b10443576432fbc4dd342d297473aef603c6b450aa
 AUX proftpd-1.3.1_rc2-bug181712.patch 1098 RMD160 1c4a77dfb401c6d888fabc259e21f5022828335b SHA1 387e079c66df054909a2c7d94485189aa1b09afc SHA256 bdb1364ae5a518f5d50b8a232e94bd83b2d3f846d51566c7ed63550ac3858698
-AUX proftpd-1.3.1_rc3-mod_mysql.patch 690 RMD160 068e8452fef1be66834d484fcc4fc1c53cf6963b SHA1 3740e68d54989a3f058c18503545fee9671a2f59 SHA256 fddc261dc4aeb09980ff73ac645a4f066f42abb89de4c1eb34373e871897ad4d
 AUX proftpd.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cadfcbd1034f744f6513492258efa3b95fa9e6 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd
-AUX proftpd.rc6 763 RMD160 2895b0ae75bf520587ef2919d24ff98cc658c745 SHA1 4f18a88b6dee0781e004ce89b35551e8475ffec0 SHA256 b5635eaf53a96e5b0b6a33aabe36f000426e7e25fde62e1bdb3067c0046c600d
+AUX proftpd.rc6 1202 RMD160 03e4bd127d379bdc9c62640dea0e6f65b9defda7 SHA1 f674f0871052d7a031b4ee9886b33d6a041d635d SHA256 0ab218ccb323cbcbd53598e93c3565f00245380a9ee1374cc22c2c1db88f7a37
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
+DIST mod_clamav-0.7.tar.gz 3676 RMD160 779203276643343bb54dc5e8225cf16392959533 SHA1 2e9376865eb03d482e2aac89a0ce611a5587e084 SHA256 61aa9d6af9432d1409170305526d87f63742aca198dd299d21ce37a60a8f41e7
 DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
 DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
+DIST proftpd-1.3.1.tar.bz2 2243888 RMD160 ed47f7a7c446b01c3d00d2d25d89573c787da905 SHA1 0b54286492967172c5355e2f489f9665b46591e5 SHA256 03bc023e5b7b1c04d8eb2d5dca53b931b3e02cc7aba7dd8f629b0878535dc91b
 DIST proftpd-1.3.1rc2.tar.bz2 1516464 RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 SHA1 7db6435707983fe8e865064661cedb159ebc1cf6 SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da
-DIST proftpd-1.3.1rc3.tar.bz2 1538700 RMD160 68cbdd137caa0f7a46be18eb682d5c3c516ca167 SHA1 a752ccc2ea4d7ae6f55ac5486d1ede01f734280c SHA256 9bad65ea4ddca40547ca6bb1aa337c7d4ae54752bb9f5fc76124a8c4535daefd
+DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
+DIST proftpd-mod-deflate-0.3.tar.gz 7704 RMD160 dd51a966942642b2a5ae1cd1c3b3b6f47721637c SHA1 9d08a32da1c1e7e8b126e1fdbc172aa6889bccbc SHA256 dd6650e1cb69ee118319c19bbaa9dbe277b92675ab26e9c70a93e1e93f724adb
+DIST proftpd-mod-gzipfs-0.9rc4.tar.gz 8424 RMD160 1d0debe32557ce0a236b1b47a7ce0ae53dcd768c SHA1 c156fe85a2f6407c402ddf72c26d328db154a753 SHA256 41770fc92842986652872d8b49767d19c0b7eb190bf76a0eb6df5b61cafccaae
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
 DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
+EBUILD proftpd-1.3.1.ebuild 7149 RMD160 cf9fbd8e12c1c62f327cfcdf8bf24961268a532c SHA1 b51ddb4081c53b7130234ffb6106f6deda7efe17 SHA256 2270403c5addba7fcff1b9712ad151babfeb3b28dbcefc8e3cdbab15d322182b
 EBUILD proftpd-1.3.1_rc2-r3.ebuild 6340 RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 SHA1 7f387d202c3d7cfcf4abaaf3a0594b1fdf41e498 SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f
-EBUILD proftpd-1.3.1_rc3.ebuild 6143 RMD160 4e676bf977e0adf1f1c570f085bee1b15638df46 SHA1 6f14d23481dea523a16f218617db19546d4ed388 SHA256 3ca19780f35b98f2cded60ca3e771a54f782260da285476aa3d1691a1ebdaf3d
-MISC ChangeLog 27010 RMD160 fee3e2d8c4bcdd1d1934618ea44dc963f1414f4b SHA1 20b3e3210c90bda8b4f22ae7a39a6c0a280a9b0e SHA256 b65eaf183f924b4ce5cf01928dcfdbb0b8ed249cab21984f1b941218fcb3dd8c
+MISC ChangeLog 27601 RMD160 5a9d287700c72c7a2f306849e7b4617f79383665 SHA1 75103aea569874ab6ec620d24b3fad6417486002 SHA256 060df642a568eb3e1460e4eb17e648a5eed3b4cf3466872260ca0bf6e7b5d9ea
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch b/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch
deleted file mode 100644
index 000f6934ff72..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.1_rc3-mod_mysql.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: contrib/mod_sql_mysql.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_mysql.c,v
-retrieving revision 1.44
-diff -u -r1.44 mod_sql_mysql.c
---- contrib/mod_sql_mysql.c	9 May 2007 17:15:18 -0000	1.44
-+++ contrib/mod_sql_mysql.c	6 Jul 2007 16:48:24 -0000
-@@ -595,7 +595,7 @@
-   }
- 
-   if (!conn_pool) {
--    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been
-+    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been "
-       "properly intialized.  Please make sure your --with-modules configure "
-       "option lists mod_sql *before* mod_sql_mysql, and recompile.");
- 
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index 47b2ef651776..c3c9fb03fbba 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,7 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.11 2006/09/23 19:07:05 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.12 2008/04/17 07:57:57 chtekk Exp $
+
+opts="${opts} reload"
 
 depend() {
 	need net
@@ -14,6 +16,9 @@ checkconfig() {
 		eerror "There is a sample file in /etc/proftpd."
 		return 1
 	fi
+	ebegin "Checking proftpd configuration"
+	/usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf &>/dev/null
+	eend $? "Configuration error: please fix your configuration file (/etc/proftpd/proftpd.conf)."
 }
 
 start() {
@@ -28,3 +33,14 @@ stop() {
 	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid
 	eend $?
 }
+
+reload() {
+	if [ ! -f /var/run/proftpd.pid ] ; then
+		eerror "proftpd isn't running!"
+		return 1
+	fi
+	checkconfig || return 1
+	ebegin "Reloading proftpd"
+	kill -HUP `cat /var/run/proftpd.pid` &>/dev/null
+	eend $?
+}
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild
index 7246ebfa3c7a..1450ac92021a 100644
--- a/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild
@@ -1,39 +1,49 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild,v 1.3 2007/11/11 15:21:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.1 2008/04/17 07:57:56 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+IUSE="acl authfile ban case clamav deflate gzipfs hardened ifsession ipv6 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.7"
+DEFLATE_VER="0.3"
+GZIPFS_VER="0.9rc4"
 SHAPER_VER="0.6.3"
 VROOT_VER="0.7.2"
 
 DESCRIPTION="An advanced and very configurable FTP server."
+
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-		clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html )
+		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
+		clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
+		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
+		gzipfs? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-gzipfs-${GZIPFS_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.uglyboxindustries.com/open-source.php"
+		http://www.thrallingpenguin.com/resources/mod_clamav.htm"
 
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
 		clamav? ( app-antivirus/clamav )
+		gzipfs? ( sys-libs/zlib )
 		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? ( >=dev-db/postgresql-7.3 )
+		postgres? ( virtual/postgresql-base )
 		ssl? ( >=dev-libs/openssl-0.9.6f )
 		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-		xinetd? ( sys-apps/xinetd )"
+		xinetd? ( virtual/inetd )"
 
 RDEPEND="${DEPEND}
 		net-ftp/ftpbase
@@ -56,14 +66,34 @@ src_unpack() {
 	# Fix stripping of files
 	sed -e "s| @INSTALL_STRIP@||g" -i Make*
 
-	if use shaper ; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp -f mod_shaper/mod_shaper.c contrib/
+	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
-		cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c
-		cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html
+		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 gzipfs ; then
+		unpack ${PN}-mod-gzipfs-${GZIPFS_VER}.tar.gz
+		cp -f mod_gzipfs/mod_gzipfs.c contrib/
+		cp -f mod_gzipfs/mod_gzipfs.html doc/
+	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
@@ -71,8 +101,6 @@ src_unpack() {
 		cp -f mod_vroot/mod_vroot.c contrib/
 		cp -f mod_vroot/mod_vroot.html doc/
 	fi
-
-	epatch ${FILESDIR}/${P}-mod_mysql.patch
 }
 
 src_compile() {
@@ -81,7 +109,11 @@ src_compile() {
 
 	modules="mod_ratio:mod_readme"
 	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 gzipfs && modules="${modules}:mod_gzipfs"
 	use pam && modules="${modules}:mod_auth_pam"
 	use radius && modules="${modules}:mod_radius"
 	use rewrite && modules="${modules}:mod_rewrite"
@@ -97,11 +129,14 @@ src_compile() {
 	if use ldap ; then
 		modules="${modules}:mod_ldap"
 		append-ldflags "-lresolv"
+		if use ssl ; then
+			CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
+		fi
 	fi
 
 	if use opensslcrypt ; then
-		append-ldflags "-lcrypto"
 		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+		append-ldflags "-lcrypto"
 		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
 	fi
 
@@ -130,6 +165,9 @@ src_compile() {
 		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
@@ -169,8 +207,6 @@ src_compile() {
 }
 
 src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	keepdir /var/run/proftpd
@@ -181,8 +217,6 @@ src_install() {
 	dohtml doc/*.html
 	dohtml doc/howto/*.html
 
-	use shaper && dohtml mod_shaper/mod_shaper.html
-
 	docinto rfc
 	dodoc doc/rfc/*.txt