[gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/

["Richard Farina" <zerochaos@gentoo.org>]

commit:     949c19e18b82c47f5fa91acbc5214d2a7e1c5049
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 14:55:02 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed May 10 14:59:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949c19e1

net-analyzer/metasploit: well, it installs now, doesn't run, but it installs

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/metasploit/metadata.xml           |  2 ++
 net-analyzer/metasploit/metasploit-9999.ebuild | 31 +++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index c10c4c21830..e449553f4ec 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -8,6 +8,8 @@
 	</maintainer>
 	<use>
 		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
+		<flag name="nexpose">Enable the plugin to integrate with nexpose</flag>
+		<flag name="openvas">Enable the plugin to integrate <pkg>net-analyzer/openvas</pkg></flag>
 		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
 		<flag name="pcap">Enable libpcap for packet sniffing</flag>
 	</use>

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 0ebcb289020..a5e46c9add2 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -29,7 +29,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java oracle +pcap test"
+IUSE="development +java nexpose openvas oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -50,7 +50,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/metasm:1.0.2
 	>=dev-ruby/metasploit_data_models-2.0.0
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.2.24
+	dev-ruby/metasploit-payloads:1.2.28
 	dev-ruby/metasploit_payloads-mettle:0.1.9
 	>=dev-ruby/metasploit-credential-2.0.0
 	>=dev-ruby/metasploit-concern-2.0.0
@@ -64,12 +64,21 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/recog-2.0.14
 	dev-ruby/redcarpet
 	>=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/rex-arch
+	=dev-ruby/rex-arch-0.1.4
+	dev-ruby/rex-bin_tools
+	dev-ruby/rex-core
+	dev-ruby/rex-encoder
+	dev-ruby/rex-exploitation
 	dev-ruby/rex-java
+	dev-ruby/rex-mime
+	dev-ruby/rex-nop
 	dev-ruby/rex-ole
 	dev-ruby/rex-powershell
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-socket
+	dev-ruby/rex-sslscan
+	dev-ruby/rex-rop_builder
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
@@ -78,13 +87,15 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/pg-0.11
 	dev-ruby/packetfu:1.1.13
 	>=dev-ruby/rubyzip-1.1
-	dev-ruby/rb-readline-r7
+	>=dev-ruby/rb-readline-0.5.4
 	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
+	nexpose? ( dev-ruby/nexpose )
+	openvas? ( dev-ruby/openvas-omp )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -176,10 +187,20 @@ all_ruby_prepare() {
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
 	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
 	#now we edit the Gemfile based on use flags
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use pcap; then
 		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
 	fi
+	if ! use nexpose; then
+		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
+	fi
+	#no support for nessus right now
+	#if ! use nessus; then
+		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
+	#fi
+	if ! use openvas; then
+		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+	fi
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use development; then
 		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
 	fi