dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update base to Ruby 2.5 

mask metasploit-aggregator and dependencies on Ruby 2.5
This commit is contained in:
Brent Cook 2018-03-26 02:52:52 -05:00
parent 38af667094
commit d67ae503bf
3 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ruby-version
View File

@ -1 +1 @@
2.4.3
2.5.0

9
Gemfile
View File

@ -22,15 +22,18 @@ group :development do
gem 'metasploit-aggregator' if [
'x86-mingw32', 'x64-mingw32',
'x86_64-linux', 'x86-linux',
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
gem 'google-protobuf', "3.5.1" if [
'x86-mingw32', 'x64-mingw32',
'x86_64-linux', 'x86-linux',
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
gem 'grpc', "1.8.3" if [
'x86-mingw32', 'x64-mingw32',
'x86_64-linux', 'x86-linux',
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin')) && \
Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
end
group :development, :test do

34
Gemfile.lock
View File

@ -133,40 +133,16 @@ GEM
multipart-post (>= 1.2, < 3)
filesize (0.1.1)
fivemat (1.3.6)
google-protobuf (3.5.1)
googleapis-common-protos-types (1.0.1)
google-protobuf (~> 3.0)
googleauth (0.6.2)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
grpc (1.8.3)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
googleauth (>= 0.5.1, < 0.7)
hashery (2.1.2)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jsobfu (0.4.2)
rkelly-remix
json (2.1.0)
jwt (2.1.0)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoist (0.16.0)
metasm (1.0.3)
metasploit-aggregator (1.0.0)
grpc
rex-arch
metasploit-concern (2.0.5)
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
@ -201,7 +177,6 @@ GEM
minitest (5.11.3)
mqtt (0.5.0)
msgpack (1.2.4)
multi_json (1.13.1)
multipart-post (2.0.0)
nessus_rest (0.1.6)
net-ssh (4.2.0)
@ -213,7 +188,6 @@ GEM
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.1)
openvas-omp (0.0.4)
os (0.9.6)
packetfu (1.1.13)
pcaprub
patch_finder (1.0.2)
@ -338,11 +312,6 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
@ -380,9 +349,6 @@ PLATFORMS
DEPENDENCIES
factory_girl_rails
fivemat
google-protobuf (= 3.5.1)
grpc (= 1.8.3)
metasploit-aggregator
metasploit-framework!
octokit
pry