Land #8203, remove platform restrictions on metasploit-aggregator gem

bug/bundler_fix
Brent Cook 2017-04-06 15:36:47 -05:00
commit 25da51dc5f
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
3 changed files with 8 additions and 17 deletions

View File

@ -20,12 +20,7 @@ group :development do
# for development and testing purposes # for development and testing purposes
gem 'pry', git: 'https://github.com/pry/pry', branch: 'master' gem 'pry', git: 'https://github.com/pry/pry', branch: 'master'
# module documentation # module documentation
gem 'octokit', git: 'https://github.com/octokit/octokit.rb', branch: 'master' gem 'octokit'
# session aggregator, native builds have issues on arm platforms for now
gem 'metasploit-aggregator' if [
'x86-mingw32', 'x64-mingw32',
'x86_64-linux', 'x86-linux',
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
end end
group :development, :test do group :development, :test do

View File

@ -12,14 +12,6 @@ GIT
specs: specs:
bit-struct (0.15.0) bit-struct (0.15.0)
GIT
remote: https://github.com/octokit/octokit.rb
revision: 5b43070ea756af5d2f3ae2ad419ee6db67539344
branch: master
specs:
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
GIT GIT
remote: https://github.com/pry/pry remote: https://github.com/pry/pry
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
@ -42,6 +34,7 @@ PATH
jsobfu jsobfu
json json
metasm metasm
metasploit-aggregator
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
@ -187,7 +180,7 @@ GEM
multi_json (~> 1.11) multi_json (~> 1.11)
os (~> 0.9) os (~> 0.9)
signet (~> 0.7) signet (~> 0.7)
grpc (1.2.0) grpc (1.2.2)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleauth (~> 0.5.1) googleauth (~> 0.5.1)
i18n (0.8.1) i18n (0.8.1)
@ -249,6 +242,8 @@ GEM
nexpose (6.0.0) nexpose (6.0.0)
nokogiri (1.7.1) nokogiri (1.7.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.1) openssl-ccm (1.2.1)
openvas-omp (0.0.4) openvas-omp (0.0.4)
os (0.9.6) os (0.9.6)
@ -393,10 +388,9 @@ DEPENDENCIES
cucumber-rails cucumber-rails
factory_girl_rails factory_girl_rails
fivemat fivemat
metasploit-aggregator
metasploit-framework! metasploit-framework!
method_source! method_source!
octokit! octokit
pry! pry!
rake rake
redcarpet redcarpet

View File

@ -55,6 +55,8 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'json' spec.add_runtime_dependency 'json'
# Metasm compiler/decompiler/assembler # Metasm compiler/decompiler/assembler
spec.add_runtime_dependency 'metasm' spec.add_runtime_dependency 'metasm'
# Metasploit::Aggregator external session proxy
spec.add_runtime_dependency 'metasploit-aggregator'
# Metasploit::Concern hooks # Metasploit::Concern hooks
spec.add_runtime_dependency 'metasploit-concern' spec.add_runtime_dependency 'metasploit-concern'
# Metasploit::Credential database models # Metasploit::Credential database models