Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
Date: Tue, 09 May 2017 03:09:36
Message-Id: 1494299340.a921612a7ad8a93189319b1ddc0df6e950f89efa.zerochaos@gentoo
1 commit: a921612a7ad8a93189319b1ddc0df6e950f89efa
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 9 02:49:25 2017 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Tue May 9 03:09:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a921612a
7
8 net-analyzer/metasploit:
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-analyzer/metasploit/metasploit-9999.ebuild | 24 +++++++++++-------------
13 1 file changed, 11 insertions(+), 13 deletions(-)
14
15 diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
16 index 93a14f462c0..f7f985d4863 100644
17 --- a/net-analyzer/metasploit/metasploit-9999.ebuild
18 +++ b/net-analyzer/metasploit/metasploit-9999.ebuild
19 @@ -1,10 +1,10 @@
20 -# Copyright 1999-2016 Gentoo Foundation
21 +# Copyright 1999-2017 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="5"
25 +EAPI="6"
26
27 #never ever ever have more than one ruby in here
28 -USE_RUBY="ruby21"
29 +USE_RUBY="ruby23"
30 inherit eutils ruby-ng
31
32 if [[ ${PV} == "9999" ]] ; then
33 @@ -41,17 +41,17 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
34 >=dev-ruby/activerecord-4.2.6:4.2
35 dev-ruby/bcrypt-ruby
36 dev-ruby/bit-struct
37 - dev-ruby/builder:3
38 + >=dev-ruby/builder-3.0
39 dev-ruby/bundler
40 dev-ruby/filesize
41 - dev-ruby/jsobfu:0.3.0
42 + >=dev-ruby/jsobfu-0.3.0
43 dev-ruby/json:*
44 dev-ruby/kissfft
45 dev-ruby/metasm:1.0.2
46 >=dev-ruby/metasploit_data_models-2.0.0
47 dev-ruby/meterpreter_bins:0.0.22
48 - dev-ruby/metasploit-payloads:1.1.13
49 - dev-ruby/metasploit_payloads-mettle:0.0.6
50 + dev-ruby/metasploit-payloads:1.2.24
51 + dev-ruby/metasploit_payloads-mettle:0.1.9
52 >=dev-ruby/metasploit-credential-2.0.0
53 >=dev-ruby/metasploit-concern-2.0.0
54 >=dev-ruby/metasploit-model-2.0.0
55 @@ -61,9 +61,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
56 dev-ruby/octokit
57 dev-ruby/openssl-ccm:1.2.1
58 dev-ruby/patch_finder
59 - dev-ruby/recog:2.0.14
60 + >=dev-ruby/recog-2.0.14
61 dev-ruby/redcarpet
62 - =dev-ruby/rkelly-remix-0.0.6
63 + >=dev-ruby/rkelly-remix-0.0.6
64 dev-ruby/rex-arch
65 dev-ruby/rex-java
66 dev-ruby/rex-ole
67 @@ -81,6 +81,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
68 dev-ruby/robots
69 dev-ruby/sshkey
70 dev-ruby/tzinfo:*
71 + dev-ruby/windows_error
72 java? ( dev-ruby/rjb )
73 oracle? ( dev-ruby/ruby-oci8 )
74 pcap? ( dev-ruby/pcaprub:*
75 @@ -160,14 +161,11 @@ all_ruby_unpack() {
76 all_ruby_prepare() {
77 # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
78 #epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
79 - epatch_user
80 + eapply_user
81
82 #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
83 rm -r data/cpuinfo
84
85 - #remove random oudated collected garbage
86 - rm -r external
87 -
88 #remove unneeded ruby bundler versioning files
89 #Gemfile.lock contains the versions tested by the msf team but not the hard requirements
90 #we regen this file in each_ruby_prepare