Revert back previous change: now we point at https again (better security and found cause of certificate confirmation request), bug #238529. Fixed crash in msfgui3 about dialog, bug #238137, thank Chad A. Simmons for report and hints on how to fix this.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 23 insertions, 8 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index f20bd9f680d4..a764b953f4c1 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.39 2008/09/25 12:52:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.40 2008/10/03 12:15:27 pva Exp $
+
+*metasploit-3.1_p5699 (03 Oct 2008)
+
+  03 Oct 2008; Peter Volkov <pva@gentoo.org> -metasploit-3.1_p5539.ebuild,
+  metasploit-3.1_p5662.ebuild, +metasploit-3.1_p5699.ebuild:
+  Revert back previous change: now we point at https again (better security
+  and found cause of certificate confirmation request), bug #238529. Fixed
+  crash in msfgui3 about dialog, bug #238137, thank Chad A. Simmons for
+  report and hints on how to fix this.
 
   25 Sep 2008; Peter Volkov <pva@gentoo.org> metasploit-3.1_p5662.ebuild:
   Changed svn URL to point on non SSL enabled server to avoid manual
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 87af367ddf97..60f88993ddd6 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -4,7 +4,7 @@ AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac
 AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec10c2c82925e6e731c46f8b0fcfa607b9502 SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066
 DIST framework-2.7.tar.gz 5800216 RMD160 cfdf2705522c845bb4405413207a7df0f3873b94 SHA1 da5d41dfa13e549aacd4fbf2994877cbe80ceed9 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f
 EBUILD metasploit-2.7.ebuild 1451 RMD160 86b02866587de2829a1905ab274cbe4abdd41991 SHA1 e7cc8fb826d55a9be1125dd63ea16798dea1c393 SHA256 fc61998068bf093cf4a68f1563130bed0c1c05c6db7fee51669e49de9460cc96
-EBUILD metasploit-3.1_p5539.ebuild 3663 RMD160 89a115760d6755da69d460587af0a2813cc6221f SHA1 bfab79cc5e3533215e2cad4deff5219456378b68 SHA256 ec88685f15c32c87f666c42316b0028a87a7fca4675e482ab557d590ca0be803
-EBUILD metasploit-3.1_p5662.ebuild 3662 RMD160 8a66c85fae815516d24c295cd9368fd931884283 SHA1 bcd6c1bae70a3c287fc6338e0bc604df2f2389ef SHA256 75f6d913ab3cb0a55b3b700b20a8181cff7fd08c2a16426b7ed1e0ab6109f803
-MISC ChangeLog 6675 RMD160 63f06850f30325635895dee136393f6e3c735883 SHA1 7e6d25a35cd443253402d8fab70d2e4dc8a5e399 SHA256 8958b8cfd75837ea35abd3b52d6b4d6f575e855fd22ed6160ec0cd0ba359fb8d
+EBUILD metasploit-3.1_p5662.ebuild 3663 RMD160 1a6e53b55dd53d5271709df28d915d5d17a9f45b SHA1 ab832022e4a4a4b7c06ea2b6ded206eed0e27ca9 SHA256 ed01d1353e5e89dcac8b154b0961149ebc88310759e067d7ee9e14e003062d1f
+EBUILD metasploit-3.1_p5699.ebuild 3972 RMD160 17d2120f1f50a9e74876613ac7ef84f9b41e36f5 SHA1 fa96cc745a1e6f3d2fbae171add0942ee9e14541 SHA256 9fcd1288951f791904b6e886c1b243262fed2c4ef383dd1cb5279817289d166e
+MISC ChangeLog 7111 RMD160 47bb49a5b16f38b70210fff9cdd0b62cdd15a0a1 SHA1 dea78a3b8c7695d6935cf04c0ee8892de931e3e4 SHA256 96397aaccd6214b3d0cd67c33a58f52c36130de69e8ffc1638464edd9f3b222a
 MISC metadata.xml 928 RMD160 0cc2386c1b4111d2703a6070e0553b290b24f374 SHA1 d329318646224201b9cb6c4e503cca5976e18962 SHA256 e8206c1b362cb2409612ee80d4f85a157099fd6f6cf1bd532e4dca519b8b50a2
diff --git a/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild
index 837242bbfd3c..aceab17c407a 100644
--- a/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild,v 1.2 2008/09/25 12:52:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5662.ebuild,v 1.3 2008/10/03 12:15:27 pva Exp $
 
 MY_P=${PN/metasploit/framework}-${PV}
 
@@ -12,7 +12,7 @@ if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then
 	inherit subversion
 	SRC_URI=""
 	MTSLPT_REV=${BASH_REMATCH[2]}
-	ESVN_REPO_URI="http://metasploit.com/svn/framework3/branches/framework-${PV%_p*}/@${MTSLPT_REV}"
+	ESVN_REPO_URI="https://metasploit.com/svn/framework3/branches/framework-${PV%_p*}/@${MTSLPT_REV}"
 else
 	SRC_URI="http://sugar.metasploit.com/releases/${MY_P}.tar.gz"
 fi
diff --git a/net-analyzer/metasploit/metasploit-3.1_p5539.ebuild b/net-analyzer/metasploit/metasploit-3.1_p5699.ebuild
index bba86eccf244..42441c188c03 100644
--- a/net-analyzer/metasploit/metasploit-3.1_p5539.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.1_p5699.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5539.ebuild,v 1.1 2008/06/25 15:32:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.1_p5699.ebuild,v 1.1 2008/10/03 12:15:27 pva Exp $
 
 MY_P=${PN/metasploit/framework}-${PV}
 
@@ -25,7 +25,10 @@ SLOT="3"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gtk sqlite sqlite3 postgres httpd"
 
+# blocker on ruby-1.8.7:
+# http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
 RDEPEND="dev-lang/ruby
+	!>=dev-lang/ruby-1.8.7
 	gtk? ( dev-ruby/ruby-libglade2 )
 	httpd? ( =dev-ruby/rails-1.2* )
 	sqlite? ( dev-ruby/sqlite-ruby
@@ -41,6 +44,10 @@ S=${WORKDIR}/${MY_P}
 src_compile() {
 	sed -i -e "s/RAILS_GEM_VERSION = '1.2.2'/RAILS_GEM_VERSION = '1.2'/" \
 		data/msfweb/config/environment.rb || die "sed failed"
+	# NOTE: this sed and *not* removing documentation/LICENSE fixes bug #238137
+	sed -i \
+		"s#\(self\.license = File.read(File.join(\).*#\1'/usr/share/doc/${PF}/documentation/LICENSE'))#" \
+			lib/msf/ui/gtk2/about.rb
 }
 
 src_install() {
@@ -54,7 +61,6 @@ src_install() {
 	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
 	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
 
-	rm "${S}"/documentation/LICENSE
 	dodir /usr/share/doc/${PF}
 	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}