Version bump to 1.2.10, back of mod_shaper and selinux flag

5 files changed, 30 insertions, 31 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index ad76b2317a8f..8e4484f70abd 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.68 2004/09/06 19:04:05 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.69 2004/09/07 18:09:56 humpback Exp $
+
+*proftpd-1.2.10 (07 Sep 2004)
+
+  07 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10.ebuild, -proftpd-1.2.10_rc3-r1.ebuild:
+  Adding version 1.2.10, mod_shaper is back and also adding selinux flag and
+  dep, thanks to petre rodan on bug 62905 for this one
 
 *proftpd-1.2.10_rc3-r1 (06 Sep 2004)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 21eefc307818..1e5fa36ec2a5 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662
 MD5 a0b440fbc9bae59967cedab16f183275 ChangeLog 11242
-MD5 e918b040fef86b28ba4c131b7d3f45a3 proftpd-1.2.8.ebuild 2730
 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
+MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662
+MD5 e918b040fef86b28ba4c131b7d3f45a3 proftpd-1.2.8.ebuild 2730
 MD5 a28b579450718c5bc4b60c168e015459 proftpd-1.2.9-r2.ebuild 3438
-MD5 a9f074bea3fac2b6b0277b6068af0bff proftpd-1.2.10_rc3-r1.ebuild 4039
-MD5 dbf77a47ac02f269794bae3903498893 files/digest-proftpd-1.2.10_rc3-r1 70
+MD5 bc365b722759d9ee24387db67d2a2e62 proftpd-1.2.10.ebuild 4022
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
+MD5 b283ca3fd6afecc931e8b269580604bc files/digest-proftpd-1.2.10 142
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
+MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
+MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
+MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
 MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
 MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
-MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
-MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
-MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
-MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
 MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBPLP9LLFUmVNQ7rkRAtH+AJ9A7f6t4o1zHISMPJfVZW1f20S8MACghCfy
-2zb4hF2CkgJeMYPxFHUHWhY=
-=AYga
------END PGP SIGNATURE-----
+MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10 b/net-ftp/proftpd/files/digest-proftpd-1.2.10
new file mode 100644
index 000000000000..a568ff684da7
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10
@@ -0,0 +1,2 @@
+MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
+MD5 cde6b8da69aa3bd0ff77850082d0b773 proftpd-mod-shaper-0.5.3.tar.gz 17424
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1
deleted file mode 100644
index ca7350921c95..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d834bb822816a2ce483cc2ef1a9533e7 proftpd-1.2.10rc3.tar.bz2 918385
diff --git a/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10.ebuild
index ebe130f4f2f3..a400c9d3f096 100644
--- a/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10.ebuild
@@ -1,18 +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_rc3-r1.ebuild,v 1.3 2004/09/06 19:04:05 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.1 2004/09/07 18:09:56 humpback Exp $
 
 inherit flag-o-matic eutils
 
-IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd"
-#IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd"
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
 
 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"
-#		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.2.tar.gz"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
+		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
 HOMEPAGE="http://www.proftpd.org/"
 
 SLOT="0"
@@ -26,13 +25,15 @@ DEPEND="pam? ( >=sys-libs/pam-0.75 )
 	ssl? ( >=dev-libs/openssl-0.9.6f )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
 
+RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
+
 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
+	if use shaper; then
+		unpack ${PN}-mod-shaper-0.5.3.tar.gz
+		mv mod_shaper/mod_shaper.c contrib/
+	fi
 }
 
 src_compile() {
@@ -41,7 +42,7 @@ src_compile() {
 	modules="mod_ratio:mod_readme"
 	use pam && modules="${modules}:mod_auth_pam"
 	use tcpd && modules="${modules}:mod_wrap"
-#	use shaper && modules="${modules}:mod_shaper"
+	use shaper && modules="${modules}:mod_shaper"
 
 	if use ldap; then
 		einfo ldap
@@ -122,7 +123,7 @@ src_install() {
 		COPYING CREDITS ChangeLog NEWS README* \
 		doc/{license.txt,GetConf}
 	dohtml doc/*.html
-#	use shaper && dohtml mod_shaper/mod_shaper.html
+	use shaper && dohtml mod_shaper/mod_shaper.html
 	docinto rfc
 	dodoc doc/rfc/*.txt