1 |
commit: 4c0c5c558ac80025dc8b3f1ae48f67412ab9b203 |
2 |
Author: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com> |
3 |
AuthorDate: Tue Oct 29 14:47:29 2019 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 29 17:29:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0c5c55 |
7 |
|
8 |
net-analyzer/metasploit: drop openvas-omp support |
9 |
|
10 |
set slot on dev-ruby/rubyzip. |
11 |
drop openvas-omp support. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/698762 |
14 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
15 |
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com> |
16 |
Closes: https://github.com/gentoo/gentoo/pull/13488 |
17 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
18 |
|
19 |
net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild | 8 +++++++- |
20 |
net-analyzer/metasploit/metasploit-9999.ebuild | 8 +++++++- |
21 |
2 files changed, 14 insertions(+), 2 deletions(-) |
22 |
|
23 |
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild |
24 |
index e24648b0588..db815de8d1d 100644 |
25 |
--- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild |
26 |
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild |
27 |
@@ -92,7 +92,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl |
28 |
dev-ruby/ruby-macho |
29 |
dev-ruby/rubyntlm |
30 |
dev-ruby/ruby_smb:* |
31 |
- dev-ruby/rubyzip |
32 |
+ dev-ruby/rubyzip:* |
33 |
dev-ruby/sqlite3 |
34 |
dev-ruby/sshkey |
35 |
dev-ruby/tzinfo:* |
36 |
@@ -215,6 +215,12 @@ all_ruby_prepare() { |
37 |
#if ! use nessus; then |
38 |
sed -i -e "/nessus/d" metasploit-framework.gemspec || die |
39 |
#fi |
40 |
+ |
41 |
+ #OpenVAS support dropped on net-analyzer/metasploit. Bug:692076 |
42 |
+ #openvas-omp is deprecated and masked for removal. Bug:692076 |
43 |
+ #Remove openvas-omp in gemspec. Bug:698762 |
44 |
+ sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die |
45 |
+ |
46 |
#even if we pass --without=blah bundler still calculates the deps and messes us up |
47 |
if ! use development; then |
48 |
sed -i -e "/^group :development do/,/^end$/d" Gemfile || die |
49 |
|
50 |
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild |
51 |
index 08d45194b38..42bf6440d53 100644 |
52 |
--- a/net-analyzer/metasploit/metasploit-9999.ebuild |
53 |
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild |
54 |
@@ -91,7 +91,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl |
55 |
dev-ruby/ruby-macho |
56 |
dev-ruby/rubyntlm |
57 |
dev-ruby/ruby_smb:* |
58 |
- dev-ruby/rubyzip |
59 |
+ dev-ruby/rubyzip:* |
60 |
dev-ruby/sqlite3 |
61 |
dev-ruby/sshkey |
62 |
dev-ruby/tzinfo:* |
63 |
@@ -214,6 +214,12 @@ all_ruby_prepare() { |
64 |
#if ! use nessus; then |
65 |
sed -i -e "/nessus/d" metasploit-framework.gemspec || die |
66 |
#fi |
67 |
+ |
68 |
+ #OpenVAS support dropped on net-analyzer/metasploit. Bug:692076 |
69 |
+ #openvas-omp is deprecated and masked for removal. Bug:692076 |
70 |
+ #Remove openvas-omp in gemspec. Bug:698762 |
71 |
+ sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die |
72 |
+ |
73 |
#even if we pass --without=blah bundler still calculates the deps and messes us up |
74 |
if ! use development; then |
75 |
sed -i -e "/^group :development do/,/^end$/d" Gemfile || die |