new version proftpd-1.2.10_rc3

6 files changed, 59 insertions, 11 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index cc136e834ce1..bf2b4e0975e9 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.65 2004/07/08 00:32:07 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.66 2004/07/14 14:09:24 humpback Exp $
+
+*proftpd-1.2.10_rc3 (14 Jul 2004)
+
+  14 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10_rc1-r1.ebuild, +proftpd-1.2.10_rc3.ebuild:
+  Adding rc3. Please report back (by mail) sucess stories
+
+  14 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  proftpd-1.2.10_rc1-r1.ebuild:
+  Added softquota flag to rc1-r1 and removed the old rc1 ebuild. 1.2.10_rc2 came
+  out today but has a bug and will not build, I have contacted upstream and rc3
+  will come out soon.
 
 *proftpd-1.2.10_rc1-r1 (08 Jul 2004)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 663f868b6a05..2d406db3f51f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,10 +1,10 @@
-MD5 88e8184f35547686e5fe3a378929ed62 ChangeLog 10410
+MD5 0a106ecf6fee0a1739ebe28c455ea366 ChangeLog 10894
 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
-MD5 91ad69862f07da6565eeeabc3e4e88c4 proftpd-1.2.10_rc1.ebuild 3311
+MD5 5f3498857b3287515db1778c3db5aabb proftpd-1.2.10_rc3.ebuild 3954
 MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662
 MD5 e918b040fef86b28ba4c131b7d3f45a3 proftpd-1.2.8.ebuild 2730
 MD5 a4379733b0f2cd446463beb90f162c6b proftpd-1.2.9-r2.ebuild 3428
-MD5 85008b96cbd4309d3180f79cdce03321 proftpd-1.2.10_rc1-r1.ebuild 3668
+MD5 8e896fcab725708e3662a70dd699fcfc proftpd-1.2.10_rc1-r1.ebuild 3957
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 e6331bfbeaeb23c239376373955082d6 files/digest-proftpd-1.2.10_rc1-r1 145
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
@@ -16,4 +16,4 @@ MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
 MD5 62d7f269e56dedc62cf70cbc5998dc28 files/proftpd.rc6 737
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
-MD5 df6669427e230a70e2a4dd815456c7fe files/digest-proftpd-1.2.10_rc1 70
+MD5 b661e60d03ab2327388f6ea3b8159fed files/digest-proftpd-1.2.10_rc3 145
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1 b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1
deleted file mode 100644
index 256c6b7296e0..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fefde742d34b573fab56d9acbac45593 proftpd-1.2.10rc1.tar.bz2 908722
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3 b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3
new file mode 100644
index 000000000000..8c695ecf277f
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3
@@ -0,0 +1,2 @@
+MD5 d834bb822816a2ce483cc2ef1a9533e7 proftpd-1.2.10rc3.tar.bz2 918385
+MD5 0745b02d8e336aa71b8bfc4289f6df8e proftpd-mod-shaper-0.5.2.tar.gz 17377
diff --git a/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild
index 1ae454526161..9961cf01c807 100644
--- a/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild,v 1.1 2004/07/08 00:32:07 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild,v 1.2 2004/07/14 14:09:24 humpback Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="ldap pam postgres mysql ssl tcpd ipv6 shaper"
+IUSE="ldap pam postgres mysql ssl tcpd ipv6 shaper softquota"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -71,6 +71,17 @@ src_compile() {
 		myconf="--with-includes=/usr/include/postgresql"
 	fi
 
+	if use softquota; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres; then
+			modules="${modules}:mod_quotatab_sql"
+		elif use ldap; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
 	# New modules for 1.2.9
 	# Not sure how these should be enabled yet as no use variables
 	# apply currently.  Uncomment if you want to use them though.
diff --git a/net-ftp/proftpd/proftpd-1.2.10_rc1.ebuild b/net-ftp/proftpd/proftpd-1.2.10_rc3.ebuild
index a05fcc5542dc..9e4b07817b8b 100644
--- a/net-ftp/proftpd/proftpd-1.2.10_rc1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10_rc3.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc1.ebuild,v 1.2 2004/06/24 22:47:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc3.ebuild,v 1.1 2004/07/14 14:09:24 humpback Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="ldap pam postgres mysql ssl tcpd ipv6"
+IUSE="ldap pam postgres mysql ssl tcpd ipv6 shaper softquota"
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
+		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.2.tar.gz"
 HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
@@ -24,12 +25,22 @@ DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	ssl? ( >=dev-libs/openssl-0.9.6f )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
 
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+	if use shaper; then
+		unpack ${PN}-mod-shaper-0.5.2.tar.gz
+		mv mod_shaper/mod_shaper.c contrib/
+	fi
+}
+
 src_compile() {
 	local modules myconf
 
 	modules="mod_ratio:mod_readme"
 	use pam && modules="${modules}:mod_auth_pam"
 	use tcpd && modules="${modules}:mod_wrap"
+	use shaper && modules="${modules}:mod_shaper"
 
 	if use ldap; then
 		einfo ldap
@@ -60,6 +71,17 @@ src_compile() {
 		myconf="--with-includes=/usr/include/postgresql"
 	fi
 
+	if use softquota; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres; then
+			modules="${modules}:mod_quotatab_sql"
+		elif use ldap; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
 	# New modules for 1.2.9
 	# Not sure how these should be enabled yet as no use variables
 	# apply currently.  Uncomment if you want to use them though.
@@ -80,6 +102,7 @@ src_compile() {
 		--enable-shadow \
 		--disable-sendfile \
 		--enable-autoshadow \
+		--enable-ctrls \
 		--with-modules=${modules} \
 		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
 
@@ -98,6 +121,7 @@ src_install() {
 		COPYING CREDITS ChangeLog NEWS README* \
 		doc/{license.txt,GetConf}
 	dohtml doc/*.html
+	use shaper && dohtml mod_shaper/mod_shaper.html
 	docinto rfc
 	dodoc doc/rfc/*.txt