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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-11-30 16:47 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-11-30 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     0973a816fc18efd28c18933bf96efbe6ce5d135b
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 16:37:40 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 16:47:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0973a816

net-analyzer/metasploit: update dep for live ebuild

Package-Manager: portage-2.2.26

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 752821e..09f0089 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -50,7 +50,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/metasm:1.0.2
 	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.16
+	dev-ruby/metasploit-payloads:1.0.17
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-12-13 15:11 Ulrich Müller
  0 siblings, 0 replies; 46+ messages in thread
From: Ulrich Müller @ 2019-12-13 15:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6209ff94fa9f8cae55a8274fc34320d10a808f76
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 15:11:01 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 15:11:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6209ff94

net-analyzer/metasploit: Assign RESTRICT only once.

Closes: https://bugs.gentoo.org/699202
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild | 4 +---
 net-analyzer/metasploit/metasploit-9999.ebuild       | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index 7b2bcb7d0de..f06d33d3ee2 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose 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)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -128,8 +128,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT+=" strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 6a64282832d..54db9b0d61c 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="development +java nexpose 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)
-RESTRICT="test"
+RESTRICT="strip test"
 
 #grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
@@ -127,8 +127,6 @@ COMMON_DEPEND="dev-db/postgresql[server]
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
 
-RESTRICT+=" strip"
-
 QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
 	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-10-29 17:29 Joonas Niilola
  0 siblings, 0 replies; 46+ messages in thread
From: Joonas Niilola @ 2019-10-29 17:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4c0c5c558ac80025dc8b3f1ae48f67412ab9b203
Author:     Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Tue Oct 29 14:47:29 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 17:29:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0c5c55

net-analyzer/metasploit: drop openvas-omp support

set slot on dev-ruby/rubyzip.
drop openvas-omp support.

Closes: https://bugs.gentoo.org/698762
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Closes: https://github.com/gentoo/gentoo/pull/13488
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild | 8 +++++++-
 net-analyzer/metasploit/metasploit-9999.ebuild       | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index e24648b0588..db815de8d1d 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -92,7 +92,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -215,6 +215,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#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

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 08d45194b38..42bf6440d53 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -91,7 +91,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -214,6 +214,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#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


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-10-28  4:13 Joonas Niilola
  0 siblings, 0 replies; 46+ messages in thread
From: Joonas Niilola @ 2019-10-28  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9edccb79be99fb590b1919fbdabec8f543d2ed9b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 04:13:08 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 04:13:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edccb79

net-analyzer/metasploit: drop 'openvas' USE

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/metasploit/metadata.xml                 | 1 -
 net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild | 6 +-----
 net-analyzer/metasploit/metasploit-9999.ebuild       | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index e449553f4ec..1edaa58c665 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -9,7 +9,6 @@
 	<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-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index 6a54bb42043..e24648b0588 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose 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)
@@ -101,7 +101,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	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 )
@@ -216,9 +215,6 @@ all_ruby_prepare() {
 	#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

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 407b7303e0f..08d45194b38 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose 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)
@@ -100,7 +100,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	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 )
@@ -215,9 +214,6 @@ all_ruby_prepare() {
 	#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


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-10-15 17:20 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2019-10-15 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     cf64bf2c90c4209a15e04b45255b39b70ae2aef2
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 17:19:50 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 17:20:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf64bf2c

net-analyzer/metasploit: fix faker dep

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{metasploit-4.17.21-r5.ebuild => metasploit-4.17.21-r6.ebuild}      | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index e980b733098..6a54bb42043 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/faraday
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 49691b5c074..407b7303e0f 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-08-02  7:20 Mikle Kolyada
  0 siblings, 0 replies; 46+ messages in thread
From: Mikle Kolyada @ 2019-08-02  7:20 UTC (permalink / raw
  To: gentoo-commits

commit:     cd9b8a659339f5d4163e38ef9679e16440fc0d2b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 07:19:53 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 07:20:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9b8a65

net-analyzer/metasploit: johntheripper[-minimal] now does not exist

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
index 9f8d3a0601f..e980b733098 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
@@ -124,7 +124,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index dbc324bc0ec..49691b5c074 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-07-23  3:32 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2019-07-23  3:32 UTC (permalink / raw
  To: gentoo-commits

commit:     dbf6c0ffeaea1819b30e9b2e9dce34a4beb558cf
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 03:32:02 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 03:32:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf6c0ff

net-analyzer/metasploit: fix magic dep

somehow this fails without faraday despite not directly needing it.
maybe it's the fault of activesupport but I'm not really sure.  it's
needed, now it's there.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{metasploit-4.17.21-r4.ebuild => metasploit-4.17.21-r5.ebuild}   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
similarity index 98%
rename from net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
index d749f104d93..9f8d3a0601f 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
@@ -45,6 +45,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bundler
 	dev-ruby/dnsruby
 	dev-ruby/faker
+	dev-ruby/faraday
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*
@@ -239,6 +240,10 @@ all_ruby_prepare() {
 	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
 	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
 
+	#fails without faraday in Gemfile.lock
+	#despite activesupport(?) needing it, it doesn't end up there :-(
+	sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec
+
 	#let's bogart msfupdate
 	rm msfupdate
 	echo "#!/bin/sh" > msfupdate


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-04-09  5:53 Hans de Graaff
  0 siblings, 0 replies; 46+ messages in thread
From: Hans de Graaff @ 2019-04-09  5:53 UTC (permalink / raw
  To: gentoo-commits

commit:     e09933a189ca1fb27c41b9777b589be9ae0f5401
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 18:56:12 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 05:53:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09933a1

net-analyzer/metasploit: cleanup ruby23-only version

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/metasploit/Manifest                   |   1 -
 .../metasploit/metasploit-4.14.16-r2.ebuild        | 335 ---------------------
 2 files changed, 336 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 0c21a598802..09d5598966e 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1 @@
-DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
deleted file mode 100644
index fb8f4c563b8..00000000000
--- a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit eapi7-ver
-	SLOT="$(ver_cut 1).$(ver_cut 2)"
-fi
-
-DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-LICENSE="BSD"
-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)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
-	>=dev-ruby/actionpack-4.2.6:4.2
-	>=dev-ruby/activerecord-4.2.6:4.2
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
-	dev-ruby/bundler
-	dev-ruby/filesize:*
-	>=dev-ruby/jsobfu-0.3.0:*
-	dev-ruby/json:*
-	dev-ruby/kissfft
-	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-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
-	dev-ruby/msgpack
-	dev-ruby/net-ssh:*
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm:1.2.1
-	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
-	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/rex-arch
-	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
-	dev-ruby/ruby_smb:*
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11:*
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=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 )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	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
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
-
-	#avoid specifically versioned rex-arch
-	sed -i -e "/rex-arch/ s/, '0.1.4'//" metasploit-framework.gemspec || die
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2019-01-16 19:23 Hans de Graaff
  0 siblings, 0 replies; 46+ messages in thread
From: Hans de Graaff @ 2019-01-16 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     8472328fd3e52dca4f5b53944450fe21deddf5c9
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 19:10:28 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 19:10:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8472328f

net-analyzer/metasploit: move ~arm keyword forward

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 9c5d8872886..d749f104d93 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,13 +12,13 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="~arm"
 	SLOT="9999"
 else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit eapi7-ver
 	SLOT="$(ver_cut 1).$(ver_cut 2)"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-12-20  2:16 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2018-12-20  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     249a86475c79861cb6e70ee42c77c2f91e4b24bf
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 02:16:04 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 02:16:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249a8647

net-analyzer/metasploit: switch the jtr dep preference

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild | 2 +-
 net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
index 745c9739718..fb8f4c563b8 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
@@ -115,7 +115,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 2481fa5180b..9c5d8872886 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 6b043c85b99..dbc324bc0ec 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
+	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-12-18 21:40 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2018-12-18 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     17af72b66b2392d8bfb976418f11d14a2d72d535
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 21:38:45 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 21:40:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17af72b6

net-analyzer/metasploit: update jtr deps

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{metasploit-4.14.16-r1.ebuild => metasploit-4.14.16-r2.ebuild}      | 2 +-
 .../{metasploit-4.17.21-r3.ebuild => metasploit-4.17.21-r4.ebuild}      | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
rename to net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
index 10055eaae1c..745c9739718 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
@@ -115,7 +115,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 32cb686d0d8..2481fa5180b 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index c4fc0fdabcd..6b043c85b99 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-12-07 17:17 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2018-12-07 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d8b0926f25c1c15cca4003a29c850eb6b680ccb8
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 17:14:55 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 17:17:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b0926f

net-analyzer/metasploit: bug #653024

move from /usr/$(get_libdir) to /usr/lib

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 ...loit-4.17.21-r2.ebuild => metasploit-4.17.21-r3.ebuild} | 14 +++++++-------
 net-analyzer/metasploit/metasploit-9999.ebuild             | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
similarity index 95%
rename from net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
index 73c86666c95..32cb686d0d8 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
@@ -302,9 +302,9 @@ each_ruby_install() {
 
 	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
 	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md
 	fowners -R root:0 /
 
 }
@@ -313,16 +313,16 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
 
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
 
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
 	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
 	EOF
 }
 

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 73c86666c95..c4fc0fdabcd 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -302,9 +302,9 @@ each_ruby_install() {
 
 	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
 	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	dodir /usr/lib/${PN}${SLOT}
+	cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md
 	fowners -R root:0 /
 
 }
@@ -313,16 +313,16 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation"
 
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+	fperms +x /usr/lib/${PN}${SLOT}/msfupdate
 
 	#tell revdep-rebuild to ignore binaries meant for the target
 	dodir /etc/revdep-rebuild
 	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
 		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits"
 	EOF
 }
 


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-12-07 15:40 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2018-12-07 15:40 UTC (permalink / raw
  To: gentoo-commits

commit:     534ff39218eab918cab886ecb7a75fac8e06d3c4
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 15:39:44 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 15:39:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534ff392

net-analyzer/metasploit: fix bug #671710

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../{metasploit-4.17.21-r1.ebuild => metasploit-4.17.21-r2.ebuild}      | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild
index 6323d42a0e3..73c86666c95 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild
@@ -96,7 +96,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
-	dev-ruby/xdr:*
+	dev-ruby/xdr:2.0.0
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 6323d42a0e3..73c86666c95 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -96,7 +96,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
-	dev-ruby/xdr:*
+	dev-ruby/xdr:2.0.0
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-11-21 18:21 Rick Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Rick Farina @ 2018-11-21 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     6b390ad4078b74e687e2c3df5b058cae00fc338d
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 18:20:20 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 18:21:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b390ad4

net-analyzer/metasploit: bump

mostly import from pentoo
add x86, drop arm until further testing
ruby24

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-analyzer/metasploit/Manifest                   |  1 +
 .../metasploit/metasploit-4.14.16-r1.ebuild        | 16 ++---
 ...4.14.16.ebuild => metasploit-4.17.21-r1.ebuild} | 74 +++++++++++++--------
 net-analyzer/metasploit/metasploit-9999.ebuild     | 77 ++++++++++++++--------
 4 files changed, 102 insertions(+), 66 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 0477770c488..0c21a598802 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1 +1,2 @@
 DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
+DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
index 1609560a641..10055eaae1c 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,8 +19,8 @@ else
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -40,8 +40,8 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/filesize:*
+	>=dev-ruby/jsobfu-0.3.0:*
 	dev-ruby/json:*
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
@@ -79,9 +79,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
-	dev-ruby/ruby_smb
+	dev-ruby/ruby_smb:*
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
+	>=dev-ruby/pg-0.11:*
 	dev-ruby/packetfu:1.1.13
 	>=dev-ruby/rubyzip-1.1
 	>=dev-ruby/rb-readline-0.5.4
@@ -300,7 +300,7 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
 

diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
similarity index 88%
rename from net-analyzer/metasploit/metasploit-4.14.16.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
index 5057b32c61a..6323d42a0e3 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 #never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit eutils ruby-ng
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
 	KEYWORDS=""
@@ -17,10 +18,10 @@ else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="~amd64 ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
 RESTRICT="test"
 
+#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
 	>=dev-ruby/actionpack-4.2.6:4.2
 	>=dev-ruby/activerecord-4.2.6:4.2
+	>=dev-ruby/activesupport-4.2.6:4.2
+	dev-ruby/backports
 	dev-ruby/bcrypt-ruby
+	dev-ruby/bcrypt_pbkdf
 	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/dnsruby
+	dev-ruby/faker
+	dev-ruby/filesize:*
+	dev-ruby/jsobfu:*
 	dev-ruby/json:*
-	dev-ruby/kissfft
-	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-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/metasm:*
+	dev-ruby/metasploit-concern
+	<dev-ruby/metasploit-credential-3.0.0
+	<dev-ruby/metasploit_data_models-3.0.0
+	dev-ruby/metasploit-model
+	dev-ruby/metasploit-payloads:1.3.53
+	dev-ruby/metasploit_payloads-mettle:0.4.2
+	dev-ruby/mqtt
 	dev-ruby/msgpack
 	dev-ruby/net-ssh:*
+	dev-ruby/ed25519
 	dev-ruby/nokogiri
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/packetfu:1.1.13
 	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
+	dev-ruby/pdf-reader:*
+	~dev-ruby/pg-0.21.0
+	dev-ruby/railties:*
+	dev-ruby/rb-readline
+	dev-ruby/recog:*
 	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
@@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-mime
 	dev-ruby/rex-nop
 	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
+	<dev-ruby/rex-powershell-0.1.78
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-rop_builder
 	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
-	dev-ruby/ruby_smb
+	dev-ruby/ruby-macho
+	dev-ruby/rubyntlm
+	dev-ruby/ruby_smb:*
+	dev-ruby/rubyzip
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=dev-ruby/rb-readline-0.5.4
-	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
+	dev-ruby/xdr:*
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
@@ -138,9 +146,14 @@ QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
+	usr/lib*/${PN}${SLOT}/data/exploits/*
 	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
 	"
 
 pkg_setup() {
@@ -185,6 +198,9 @@ all_ruby_prepare() {
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
 	#use released packetfu
 	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#use the stable pg
+	#https://github.com/rapid7/metasploit-framework/issues/10234
+	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
 	#git gems are only for ruby24 support and we are not there yet
 	sed -i "/git:/d" Gemfile || die
 
@@ -297,7 +313,7 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
 

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 3f4e20c9c00..6323d42a0e3 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 #never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 inherit eutils ruby-ng
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
 	KEYWORDS=""
@@ -17,10 +18,10 @@ else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+	inherit eapi7-ver
+	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
 
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
@@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
 RESTRICT="test"
 
+#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
 	>=dev-ruby/actionpack-4.2.6:4.2
 	>=dev-ruby/activerecord-4.2.6:4.2
+	>=dev-ruby/activesupport-4.2.6:4.2
+	dev-ruby/backports
 	dev-ruby/bcrypt-ruby
+	dev-ruby/bcrypt_pbkdf
 	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
-	dev-ruby/filesize
-	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/dnsruby
+	dev-ruby/faker
+	dev-ruby/filesize:*
+	dev-ruby/jsobfu:*
 	dev-ruby/json:*
-	dev-ruby/kissfft
-	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.28
-	dev-ruby/metasploit_payloads-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/metasm:*
+	dev-ruby/metasploit-concern
+	<dev-ruby/metasploit-credential-3.0.0
+	<dev-ruby/metasploit_data_models-3.0.0
+	dev-ruby/metasploit-model
+	dev-ruby/metasploit-payloads:1.3.53
+	dev-ruby/metasploit_payloads-mettle:0.4.2
+	dev-ruby/mqtt
 	dev-ruby/msgpack
 	dev-ruby/net-ssh:*
+	dev-ruby/ed25519
 	dev-ruby/nokogiri
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/packetfu:1.1.13
 	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
+	dev-ruby/pdf-reader:*
+	~dev-ruby/pg-0.21.0
+	dev-ruby/railties:*
+	dev-ruby/rb-readline
+	dev-ruby/recog:*
 	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
@@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-mime
 	dev-ruby/rex-nop
 	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
+	<dev-ruby/rex-powershell-0.1.78
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-rop_builder
 	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
-	dev-ruby/ruby_smb
+	dev-ruby/ruby-macho
+	dev-ruby/rubyntlm
+	dev-ruby/ruby_smb:*
+	dev-ruby/rubyzip
 	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=dev-ruby/rb-readline-0.5.4
-	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
+	dev-ruby/xdr:*
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
@@ -138,9 +146,14 @@ QA_PREBUILT="
 	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
 	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
+	usr/lib*/${PN}${SLOT}/data/exploits/*
 	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
 	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
 	"
 
 pkg_setup() {
@@ -180,8 +193,14 @@ all_ruby_prepare() {
 	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
 	#we regen this file in each_ruby_prepare
 	rm Gemfile.lock
+
 	#The Gemfile contains real known deps
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#use released packetfu
+	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#use the stable pg
+	#https://github.com/rapid7/metasploit-framework/issues/10234
+	sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
 	#git gems are only for ruby24 support and we are not there yet
 	sed -i "/git:/d" Gemfile || die
 
@@ -294,7 +313,7 @@ all_ruby_install() {
 	# do not remove LICENSE, bug #238137
 	dodir /usr/share/doc/${PF}
 	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
 
 	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
 


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-07-01  6:12 Hans de Graaff
  0 siblings, 0 replies; 46+ messages in thread
From: Hans de Graaff @ 2018-07-01  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e145dee399e971ba2a0ab16431e014c40705c71e
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 06:12:44 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 06:12:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e145dee3

net-analyzer/metasploit: fix rex-arch dependency

Remove the specific version requirement also in the gemspec file.

Closes: https://bugs.gentoo.org/659688
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../metasploit/metasploit-4.14.16-r1.ebuild        | 335 +++++++++++++++++++++
 1 file changed, 335 insertions(+)

diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
new file mode 100644
index 00000000000..1609560a641
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby23"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+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)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
+	dev-ruby/bcrypt-ruby
+	dev-ruby/bit-struct
+	>=dev-ruby/builder-3.0
+	dev-ruby/bundler
+	dev-ruby/filesize
+	>=dev-ruby/jsobfu-0.3.0
+	dev-ruby/json:*
+	dev-ruby/kissfft
+	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-mettle:0.1.9
+	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-concern-2.0.0
+	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/msgpack
+	dev-ruby/net-ssh:*
+	dev-ruby/nokogiri
+	dev-ruby/octokit
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/patch_finder
+	>=dev-ruby/recog-2.0.14
+	dev-ruby/redcarpet
+	>=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/rex-arch
+	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
+	dev-ruby/ruby_smb
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.13
+	>=dev-ruby/rubyzip-1.1
+	>=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 )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	eapply_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+
+	#The Gemfile contains real known deps
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#use released packetfu
+	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#git gems are only for ruby24 support and we are not there yet
+	sed -i "/git:/d" Gemfile || die
+
+	#now we edit the Gemfile based on use flags
+	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
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
+	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
+
+	#avoid specifically versioned rex-arch
+	sed -i -e "/rex-arch/ s/, '0.1.4'//" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2018-06-30  9:56 Hans de Graaff
  0 siblings, 0 replies; 46+ messages in thread
From: Hans de Graaff @ 2018-06-30  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     d96dce2e4aa42b1ccf5a8508db3bb59b8b91ea08
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 08:58:20 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 09:56:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96dce2e

net-analyzer/metasploit: unversion rex-arch like other rex deps

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-analyzer/metasploit/metasploit-4.14.16.ebuild | 4 ++--
 net-analyzer/metasploit/metasploit-9999.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
index 1df710fce57..5057b32c61a 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -61,7 +61,7 @@ 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-0.1.4
+	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
 	dev-ruby/rex-encoder

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index f2e549088f8..3f4e20c9c00 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -61,7 +61,7 @@ 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-0.1.4
+	dev-ruby/rex-arch
 	dev-ruby/rex-bin_tools
 	dev-ruby/rex-core
 	dev-ruby/rex-encoder


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2017-05-11 20:59 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2017-05-11 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8d1bcb67f86221651bba4fcd3c0133016d40cb74
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 20:58:44 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu May 11 20:59:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1bcb67

net-analyzer/metasploit: sure is nice when metasploit finally works

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/metasploit/Manifest                             |  1 +
 .../{metasploit-9999.ebuild => metasploit-4.14.16.ebuild}    | 12 +++++++-----
 net-analyzer/metasploit/metasploit-9999.ebuild               |  7 +++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 96303df90d3..de6a1f6e366 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1,3 @@
 DIST metasploit-4.12.16.tar.gz 23258256 SHA256 082f4109da2368fc4ec25a64ceae7655da80b3a46f650f86ff52d9bfac05c584 SHA512 6a95ddc848b95069bc425dd65ba4ed19be981d613cdb13d998ff1222f2ceddaf8b55c355243d69094b691e2a2d7580053284969c9a5133b2328c7d1743055101 WHIRLPOOL 70aa40de2c2b8884b3705e9d150f1b30a8477acc9c79ac1e491a0d9f15aa13b4d64697cf5e7e712173862ab96ecc76636b92cbc24ea228a5d14b9a4a420ac064
 DIST metasploit-4.12.7.tar.gz 23335841 SHA256 30d3fe6f0e3626e86d1497beb21f4ed304fb2f5f375823a5b91f5cbc9d762bae SHA512 6927876b577e1d2421eeabdd1abab90ac99aef02703c0b431eb664c855008639081af64dd82426b87114c8460ecd31ecb46cc89af1edf4f65a2e79b30d99675a WHIRLPOOL add23aad4f5f916510c1e879d25b182651c2bd22e10311ebf43347c8a5fc5056a1f9ee13906791754585bfea4ab742a005564347de7dabaa62f987301b4c0332
+DIST metasploit-4.14.16.tar.gz 23726763 SHA256 c45e17fb3e63569294366806743d2cb0fe44b7173c031c019725ebf36f5922f2 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2 WHIRLPOOL b634b804a701a0154b86ddb95f5159f80e76f7146032236fd32198af7f01f51dc56eef2f22eee2da2bbc382ed5fde51b5d8d5fcca1a9b5e81bb93a06c2f12b1d

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
similarity index 97%
copy from net-analyzer/metasploit/metasploit-9999.ebuild
copy to net-analyzer/metasploit/metasploit-4.14.16.ebuild
index a5e46c9add2..1df710fce57 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16.ebuild
@@ -15,12 +15,9 @@ if [[ ${PV} == "9999" ]] ; then
 	SLOT="9999"
 else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
-	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	##Snapshots
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit versionator
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
@@ -50,7 +47,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.28
+	dev-ruby/metasploit-payloads:1.2.24
 	dev-ruby/metasploit_payloads-mettle:0.1.9
 	>=dev-ruby/metasploit-credential-2.0.0
 	>=dev-ruby/metasploit-concern-2.0.0
@@ -183,9 +180,14 @@ all_ruby_prepare() {
 	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
 	#we regen this file in each_ruby_prepare
 	rm Gemfile.lock
+
 	#The Gemfile contains real known deps
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#use released packetfu
 	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#git gems are only for ruby24 support and we are not there yet
+	sed -i "/git:/d" Gemfile || die
+
 	#now we edit the Gemfile based on use flags
 	if ! use pcap; then
 		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index a5e46c9add2..f2e549088f8 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -15,9 +15,6 @@ if [[ ${PV} == "9999" ]] ; then
 	SLOT="9999"
 else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
-	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	##Snapshots
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -185,7 +182,9 @@ all_ruby_prepare() {
 	rm Gemfile.lock
 	#The Gemfile contains real known deps
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
+	#git gems are only for ruby24 support and we are not there yet
+	sed -i "/git:/d" Gemfile || die
+
 	#now we edit the Gemfile based on use flags
 	if ! use pcap; then
 		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2017-05-10 14:59 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2017-05-10 14:59 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2017-05-09 16:31 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2017-05-09 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4e9948dc600301053bd1c092da2f858e44fb7d81
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 16:30:13 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May  9 16:31:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9948dc

net-analyzer/metasploit: if I were paid for my work on metasploit I could retire

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/metasploit/metasploit-9999.ebuild | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 79fa2dc046e..0ebcb289020 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -73,6 +73,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
+	dev-ruby/ruby_smb
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11
 	dev-ruby/packetfu:1.1.13
@@ -82,6 +83,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	dev-ruby/windows_error
+	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
@@ -171,15 +173,8 @@ all_ruby_prepare() {
 	#we regen this file in each_ruby_prepare
 	rm Gemfile.lock
 	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	#and then they broke it...
-	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
 	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	#but now we have to go back to bundled readline because otherwise it's broken
-	#rm lib/rbreadline.rb
+	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


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2017-05-09  3:09 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2017-05-09  3:09 UTC (permalink / raw
  To: gentoo-commits

commit:     818d16a59a0fb89d0c249a619db0a895c2ddedbd
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 03:08:17 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May  9 03:09:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818d16a5

net-analyzer/metasploit: fixes for live, not working yet but this is a huge changeset and I would rather not sit on it

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/metasploit/metasploit-4.12.16.ebuild | 4 ++--
 net-analyzer/metasploit/metasploit-9999.ebuild    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.12.16.ebuild b/net-analyzer/metasploit/metasploit-4.12.16.ebuild
index 7a726872ef0..ce2667a9c22 100644
--- a/net-analyzer/metasploit/metasploit-4.12.16.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -52,7 +52,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.1.13
 	dev-ruby/metasploit_payloads-mettle:0.0.6
-	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-credential-2.0.0:*
 	>=dev-ruby/metasploit-concern-2.0.0
 	>=dev-ruby/metasploit-model-2.0.0
 	dev-ruby/msgpack

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index f7f985d4863..79fa2dc046e 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -75,7 +75,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/rex-zip
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.11
+	dev-ruby/packetfu:1.1.13
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2017-05-09  3:09 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2017-05-09  3:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a921612a7ad8a93189319b1ddc0df6e950f89efa
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 02:49:25 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May  9 03:09:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a921612a

net-analyzer/metasploit:

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/metasploit/metasploit-9999.ebuild | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 93a14f462c0..f7f985d4863 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 #never ever ever have more than one ruby in here
-USE_RUBY="ruby21"
+USE_RUBY="ruby23"
 inherit eutils ruby-ng
 
 if [[ ${PV} == "9999" ]] ; then
@@ -41,17 +41,17 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/activerecord-4.2.6:4.2
 	dev-ruby/bcrypt-ruby
 	dev-ruby/bit-struct
-	dev-ruby/builder:3
+	>=dev-ruby/builder-3.0
 	dev-ruby/bundler
 	dev-ruby/filesize
-	dev-ruby/jsobfu:0.3.0
+	>=dev-ruby/jsobfu-0.3.0
 	dev-ruby/json:*
 	dev-ruby/kissfft
 	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.1.13
-	dev-ruby/metasploit_payloads-mettle:0.0.6
+	dev-ruby/metasploit-payloads:1.2.24
+	dev-ruby/metasploit_payloads-mettle:0.1.9
 	>=dev-ruby/metasploit-credential-2.0.0
 	>=dev-ruby/metasploit-concern-2.0.0
 	>=dev-ruby/metasploit-model-2.0.0
@@ -61,9 +61,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
 	dev-ruby/patch_finder
-	dev-ruby/recog:2.0.14
+	>=dev-ruby/recog-2.0.14
 	dev-ruby/redcarpet
-	=dev-ruby/rkelly-remix-0.0.6
+	>=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/rex-arch
 	dev-ruby/rex-java
 	dev-ruby/rex-ole
@@ -81,6 +81,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/robots
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
+	dev-ruby/windows_error
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
@@ -160,14 +161,11 @@ all_ruby_unpack() {
 all_ruby_prepare() {
 	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
 	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
+	eapply_user
 
 	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
 	rm -r data/cpuinfo
 
-	#remove random oudated collected garbage
-	rm -r external
-
 	#remove unneeded ruby bundler versioning files
 	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
 	#we regen this file in each_ruby_prepare


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-07-30 18:40 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-07-30 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b8057deaa4ba505c9eb3be8e0481b5a632725f84
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 18:39:20 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 18:39:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8057dea

net-analyzer/metasploit: new snapshot, woo

Package-Manager: portage-2.3.0

 net-analyzer/metasploit/Manifest                  |   1 +
 net-analyzer/metasploit/metasploit-4.12.16.ebuild | 317 ++++++++++++++++++++++
 2 files changed, 318 insertions(+)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index ee44860..96303df 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1 +1,2 @@
+DIST metasploit-4.12.16.tar.gz 23258256 SHA256 082f4109da2368fc4ec25a64ceae7655da80b3a46f650f86ff52d9bfac05c584 SHA512 6a95ddc848b95069bc425dd65ba4ed19be981d613cdb13d998ff1222f2ceddaf8b55c355243d69094b691e2a2d7580053284969c9a5133b2328c7d1743055101 WHIRLPOOL 70aa40de2c2b8884b3705e9d150f1b30a8477acc9c79ac1e491a0d9f15aa13b4d64697cf5e7e712173862ab96ecc76636b92cbc24ea228a5d14b9a4a420ac064
 DIST metasploit-4.12.7.tar.gz 23335841 SHA256 30d3fe6f0e3626e86d1497beb21f4ed304fb2f5f375823a5b91f5cbc9d762bae SHA512 6927876b577e1d2421eeabdd1abab90ac99aef02703c0b431eb664c855008639081af64dd82426b87114c8460ecd31ecb46cc89af1edf4f65a2e79b30d99675a WHIRLPOOL add23aad4f5f916510c1e879d25b182651c2bd22e10311ebf43347c8a5fc5056a1f9ee13906791754585bfea4ab742a005564347de7dabaa62f987301b4c0332

diff --git a/net-analyzer/metasploit/metasploit-4.12.16.ebuild b/net-analyzer/metasploit/metasploit-4.12.16.ebuild
new file mode 100644
index 0000000..ca5514d
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.12.16.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+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"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
+	dev-ruby/bcrypt-ruby
+	dev-ruby/bit-struct
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	dev-ruby/filesize
+	dev-ruby/jsobfu:0.3.0
+	dev-ruby/json:*
+	dev-ruby/kissfft
+	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.1.13
+	dev-ruby/metasploit_payloads-mettle:0.0.6
+	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-concern-2.0.0
+	>=dev-ruby/metasploit-model-2.0.0
+	dev-ruby/msgpack
+	dev-ruby/net-ssh:*
+	dev-ruby/nokogiri
+	dev-ruby/octokit
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/patch_finder
+	dev-ruby/recog:2.0.14
+	dev-ruby/redcarpet
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/rex-arch
+	dev-ruby/rex-java
+	dev-ruby/rex-ole
+	dev-ruby/rex-powershell
+	dev-ruby/rex-random_identifier
+	dev-ruby/rex-registry
+	dev-ruby/rex-struct2
+	dev-ruby/rex-text
+	dev-ruby/rex-zip
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	dev-ruby/sshkey
+	dev-ruby/tzinfo:*
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#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 development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
+	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-07-30  4:07 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-07-30  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a4659f850e5ba39af1d2d602f9b1cc6c50b8e3e4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 04:04:31 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 04:06:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4659f85

net-analyzer/metasploit: finish updating live deps, mettle isn't detected though :-(

Package-Manager: portage-2.3.0

 net-analyzer/metasploit/metasploit-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 383376b..028c582 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -52,6 +52,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/metasploit_data_models-2.0.0
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.1.13
+	dev-ruby/metasploit_payloads-mettle:0.0.6
 	>=dev-ruby/metasploit-credential-2.0.0
 	>=dev-ruby/metasploit-concern-2.0.0
 	>=dev-ruby/metasploit-model-2.0.0
@@ -64,9 +65,13 @@ 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-java
+	dev-ruby/rex-ole
 	dev-ruby/rex-powershell
 	dev-ruby/rex-random_identifier
 	dev-ruby/rex-registry
+	dev-ruby/rex-struct2
 	dev-ruby/rex-text
 	dev-ruby/rex-zip
 	dev-ruby/sqlite3
@@ -203,9 +208,6 @@ all_ruby_prepare() {
 	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
 	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
 
-	#mettle has no tags, and no releases on rubygems.
-	sed -i '/metasploit_payloads-mettle/d' metasploit-framework.gemspec
-
 	#let's bogart msfupdate
 	rm msfupdate
 	echo "#!/bin/sh" > msfupdate


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-07-29 20:39 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-07-29 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     1339751c5e04a835e9ca4931610d3bcd6d91024e
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 20:39:05 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 20:39:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1339751c

net-analyzer/metasploit: about halfway through updates to support live, already sorry that I'm alive

Package-Manager: portage-2.3.0

 net-analyzer/metasploit/Manifest                   |   2 -
 .../metasploit-4.11.5_p2015110401-r1.ebuild        | 299 ---------------------
 net-analyzer/metasploit/metasploit-4.11.7.ebuild   | 297 --------------------
 net-analyzer/metasploit/metasploit-4.12.7.ebuild   |   2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild     |  15 +-
 5 files changed, 14 insertions(+), 601 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 0b7f81b..ee44860 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1 @@
-DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1
-DIST metasploit-4.11.7.tar.gz 23163701 SHA256 1dbfc027dbcbb746858d36dda5ba9321cdc7d5dbc7538ceb20730a9de56d026b SHA512 cd84a4ba253e8ae38f93ba20316f0cb0aa5aeabfb345f07cb96791c5b7589572920b1723df624e26b4e07968fe8be55b04e1abc3c8828b5588bec62aca100d55 WHIRLPOOL c054e19f1c994c43230777a5f72d74b468f9de97b0f64edd17f4e9ef68fff3546d1311d9f80036d5aeccb6381c3c7f0200d5e3e33ce567e36f6ce58a9b97d4b3
 DIST metasploit-4.12.7.tar.gz 23335841 SHA256 30d3fe6f0e3626e86d1497beb21f4ed304fb2f5f375823a5b91f5cbc9d762bae SHA512 6927876b577e1d2421eeabdd1abab90ac99aef02703c0b431eb664c855008639081af64dd82426b87114c8460ecd31ecb46cc89af1edf4f65a2e79b30d99675a WHIRLPOOL add23aad4f5f916510c1e879d25b182651c2bd22e10311ebf43347c8a5fc5056a1f9ee13906791754585bfea4ab742a005564347de7dabaa62f987301b4c0332

diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
deleted file mode 100644
index 5bf6ef1..0000000
--- a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby21"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	##Snapshots
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
-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"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.0.9:4.0
-	>=dev-ruby/actionpack-4.0.9:4.0
-	>=dev-ruby/activerecord-4.0.9:4.0
-	dev-ruby/bcrypt-ruby
-	dev-ruby/builder:3
-	dev-ruby/bundler
-	dev-ruby/filesize
-	dev-ruby/jsobfu:0.2.1
-	dev-ruby/json
-	dev-ruby/kissfft
-	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.9
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.15
-	dev-ruby/metasploit-credential:1.0.1
-	>=dev-ruby/metasploit-concern-1.0.0:1.0
-	>=dev-ruby/metasploit-model-1.0.0:1.0
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	dev-ruby/recog:2.0.14
-	=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.11
-	>=dev-ruby/rubyzip-1.1
-	dev-ruby/rb-readline-r7
-	dev-ruby/robots
-	java? ( dev-ruby/rjb )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
-
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	#and then they broke it...
-	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	#but now we have to go back to bundled readline because otherwise it's broken
-	#rm lib/rbreadline.rb
-	#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 development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}

diff --git a/net-analyzer/metasploit/metasploit-4.11.7.ebuild b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
deleted file mode 100644
index 2fb25d3..0000000
--- a/net-analyzer/metasploit/metasploit-4.11.7.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby21"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	##Snapshots
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
-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"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.0.9:4.0
-	>=dev-ruby/actionpack-4.0.9:4.0
-	>=dev-ruby/activerecord-4.0.9:4.0
-	dev-ruby/bcrypt-ruby
-	dev-ruby/builder:3
-	dev-ruby/bundler
-	dev-ruby/filesize
-	dev-ruby/jsobfu:0.3.0
-	dev-ruby/json
-	dev-ruby/kissfft
-	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.10
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.21
-	dev-ruby/metasploit-credential:1.0.1
-	>=dev-ruby/metasploit-concern-1.0.0:1.0
-	>=dev-ruby/metasploit-model-1.0.0:1.0
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	dev-ruby/openssl-ccm:1.2.1
-	dev-ruby/recog:2.0.14
-	=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.11
-	>=dev-ruby/rubyzip-1.1
-	dev-ruby/rb-readline-r7
-	dev-ruby/robots
-	java? ( dev-ruby/rjb )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	#and then they broke it...
-	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	#but now we have to go back to bundled readline because otherwise it's broken
-	#rm lib/rbreadline.rb
-	#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 development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}

diff --git a/net-analyzer/metasploit/metasploit-4.12.7.ebuild b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
index b5c66e5..cdda09e 100644
--- a/net-analyzer/metasploit/metasploit-4.12.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
@@ -45,7 +45,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bundler
 	dev-ruby/filesize
 	dev-ruby/jsobfu:0.3.0
-	dev-ruby/json
+	dev-ruby/json:*
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
 	>=dev-ruby/metasploit_data_models-2.0.0

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 630ddac..383376b 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -41,20 +41,22 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/actionpack-4.2.6:4.2
 	>=dev-ruby/activerecord-4.2.6:4.2
 	dev-ruby/bcrypt-ruby
+	dev-ruby/bit-struct
 	dev-ruby/builder:3
 	dev-ruby/bundler
 	dev-ruby/filesize
 	dev-ruby/jsobfu:0.3.0
-	dev-ruby/json
+	dev-ruby/json:*
 	dev-ruby/kissfft
 	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.1.11
+	dev-ruby/metasploit-payloads:1.1.13
 	>=dev-ruby/metasploit-credential-2.0.0
 	>=dev-ruby/metasploit-concern-2.0.0
 	>=dev-ruby/metasploit-model-2.0.0
 	dev-ruby/msgpack
+	dev-ruby/net-ssh:*
 	dev-ruby/nokogiri
 	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
@@ -62,12 +64,18 @@ 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-powershell
+	dev-ruby/rex-random_identifier
+	dev-ruby/rex-registry
+	dev-ruby/rex-text
+	dev-ruby/rex-zip
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11
 	dev-ruby/packetfu:1.1.11
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots
+	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
@@ -195,6 +203,9 @@ all_ruby_prepare() {
 	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
 	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
 
+	#mettle has no tags, and no releases on rubygems.
+	sed -i '/metasploit_payloads-mettle/d' metasploit-framework.gemspec
+
 	#let's bogart msfupdate
 	rm msfupdate
 	echo "#!/bin/sh" > msfupdate


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-06-13 14:41 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-06-13 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e67c850d70c6c5fe06b12cd10fd8465e412d2d70
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 14:41:29 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 14:41:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67c850d

net-analyzer/metasploit: readding dropped ~arm keyword

Package-Manager: portage-2.3.0_rc1

 net-analyzer/metasploit/metasploit-4.12.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-4.12.7.ebuild b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
index 7a0d888..b5c66e5 100644
--- a/net-analyzer/metasploit/metasploit-4.12.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
@@ -21,7 +21,7 @@ else
 	##Snapshots
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit versionator
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-06-13  4:37 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-06-13  4:37 UTC (permalink / raw
  To: gentoo-commits

commit:     622f907e4dd5ec1fd51291425632fe8f6270f8de
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 04:35:47 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 04:37:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622f907e

net-analyzer/metasploit: minor live update, bump new release. temporarily drop ~arm and ~x86

Package-Manager: portage-2.3.0_rc1

 net-analyzer/metasploit/Manifest                                    | 1 +
 .../metasploit/{metasploit-9999.ebuild => metasploit-4.12.7.ebuild} | 6 +++---
 net-analyzer/metasploit/metasploit-9999.ebuild                      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 8d977c2..0b7f81b 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1,3 @@
 DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1
 DIST metasploit-4.11.7.tar.gz 23163701 SHA256 1dbfc027dbcbb746858d36dda5ba9321cdc7d5dbc7538ceb20730a9de56d026b SHA512 cd84a4ba253e8ae38f93ba20316f0cb0aa5aeabfb345f07cb96791c5b7589572920b1723df624e26b4e07968fe8be55b04e1abc3c8828b5588bec62aca100d55 WHIRLPOOL c054e19f1c994c43230777a5f72d74b468f9de97b0f64edd17f4e9ef68fff3546d1311d9f80036d5aeccb6381c3c7f0200d5e3e33ce567e36f6ce58a9b97d4b3
+DIST metasploit-4.12.7.tar.gz 23335841 SHA256 30d3fe6f0e3626e86d1497beb21f4ed304fb2f5f375823a5b91f5cbc9d762bae SHA512 6927876b577e1d2421eeabdd1abab90ac99aef02703c0b431eb664c855008639081af64dd82426b87114c8460ecd31ecb46cc89af1edf4f65a2e79b30d99675a WHIRLPOOL add23aad4f5f916510c1e879d25b182651c2bd22e10311ebf43347c8a5fc5056a1f9ee13906791754585bfea4ab742a005564347de7dabaa62f987301b4c0332

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
similarity index 99%
copy from net-analyzer/metasploit/metasploit-9999.ebuild
copy to net-analyzer/metasploit/metasploit-4.12.7.ebuild
index 75cb3e1..7a0d888 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
@@ -21,7 +21,7 @@ else
 	##Snapshots
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit versionator
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
@@ -48,7 +48,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.10
+	>=dev-ruby/metasploit_data_models-2.0.0
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.1.11
 	>=dev-ruby/metasploit-credential-2.0.0
@@ -68,7 +68,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots
-	dev-ruby/tzinfo
+	dev-ruby/tzinfo:*
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 75cb3e1..630ddac 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -48,7 +48,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.10
+	>=dev-ruby/metasploit_data_models-2.0.0
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.1.11
 	>=dev-ruby/metasploit-credential-2.0.0
@@ -68,7 +68,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots
-	dev-ruby/tzinfo
+	dev-ruby/tzinfo:*
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-06-13  4:37 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-06-13  4:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8bc51db262b40331200731494b7368930a114d39
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 21:53:33 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 04:36:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc51db2

net-analyzer/metasploit:

Package-Manager: portage-2.3.0_rc1

 net-analyzer/metasploit/metasploit-9999.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index ac969a0..75cb3e1 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -37,9 +37,9 @@ IUSE="development +java oracle +pcap test"
 RESTRICT="test"
 
 RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.0.9:4.0
-	>=dev-ruby/actionpack-4.0.9:4.0
-	>=dev-ruby/activerecord-4.0.9:4.0
+	>=dev-ruby/activesupport-4.2.6:4.2
+	>=dev-ruby/actionpack-4.2.6:4.2
+	>=dev-ruby/activerecord-4.2.6:4.2
 	dev-ruby/bcrypt-ruby
 	dev-ruby/builder:3
 	dev-ruby/bundler
@@ -50,14 +50,17 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/metasm:1.0.2
 	dev-ruby/metasploit_data_models:1.2.10
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.22
-	dev-ruby/metasploit-credential:1.0.1
-	>=dev-ruby/metasploit-concern-1.0.0:1.0
-	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/metasploit-payloads:1.1.11
+	>=dev-ruby/metasploit-credential-2.0.0
+	>=dev-ruby/metasploit-concern-2.0.0
+	>=dev-ruby/metasploit-model-2.0.0
 	dev-ruby/msgpack
 	dev-ruby/nokogiri
+	dev-ruby/octokit
 	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/patch_finder
 	dev-ruby/recog:2.0.14
+	dev-ruby/redcarpet
 	=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11
@@ -65,6 +68,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots
+	dev-ruby/tzinfo
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
@@ -188,6 +192,9 @@ all_ruby_prepare() {
 	#probably a better way to fix this... if I care at some point
 	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
 
+	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
+	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
+
 	#let's bogart msfupdate
 	rm msfupdate
 	echo "#!/bin/sh" > msfupdate


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-01-26 21:51 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-01-26 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9a13eb2eed7d4dd2e14746ecf8aeac3b7ffe8478
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 21:50:52 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 21:51:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a13eb2e

net-analyzer/metasploit: adding ~arm for 4.11.7

Package-Manager: portage-2.2.27

 net-analyzer/metasploit/metasploit-4.11.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.7.ebuild b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
index 50a0658..2fb25d3 100644
--- a/net-analyzer/metasploit/metasploit-4.11.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
@@ -21,7 +21,7 @@ else
 	##Snapshots
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit versionator
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-01-26 21:20 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-01-26 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     344901ee1a35f7240694ba1fc1c03b17ace74fc4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 21:19:43 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 21:20:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344901ee

net-analyzer/metasploit: new snapshot

Package-Manager: portage-2.2.27

 net-analyzer/metasploit/Manifest                 |   1 +
 net-analyzer/metasploit/metasploit-4.11.7.ebuild | 297 +++++++++++++++++++++++
 2 files changed, 298 insertions(+)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 2378313..8d977c2 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1 +1,2 @@
 DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1
+DIST metasploit-4.11.7.tar.gz 23163701 SHA256 1dbfc027dbcbb746858d36dda5ba9321cdc7d5dbc7538ceb20730a9de56d026b SHA512 cd84a4ba253e8ae38f93ba20316f0cb0aa5aeabfb345f07cb96791c5b7589572920b1723df624e26b4e07968fe8be55b04e1abc3c8828b5588bec62aca100d55 WHIRLPOOL c054e19f1c994c43230777a5f72d74b468f9de97b0f64edd17f4e9ef68fff3546d1311d9f80036d5aeccb6381c3c7f0200d5e3e33ce567e36f6ce58a9b97d4b3

diff --git a/net-analyzer/metasploit/metasploit-4.11.7.ebuild b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
new file mode 100644
index 0000000..50a0658
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+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"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.0.9:4.0
+	>=dev-ruby/actionpack-4.0.9:4.0
+	>=dev-ruby/activerecord-4.0.9:4.0
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	dev-ruby/filesize
+	dev-ruby/jsobfu:0.3.0
+	dev-ruby/json
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	dev-ruby/metasploit_data_models:1.2.10
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.0.21
+	dev-ruby/metasploit-credential:1.0.1
+	>=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/recog:2.0.14
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#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 development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-01-26 20:01 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-01-26 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7aea1531d1ddf929ee3bcc4030a8ba0aee225cd9
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 19:58:49 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 20:01:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aea1531

net-analyzer/metasploit: need openssl-ccm for live

Package-Manager: portage-2.2.27

 net-analyzer/metasploit/metasploit-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 7ce597d..0e2e4c5 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -56,6 +56,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/metasploit-model-1.0.0:1.0
 	dev-ruby/msgpack
 	dev-ruby/nokogiri
+        dev-ruby/openssl-ccm:1.2.1
 	dev-ruby/recog:2.0.14
 	=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/sqlite3


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-01-26 20:01 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-01-26 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1cd6de3154fdde552c238d8342daf430673a0029
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 19:59:19 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 20:01:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd6de31

net-analyzer/metasploit: fix repoman warning

Package-Manager: portage-2.2.27

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 0e2e4c5..ac969a0 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -56,7 +56,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/metasploit-model-1.0.0:1.0
 	dev-ruby/msgpack
 	dev-ruby/nokogiri
-        dev-ruby/openssl-ccm:1.2.1
+	dev-ruby/openssl-ccm:1.2.1
 	dev-ruby/recog:2.0.14
 	=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/sqlite3


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2016-01-26 19:47 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2016-01-26 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     b34b41e7e7d0acf60d7316aeadd4ddd28fa1f0b3
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 19:33:51 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 19:41:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34b41e7

net-analyzer/metasploit: some updates for live ebuild

Package-Manager: portage-2.2.27

 net-analyzer/metasploit/Manifest                   |   1 -
 .../metasploit-4.11.4_p2015090201-r2.ebuild        | 297 ---------------------
 net-analyzer/metasploit/metasploit-9999.ebuild     |   9 +-
 3 files changed, 3 insertions(+), 304 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index a9e8035..2378313 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1 @@
-DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
 DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
deleted file mode 100644
index 3756f98..0000000
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby21"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	##Snapshots
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit versionator
-	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
-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"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.0.9:4.0
-	>=dev-ruby/actionpack-4.0.9:4.0
-	>=dev-ruby/activerecord-4.0.9:4.0
-	dev-ruby/bcrypt-ruby
-	dev-ruby/builder:3
-	dev-ruby/bundler
-	dev-ruby/jsobfu:0.2.1
-	dev-ruby/json
-	dev-ruby/kissfft
-	=dev-ruby/metasploit_data_models-1.2.5
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.9
-	=dev-ruby/metasploit-credential-1.0.0:1.0
-	>=dev-ruby/metasploit-concern-1.0.0:1.0
-	>=dev-ruby/metasploit-model-1.0.0:1.0
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	dev-ruby/recog:2.0.6
-	=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	dev-ruby/packetfu:1.1.9
-	>=dev-ruby/rubyzip-1.1
-	dev-ruby/rb-readline-r7
-	dev-ruby/robots
-	java? ( dev-ruby/rjb )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
-
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	#and then they broke it...
-	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	#but now we have to go back to bundled readline because otherwise it's broken
-	#rm lib/rbreadline.rb
-	#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 development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 41df423..7ce597d 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -48,9 +48,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.9
+	dev-ruby/metasploit_data_models:1.2.10
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.19
+	dev-ruby/metasploit-payloads:1.0.22
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0
@@ -145,9 +145,6 @@ all_ruby_prepare() {
 	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
 	epatch_user
 
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
 	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
 	rm -r data/cpuinfo
 


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-12-09 22:06 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-12-09 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e7facc7d4a949d871a1ec7d34f01f4507c7a827d
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 22:04:43 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 22:06:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7facc7d

net-analyzer/metasploit: bump metasploit-payloads dep for live ebuild

Package-Manager: portage-2.2.26

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 257f17c..41df423 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -50,7 +50,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/metasm:1.0.2
 	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.17
+	dev-ruby/metasploit-payloads:1.0.19
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-11-30 16:47 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-11-30 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     93cba8f583487f26c4bc1617a58e37a30b764da6
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 16:40:07 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 16:47:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cba8f5

net-analyzer/metasploit: shorten description to make repoman happy

Package-Manager: portage-2.2.26

 net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild | 2 +-
 net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild    | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
index e129bac..c83ad8b 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi
 
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"

diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
index d7825c1..49ea513 100644
--- a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
@@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi
 
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 09f0089..2b04381 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi
 
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-11-30 16:47 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-11-30 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e7875427541f9a7e67a450034faf6c8850106a0d
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 16:46:42 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 16:47:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7875427

net-analyzer/metasploit: adjust deps for jsobfu to please repoman

Package-Manager: portage-2.2.26

 ....4_p2015090201-r1.ebuild => metasploit-4.11.4_p2015090201-r2.ebuild} | 2 +-
 ....11.5_p2015110401.ebuild => metasploit-4.11.5_p2015110401-r1.ebuild} | 2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
rename to net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
index c83ad8b..3756f98 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
@@ -43,7 +43,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bcrypt-ruby
 	dev-ruby/builder:3
 	dev-ruby/bundler
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/jsobfu:0.2.1
 	dev-ruby/json
 	dev-ruby/kissfft
 	=dev-ruby/metasploit_data_models-1.2.5

diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
rename to net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
index 49ea513..5bf6ef1 100644
--- a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/builder:3
 	dev-ruby/bundler
 	dev-ruby/filesize
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/jsobfu:0.2.1
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 2b04381..257f17c 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/builder:3
 	dev-ruby/bundler
 	dev-ruby/filesize
-	=dev-ruby/jsobfu-0.3*
+	dev-ruby/jsobfu:0.3.0
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-11-07  1:18 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-11-07  1:18 UTC (permalink / raw
  To: gentoo-commits

commit:     8202c68ee977cc976a8ceb0c5d7cb713b9755c1b
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 01:17:21 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 01:17:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8202c68e

net-analyzer/metasploit: add new snapshot

Package-Manager: portage-2.2.23

 net-analyzer/metasploit/Manifest                   |   1 +
 .../metasploit-4.11.5_p2015110401.ebuild           | 299 +++++++++++++++++++++
 2 files changed, 300 insertions(+)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index d2acafb..a9e8035 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1 +1,2 @@
 DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
+DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1

diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
new file mode 100644
index 0000000..d7825c1
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java 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)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.0.9:4.0
+	>=dev-ruby/actionpack-4.0.9:4.0
+	>=dev-ruby/activerecord-4.0.9:4.0
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	dev-ruby/filesize
+	=dev-ruby/jsobfu-0.2*
+	dev-ruby/json
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	dev-ruby/metasploit_data_models:1.2.9
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.0.15
+	dev-ruby/metasploit-credential:1.0.1
+	>=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	dev-ruby/recog:2.0.14
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#unbundle johntheripper, at least it now defaults to running the system version
+	rm -r data/john/run.*
+	rm -r data/john/src.tar.bz2
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#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 development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-11-06 19:00 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-11-06 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     6bb036d6f6a3c91e85c132a3162d47748fc7b2cc
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 18:51:21 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 18:51:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb036d6

net-analyzer/metasploit: updates for live ebuild

Package-Manager: portage-2.2.23

 net-analyzer/metasploit/metasploit-9999.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 760d588..752821e 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -43,13 +43,14 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bcrypt-ruby
 	dev-ruby/builder:3
 	dev-ruby/bundler
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/filesize
+	=dev-ruby/jsobfu-0.3*
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
 	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.15
+	dev-ruby/metasploit-payloads:1.0.16
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-24 13:20 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-24 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     0c1b10296a6a29d48727604d50289875284e7ec0
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 13:19:17 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 13:19:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1b1029

net-analyzer/metasploit: update metasploit_data_models dep

Package-Manager: portage-2.2.23

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index c833634..760d588 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -47,7 +47,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	dev-ruby/metasploit_data_models:1.2.8
+	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.0.15
 	dev-ruby/metasploit-credential:1.0.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-21 14:44 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-21 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     98e6011bcd8c7bbcaa1fa811b500eb85442db28c
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 14:43:15 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 14:44:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e6011b

net-analyzer/metasploit: remove get_libdir in global scope to avoid possible metadata varience pointed out by hasufell

Package-Manager: portage-2.2.23

 .../metasploit-4.11.4_p2015090201-r1.ebuild        | 36 +++++++++++-----------
 net-analyzer/metasploit/metasploit-9999.ebuild     | 36 +++++++++++-----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
index 70f03b9..f9dfa16 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -93,24 +93,24 @@ RDEPEND+=" ${COMMON_DEPEND}
 RESTRICT="strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
 	"
 
 pkg_setup() {

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index d400f29..c929688 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -94,24 +94,24 @@ RDEPEND+=" ${COMMON_DEPEND}
 RESTRICT="strip"
 
 QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
 	"
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-21 14:44 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-21 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     368e2c6dd7453a5209799b69a4f272cc595ec925
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 14:31:49 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 14:44:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368e2c6d

net-analyzer/metasploit: fix header

Package-Manager: portage-2.2.23

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 2c43b84..d400f29 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-21 14:44 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-21 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c14dca353e1abada9bb48cd76a0b77943f4efdb4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 14:44:02 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 14:44:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14dca35

net-analyzer/metasploit: fix header

Package-Manager: portage-2.2.23

 net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
index f9dfa16..e129bac 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-09  1:26 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-09  1:26 UTC (permalink / raw
  To: gentoo-commits

commit:     4c2712d76f93a9e2711797c6cb897cbd9e91ed4a
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:15:39 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 01:26:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2712d7

net-analyzer/metasploit: fix live ebuild

Package-Manager: portage-2.2.22

 net-analyzer/metasploit/metasploit-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index d07ff32..2c43b84 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -47,7 +47,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
-	=dev-ruby/metasploit_data_models-1.2.5
+	dev-ruby/metasploit_data_models:1.2.7
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.0.15
 	dev-ruby/metasploit-credential:1.0.1


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-08 21:04 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-08 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     408bb337f1207a7c844d99b70a0f5a164f0b990d
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:04:12 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:04:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408bb337

net-analyzer/metasploit: I thought keeping the live ebuild in my overlay would decrease the work but it looks like the ruby team and I are duplicating each other and causing more work so moving it back into gentoo

 net-analyzer/metasploit/metasploit-9999.ebuild | 298 +++++++++++++++++++++++++
 1 file changed, 298 insertions(+)

diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
new file mode 100644
index 0000000..d07ff32
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java 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)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.0.9:4.0
+	>=dev-ruby/actionpack-4.0.9:4.0
+	>=dev-ruby/activerecord-4.0.9:4.0
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	=dev-ruby/jsobfu-0.2*
+	dev-ruby/json
+	dev-ruby/kissfft
+	dev-ruby/metasm:1.0.2
+	=dev-ruby/metasploit_data_models-1.2.5
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.0.15
+	dev-ruby/metasploit-credential:1.0.1
+	>=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	dev-ruby/recog:2.0.14
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.11
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#unbundle johntheripper, at least it now defaults to running the system version
+	rm -r data/john/run.*
+	rm -r data/john/src.tar.bz2
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#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 development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-10-08 19:27 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-10-08 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e4d09ef9dd44efc8e48b3233a49c760d6dc33285
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 19:26:41 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 19:27:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d09ef9

net-analyzer/metasploit: change dep for recog reslotting

Package-Manager: portage-2.2.22

 ....11.4_p2015090201.ebuild => metasploit-4.11.4_p2015090201-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
rename to net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
index fee815e..70f03b9 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild
@@ -54,7 +54,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	>=dev-ruby/metasploit-model-1.0.0:1.0
 	dev-ruby/msgpack
 	dev-ruby/nokogiri
-	=dev-ruby/recog-2.0.6:2
+	dev-ruby/recog:2.0.6
 	=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-09-11 20:22 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-09-11 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6506d67b75ab18d78d4dab215f3c3526380ff191
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 20:21:57 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 20:22:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6506d67b

net-analyzer/metasploit: tighten metasploit-credential dep

Package-Manager: portage-2.2.20.1

 net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
index e3d537c..fee815e 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
@@ -49,7 +49,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	=dev-ruby/metasploit_data_models-1.2.5
 	dev-ruby/meterpreter_bins:0.0.22
 	dev-ruby/metasploit-payloads:1.0.9
-	>=dev-ruby/metasploit-credential-1.0.0:1.0
+	=dev-ruby/metasploit-credential-1.0.0:1.0
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0
 	dev-ruby/msgpack


^ permalink raw reply related	[flat|nested] 46+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
@ 2015-09-06 20:39 Richard Farina
  0 siblings, 0 replies; 46+ messages in thread
From: Richard Farina @ 2015-09-06 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     291e2ee40591627787d747a5b8179484da84bcd9
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 20:35:45 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 20:39:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291e2ee4

net-analyzer/metasploit: fix deps for more slotted ruby gems so 9999 can co-exist

Package-Manager: portage-2.2.20.1

 net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
index 81b431d..e3d537c 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
@@ -58,13 +58,13 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	=dev-ruby/rkelly-remix-0.0.6
 	dev-ruby/sqlite3
 	>=dev-ruby/pg-0.11
-	=dev-ruby/packetfu-1.1.9
+	dev-ruby/packetfu:1.1.9
 	>=dev-ruby/rubyzip-1.1
 	dev-ruby/rb-readline-r7
 	dev-ruby/robots
 	java? ( dev-ruby/rjb )
 	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub
+	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
 	development? ( dev-ruby/fivemat
 			dev-ruby/pry


^ permalink raw reply related	[flat|nested] 46+ messages in thread

end of thread, other threads:[~2019-12-13 15:11 UTC | newest]

Thread overview: 46+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-30 16:47 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/ Richard Farina
  -- strict thread matches above, loose matches on Subject: below --
2019-12-13 15:11 Ulrich Müller
2019-10-29 17:29 Joonas Niilola
2019-10-28  4:13 Joonas Niilola
2019-10-15 17:20 Rick Farina
2019-08-02  7:20 Mikle Kolyada
2019-07-23  3:32 Rick Farina
2019-04-09  5:53 Hans de Graaff
2019-01-16 19:23 Hans de Graaff
2018-12-20  2:16 Rick Farina
2018-12-18 21:40 Rick Farina
2018-12-07 17:17 Rick Farina
2018-12-07 15:40 Rick Farina
2018-11-21 18:21 Rick Farina
2018-07-01  6:12 Hans de Graaff
2018-06-30  9:56 Hans de Graaff
2017-05-11 20:59 Richard Farina
2017-05-10 14:59 Richard Farina
2017-05-09 16:31 Richard Farina
2017-05-09  3:09 Richard Farina
2017-05-09  3:09 Richard Farina
2016-07-30 18:40 Richard Farina
2016-07-30  4:07 Richard Farina
2016-07-29 20:39 Richard Farina
2016-06-13 14:41 Richard Farina
2016-06-13  4:37 Richard Farina
2016-06-13  4:37 Richard Farina
2016-01-26 21:51 Richard Farina
2016-01-26 21:20 Richard Farina
2016-01-26 20:01 Richard Farina
2016-01-26 20:01 Richard Farina
2016-01-26 19:47 Richard Farina
2015-12-09 22:06 Richard Farina
2015-11-30 16:47 Richard Farina
2015-11-30 16:47 Richard Farina
2015-11-07  1:18 Richard Farina
2015-11-06 19:00 Richard Farina
2015-10-24 13:20 Richard Farina
2015-10-21 14:44 Richard Farina
2015-10-21 14:44 Richard Farina
2015-10-21 14:44 Richard Farina
2015-10-09  1:26 Richard Farina
2015-10-08 21:04 Richard Farina
2015-10-08 19:27 Richard Farina
2015-09-11 20:22 Richard Farina
2015-09-06 20:39 Richard Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox