Fix rails version for bug #195652

Package-Manager: portage-2.1.3.9

4 files changed, 24 insertions, 14 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 68f5eeacc33b..ead5e2c1feb4 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.23 2007/09/09 11:56:20 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.24 2007/10/13 18:14:55 cedk Exp $
+
+*metasploit-3.0-r1 (13 Oct 2007)
+
+  13 Oct 2007; Cédric Krier <cedk@gentoo.org> -metasploit-3.0.ebuild,
+  +metasploit-3.0-r1.ebuild:
+  Fix rails version for bug #195652
 
 *metasploit-3.0 (09 Sep 2007)
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 8377c9a74f99..67fb470d1f5d 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -29,14 +29,14 @@ EBUILD metasploit-2.7.ebuild 1472 RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e9
 MD5 e88b4a7f5a9dce15275846cd57ee6d26 metasploit-2.7.ebuild 1472
 RMD160 2c4bc5501f1fe19d73b397fb8e11303f7c061e91 metasploit-2.7.ebuild 1472
 SHA256 ff1a5e1e9961f7417452269912c8ef1415ed586130912fa20057d7161ccec79c metasploit-2.7.ebuild 1472
-EBUILD metasploit-3.0.ebuild 1907 RMD160 b26772520af783399f47a37b918a56b7196a8a9d SHA1 cc46e255ff3da4edc22211b9f6f630c158d2d5c6 SHA256 342bcda5c41654e825f40c556b123a29233afcc310a82fe1e4664ff61a128790
-MD5 b15743628151797102aaba276951adac metasploit-3.0.ebuild 1907
-RMD160 b26772520af783399f47a37b918a56b7196a8a9d metasploit-3.0.ebuild 1907
-SHA256 342bcda5c41654e825f40c556b123a29233afcc310a82fe1e4664ff61a128790 metasploit-3.0.ebuild 1907
-MISC ChangeLog 3720 RMD160 bf55da4bf7d2d91fcdd36709cc8d9044bc38c606 SHA1 b4121a3520f304e5fbd46f3cb2e4689ef737dbcd SHA256 4632ecee6c5008feb8ae09e2ecf3038d76008c6ae359731e6dbc25c8c06dffcf
-MD5 172225c327245b7e92d4b2f40d015b7f ChangeLog 3720
-RMD160 bf55da4bf7d2d91fcdd36709cc8d9044bc38c606 ChangeLog 3720
-SHA256 4632ecee6c5008feb8ae09e2ecf3038d76008c6ae359731e6dbc25c8c06dffcf ChangeLog 3720
+EBUILD metasploit-3.0-r1.ebuild 2041 RMD160 66063da60e5371a93fc40c95ba7e63282f7c40cc SHA1 6d994852fe53f8d432960a0d7afb0aff21eca1cd SHA256 a6945d112d0daf660081f6dd08f72e022d2774565501f77718b7df19d09f08c2
+MD5 36564bbf4a77049cd6c793ece5a26523 metasploit-3.0-r1.ebuild 2041
+RMD160 66063da60e5371a93fc40c95ba7e63282f7c40cc metasploit-3.0-r1.ebuild 2041
+SHA256 a6945d112d0daf660081f6dd08f72e022d2774565501f77718b7df19d09f08c2 metasploit-3.0-r1.ebuild 2041
+MISC ChangeLog 3891 RMD160 2864907134a7c56920444eed4d6f8529931d3f9f SHA1 6607b9d45b15df2cb8d6cd3940204fcf01931268 SHA256 aef402839ec0382da210e802a956a79b59df6fc99c57a7ccb67ac56c86da2eef
+MD5 c1deb447b79dc8e7cbaa26640d5afd93 ChangeLog 3891
+RMD160 2864907134a7c56920444eed4d6f8529931d3f9f ChangeLog 3891
+SHA256 aef402839ec0382da210e802a956a79b59df6fc99c57a7ccb67ac56c86da2eef ChangeLog 3891
 MISC metadata.xml 863 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae SHA1 022699039a88ca8d53bd75d0b20dbd8709953d55 SHA256 594bd50431c2ecc70b0834fed0dbfe28bac86201fb4e5b20989a56baa8f21eff
 MD5 32fd2dcb7d7b4a24b516c147baa8fad1 metadata.xml 863
 RMD160 90c921bdc34bc98f2c43fb75f633dbdeb65561ae metadata.xml 863
@@ -47,6 +47,6 @@ SHA256 16ca70ef91db1a0bb04dcc7a51c94e10462b6b83d766525e3db4d4b5dfc04a40 files/di
 MD5 5d9bacc28567b0a9ac4f1a823a26c5cc files/digest-metasploit-2.7 244
 RMD160 7e814aa610bd7730639f47ad8e0ef13309206765 files/digest-metasploit-2.7 244
 SHA256 85db40abb4b52be5718d20333bbb4f77e80be41b7ab1549634c3cd2ddc8fb627 files/digest-metasploit-2.7 244
-MD5 d07a8d060f6423ce8932456303686d50 files/digest-metasploit-3.0 244
-RMD160 dbb337ceeeea5f7f9c8ac912bb517d55bf176494 files/digest-metasploit-3.0 244
-SHA256 4a67cccb133701a8c146e6bc40c3f3e33b3fc18878d9ec3855e782eeeb721187 files/digest-metasploit-3.0 244
+MD5 d07a8d060f6423ce8932456303686d50 files/digest-metasploit-3.0-r1 244
+RMD160 dbb337ceeeea5f7f9c8ac912bb517d55bf176494 files/digest-metasploit-3.0-r1 244
+SHA256 4a67cccb133701a8c146e6bc40c3f3e33b3fc18878d9ec3855e782eeeb721187 files/digest-metasploit-3.0-r1 244
diff --git a/net-analyzer/metasploit/files/digest-metasploit-3.0 b/net-analyzer/metasploit/files/digest-metasploit-3.0-r1
index 2a55a2bd25a4..2a55a2bd25a4 100644
--- a/net-analyzer/metasploit/files/digest-metasploit-3.0
+++ b/net-analyzer/metasploit/files/digest-metasploit-3.0-r1
diff --git a/net-analyzer/metasploit/metasploit-3.0.ebuild b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
index 2b9a8fc627a6..e1869a45aa5d 100644
--- a/net-analyzer/metasploit/metasploit-3.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0.ebuild,v 1.1 2007/09/09 11:56:20 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.0-r1.ebuild,v 1.1 2007/10/13 18:14:55 cedk Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ IUSE="gtk sqlite sqlite3 postgres httpd"
 
 RDEPEND="dev-lang/ruby
 	gtk? ( dev-ruby/ruby-libglade2 )
-	httpd? ( =dev-ruby/rails-1.2.2* )
+	httpd? ( =dev-ruby/rails-1.2* )
 	sqlite? ( dev-ruby/sqlite-ruby
 		dev-ruby/activerecord )
 	sqlite3? ( dev-ruby/sqlite3-ruby
@@ -37,6 +37,10 @@ pkg_nofetch() {
 
 src_compile() {
 	epatch "${FILESDIR}"/${P}.patch
+
+	sed -i \
+		-e "s/RAILS_GEM_VERSION = '1.2.2'/RAILS_GEM_VERSION = '1.2'/" \
+		data/msfweb/config/environment.rb || die "sed failed"
 }
 
 src_install() {