Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/
Date: Wed, 21 Nov 2018 18:22:08
Message-Id: 1542824464.6b390ad4078b74e687e2c3df5b058cae00fc338d.zerochaos@gentoo
1 commit: 6b390ad4078b74e687e2c3df5b058cae00fc338d
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 21 18:20:20 2018 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 21 18:21:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b390ad4
7
8 net-analyzer/metasploit: bump
9
10 mostly import from pentoo
11 add x86, drop arm until further testing
12 ruby24
13
14 Package-Manager: Portage-2.3.52, Repoman-2.3.12
15 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
16
17 net-analyzer/metasploit/Manifest | 1 +
18 .../metasploit/metasploit-4.14.16-r1.ebuild | 16 ++---
19 ...4.14.16.ebuild => metasploit-4.17.21-r1.ebuild} | 74 +++++++++++++--------
20 net-analyzer/metasploit/metasploit-9999.ebuild | 77 ++++++++++++++--------
21 4 files changed, 102 insertions(+), 66 deletions(-)
22
23 diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
24 index 0477770c488..0c21a598802 100644
25 --- a/net-analyzer/metasploit/Manifest
26 +++ b/net-analyzer/metasploit/Manifest
27 @@ -1 +1,2 @@
28 DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
29 +DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
30
31 diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
32 index 1609560a641..10055eaae1c 100644
33 --- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
34 +++ b/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI="6"
41 @@ -19,8 +19,8 @@ else
42 SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
43 KEYWORDS="~amd64 ~arm"
44 RUBY_S="${PN}-framework-${MY_PV}"
45 - inherit versionator
46 - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
47 + inherit eapi7-ver
48 + SLOT="$(ver_cut 1).$(ver_cut 2)"
49 fi
50
51 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
52 @@ -40,8 +40,8 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
53 dev-ruby/bit-struct
54 >=dev-ruby/builder-3.0
55 dev-ruby/bundler
56 - dev-ruby/filesize
57 - >=dev-ruby/jsobfu-0.3.0
58 + dev-ruby/filesize:*
59 + >=dev-ruby/jsobfu-0.3.0:*
60 dev-ruby/json:*
61 dev-ruby/kissfft
62 dev-ruby/metasm:1.0.2
63 @@ -79,9 +79,9 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
64 dev-ruby/rex-struct2
65 dev-ruby/rex-text
66 dev-ruby/rex-zip
67 - dev-ruby/ruby_smb
68 + dev-ruby/ruby_smb:*
69 dev-ruby/sqlite3
70 - >=dev-ruby/pg-0.11
71 + >=dev-ruby/pg-0.11:*
72 dev-ruby/packetfu:1.1.13
73 >=dev-ruby/rubyzip-1.1
74 >=dev-ruby/rb-readline-0.5.4
75 @@ -300,7 +300,7 @@ all_ruby_install() {
76 # do not remove LICENSE, bug #238137
77 dodir /usr/share/doc/${PF}
78 cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
79 - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
80 + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
81
82 fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
83
84
85 diff --git a/net-analyzer/metasploit/metasploit-4.14.16.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
86 similarity index 88%
87 rename from net-analyzer/metasploit/metasploit-4.14.16.ebuild
88 rename to net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
89 index 5057b32c61a..6323d42a0e3 100644
90 --- a/net-analyzer/metasploit/metasploit-4.14.16.ebuild
91 +++ b/net-analyzer/metasploit/metasploit-4.17.21-r1.ebuild
92 @@ -1,14 +1,15 @@
93 -# Copyright 1999-2018 Gentoo Foundation
94 +# Copyright 1999-2018 Gentoo Authors
95 # Distributed under the terms of the GNU General Public License v2
96
97 EAPI="6"
98
99 #never ever ever have more than one ruby in here
100 -USE_RUBY="ruby23"
101 +USE_RUBY="ruby24"
102 inherit eutils ruby-ng
103
104 if [[ ${PV} == "9999" ]] ; then
105 EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
106 + EGIT_BRANCH="4.x"
107 EGIT_CHECKOUT_DIR="${WORKDIR}"/all
108 inherit git-r3
109 KEYWORDS=""
110 @@ -17,10 +18,10 @@ else
111 ##Tags https://github.com/rapid7/metasploit-framework/releases
112 MY_PV=${PV/_p/-}
113 SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
114 - KEYWORDS="~amd64 ~arm"
115 + KEYWORDS="~amd64 ~x86"
116 RUBY_S="${PN}-framework-${MY_PV}"
117 - inherit versionator
118 - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
119 + inherit eapi7-ver
120 + SLOT="$(ver_cut 1).$(ver_cut 2)"
121 fi
122
123 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
124 @@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
125 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
126 RESTRICT="test"
127
128 +#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
129 RUBY_COMMON_DEPEND="virtual/ruby-ssl
130 - >=dev-ruby/activesupport-4.2.6:4.2
131 >=dev-ruby/actionpack-4.2.6:4.2
132 >=dev-ruby/activerecord-4.2.6:4.2
133 + >=dev-ruby/activesupport-4.2.6:4.2
134 + dev-ruby/backports
135 dev-ruby/bcrypt-ruby
136 + dev-ruby/bcrypt_pbkdf
137 dev-ruby/bit-struct
138 - >=dev-ruby/builder-3.0
139 dev-ruby/bundler
140 - dev-ruby/filesize
141 - >=dev-ruby/jsobfu-0.3.0
142 + dev-ruby/dnsruby
143 + dev-ruby/faker
144 + dev-ruby/filesize:*
145 + dev-ruby/jsobfu:*
146 dev-ruby/json:*
147 - dev-ruby/kissfft
148 - dev-ruby/metasm:1.0.2
149 - >=dev-ruby/metasploit_data_models-2.0.0
150 - dev-ruby/meterpreter_bins:0.0.22
151 - dev-ruby/metasploit-payloads:1.2.24
152 - dev-ruby/metasploit_payloads-mettle:0.1.9
153 - >=dev-ruby/metasploit-credential-2.0.0
154 - >=dev-ruby/metasploit-concern-2.0.0
155 - >=dev-ruby/metasploit-model-2.0.0
156 + dev-ruby/metasm:*
157 + dev-ruby/metasploit-concern
158 + <dev-ruby/metasploit-credential-3.0.0
159 + <dev-ruby/metasploit_data_models-3.0.0
160 + dev-ruby/metasploit-model
161 + dev-ruby/metasploit-payloads:1.3.53
162 + dev-ruby/metasploit_payloads-mettle:0.4.2
163 + dev-ruby/mqtt
164 dev-ruby/msgpack
165 dev-ruby/net-ssh:*
166 + dev-ruby/ed25519
167 dev-ruby/nokogiri
168 dev-ruby/octokit
169 dev-ruby/openssl-ccm:1.2.1
170 + dev-ruby/packetfu:1.1.13
171 dev-ruby/patch_finder
172 - >=dev-ruby/recog-2.0.14
173 + dev-ruby/pdf-reader:*
174 + ~dev-ruby/pg-0.21.0
175 + dev-ruby/railties:*
176 + dev-ruby/rb-readline
177 + dev-ruby/recog:*
178 dev-ruby/redcarpet
179 - >=dev-ruby/rkelly-remix-0.0.6
180 dev-ruby/rex-arch
181 dev-ruby/rex-bin_tools
182 dev-ruby/rex-core
183 @@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
184 dev-ruby/rex-mime
185 dev-ruby/rex-nop
186 dev-ruby/rex-ole
187 - dev-ruby/rex-powershell
188 + <dev-ruby/rex-powershell-0.1.78
189 dev-ruby/rex-random_identifier
190 dev-ruby/rex-registry
191 + dev-ruby/rex-rop_builder
192 dev-ruby/rex-socket
193 dev-ruby/rex-sslscan
194 - dev-ruby/rex-rop_builder
195 dev-ruby/rex-struct2
196 dev-ruby/rex-text
197 dev-ruby/rex-zip
198 - dev-ruby/ruby_smb
199 + dev-ruby/ruby-macho
200 + dev-ruby/rubyntlm
201 + dev-ruby/ruby_smb:*
202 + dev-ruby/rubyzip
203 dev-ruby/sqlite3
204 - >=dev-ruby/pg-0.11
205 - dev-ruby/packetfu:1.1.13
206 - >=dev-ruby/rubyzip-1.1
207 - >=dev-ruby/rb-readline-0.5.4
208 - dev-ruby/robots
209 dev-ruby/sshkey
210 dev-ruby/tzinfo:*
211 dev-ruby/windows_error
212 + dev-ruby/xdr:*
213 dev-ruby/xmlrpc
214 java? ( dev-ruby/rjb )
215 nexpose? ( dev-ruby/nexpose )
216 @@ -138,9 +146,14 @@ QA_PREBUILT="
217 usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
218 usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
219 usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
220 + usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
221 + usr/lib*/${PN}${SLOT}/data/exploits/*
222 usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
223 usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
224 usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
225 + usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
226 + usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
227 + usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
228 "
229
230 pkg_setup() {
231 @@ -185,6 +198,9 @@ all_ruby_prepare() {
232 sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
233 #use released packetfu
234 sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
235 + #use the stable pg
236 + #https://github.com/rapid7/metasploit-framework/issues/10234
237 + sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
238 #git gems are only for ruby24 support and we are not there yet
239 sed -i "/git:/d" Gemfile || die
240
241 @@ -297,7 +313,7 @@ all_ruby_install() {
242 # do not remove LICENSE, bug #238137
243 dodir /usr/share/doc/${PF}
244 cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
245 - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
246 + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
247
248 fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
249
250
251 diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
252 index 3f4e20c9c00..6323d42a0e3 100644
253 --- a/net-analyzer/metasploit/metasploit-9999.ebuild
254 +++ b/net-analyzer/metasploit/metasploit-9999.ebuild
255 @@ -1,14 +1,15 @@
256 -# Copyright 1999-2018 Gentoo Foundation
257 +# Copyright 1999-2018 Gentoo Authors
258 # Distributed under the terms of the GNU General Public License v2
259
260 EAPI="6"
261
262 #never ever ever have more than one ruby in here
263 -USE_RUBY="ruby23"
264 +USE_RUBY="ruby24"
265 inherit eutils ruby-ng
266
267 if [[ ${PV} == "9999" ]] ; then
268 EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
269 + EGIT_BRANCH="4.x"
270 EGIT_CHECKOUT_DIR="${WORKDIR}"/all
271 inherit git-r3
272 KEYWORDS=""
273 @@ -17,10 +18,10 @@ else
274 ##Tags https://github.com/rapid7/metasploit-framework/releases
275 MY_PV=${PV/_p/-}
276 SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
277 - KEYWORDS="~amd64 ~arm ~x86"
278 + KEYWORDS="~amd64 ~x86"
279 RUBY_S="${PN}-framework-${MY_PV}"
280 - inherit versionator
281 - SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
282 + inherit eapi7-ver
283 + SLOT="$(ver_cut 1).$(ver_cut 2)"
284 fi
285
286 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
287 @@ -32,35 +33,43 @@ IUSE="development +java nexpose openvas oracle +pcap test"
288 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
289 RESTRICT="test"
290
291 +#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort
292 RUBY_COMMON_DEPEND="virtual/ruby-ssl
293 - >=dev-ruby/activesupport-4.2.6:4.2
294 >=dev-ruby/actionpack-4.2.6:4.2
295 >=dev-ruby/activerecord-4.2.6:4.2
296 + >=dev-ruby/activesupport-4.2.6:4.2
297 + dev-ruby/backports
298 dev-ruby/bcrypt-ruby
299 + dev-ruby/bcrypt_pbkdf
300 dev-ruby/bit-struct
301 - >=dev-ruby/builder-3.0
302 dev-ruby/bundler
303 - dev-ruby/filesize
304 - >=dev-ruby/jsobfu-0.3.0
305 + dev-ruby/dnsruby
306 + dev-ruby/faker
307 + dev-ruby/filesize:*
308 + dev-ruby/jsobfu:*
309 dev-ruby/json:*
310 - dev-ruby/kissfft
311 - dev-ruby/metasm:1.0.2
312 - >=dev-ruby/metasploit_data_models-2.0.0
313 - dev-ruby/meterpreter_bins:0.0.22
314 - dev-ruby/metasploit-payloads:1.2.28
315 - dev-ruby/metasploit_payloads-mettle:0.1.9
316 - >=dev-ruby/metasploit-credential-2.0.0
317 - >=dev-ruby/metasploit-concern-2.0.0
318 - >=dev-ruby/metasploit-model-2.0.0
319 + dev-ruby/metasm:*
320 + dev-ruby/metasploit-concern
321 + <dev-ruby/metasploit-credential-3.0.0
322 + <dev-ruby/metasploit_data_models-3.0.0
323 + dev-ruby/metasploit-model
324 + dev-ruby/metasploit-payloads:1.3.53
325 + dev-ruby/metasploit_payloads-mettle:0.4.2
326 + dev-ruby/mqtt
327 dev-ruby/msgpack
328 dev-ruby/net-ssh:*
329 + dev-ruby/ed25519
330 dev-ruby/nokogiri
331 dev-ruby/octokit
332 dev-ruby/openssl-ccm:1.2.1
333 + dev-ruby/packetfu:1.1.13
334 dev-ruby/patch_finder
335 - >=dev-ruby/recog-2.0.14
336 + dev-ruby/pdf-reader:*
337 + ~dev-ruby/pg-0.21.0
338 + dev-ruby/railties:*
339 + dev-ruby/rb-readline
340 + dev-ruby/recog:*
341 dev-ruby/redcarpet
342 - >=dev-ruby/rkelly-remix-0.0.6
343 dev-ruby/rex-arch
344 dev-ruby/rex-bin_tools
345 dev-ruby/rex-core
346 @@ -70,25 +79,24 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
347 dev-ruby/rex-mime
348 dev-ruby/rex-nop
349 dev-ruby/rex-ole
350 - dev-ruby/rex-powershell
351 + <dev-ruby/rex-powershell-0.1.78
352 dev-ruby/rex-random_identifier
353 dev-ruby/rex-registry
354 + dev-ruby/rex-rop_builder
355 dev-ruby/rex-socket
356 dev-ruby/rex-sslscan
357 - dev-ruby/rex-rop_builder
358 dev-ruby/rex-struct2
359 dev-ruby/rex-text
360 dev-ruby/rex-zip
361 - dev-ruby/ruby_smb
362 + dev-ruby/ruby-macho
363 + dev-ruby/rubyntlm
364 + dev-ruby/ruby_smb:*
365 + dev-ruby/rubyzip
366 dev-ruby/sqlite3
367 - >=dev-ruby/pg-0.11
368 - dev-ruby/packetfu:1.1.13
369 - >=dev-ruby/rubyzip-1.1
370 - >=dev-ruby/rb-readline-0.5.4
371 - dev-ruby/robots
372 dev-ruby/sshkey
373 dev-ruby/tzinfo:*
374 dev-ruby/windows_error
375 + dev-ruby/xdr:*
376 dev-ruby/xmlrpc
377 java? ( dev-ruby/rjb )
378 nexpose? ( dev-ruby/nexpose )
379 @@ -138,9 +146,14 @@ QA_PREBUILT="
380 usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
381 usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
382 usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
383 + usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so
384 + usr/lib*/${PN}${SLOT}/data/exploits/*
385 usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
386 usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
387 usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
388 + usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin
389 + usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin
390 + usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin
391 "
392
393 pkg_setup() {
394 @@ -180,8 +193,14 @@ all_ruby_prepare() {
395 #Gemfile.lock contains the versions tested by the msf team but not the hard requirements
396 #we regen this file in each_ruby_prepare
397 rm Gemfile.lock
398 +
399 #The Gemfile contains real known deps
400 sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
401 + #use released packetfu
402 + sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
403 + #use the stable pg
404 + #https://github.com/rapid7/metasploit-framework/issues/10234
405 + sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die
406 #git gems are only for ruby24 support and we are not there yet
407 sed -i "/git:/d" Gemfile || die
408
409 @@ -294,7 +313,7 @@ all_ruby_install() {
410 # do not remove LICENSE, bug #238137
411 dodir /usr/share/doc/${PF}
412 cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
413 - dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
414 + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
415
416 fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate