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.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

3 files changed, 20 insertions, 5 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/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}