Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework-private into staging/electro-release

bug/bundler_fix
David Maloney 2014-07-16 12:54:37 -05:00
commit 8b9aa75c68
3 changed files with 3 additions and 31 deletions

21
Gemfile
View File

@ -3,27 +3,6 @@ source 'https://rubygems.org'
# spec.add_runtime_dependency '<name>', [<version requirements>] # spec.add_runtime_dependency '<name>', [<version requirements>]
gemspec gemspec
# Need 3+ for ActiveSupport::Concern
gem 'activesupport', '>= 3.0.0', '< 4.0.0'
# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
gem 'bcrypt'
# Needed for some admin modules (scrutinizer_add_user.rb)
gem 'json'
# Needed for Meterpreter on Windows, soon others.
gem 'meterpreter_bins', '0.0.6'
# Needed by msfgui and other rpc components
gem 'msgpack'
# Needed by anemone crawler
gem 'nokogiri'
# Needed by db.rb and Msf::Exploit::Capture
gem 'packetfu', '1.1.9'
# Needed by JSObfu
gem 'rkelly-remix', '0.0.6'
# Needed by anemone crawler
gem 'robots'
# Needed for some post modules
gem 'sqlite3'
group :db do group :db do
# Needed for Msf::DbManager # Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0' gem 'activerecord', '>= 3.0.0', '< 4.0.0'

View File

@ -17,6 +17,7 @@ PATH
activesupport (>= 3.0.0, < 4.0.0) activesupport (>= 3.0.0, < 4.0.0)
bcrypt bcrypt
json json
meterpreter_bins (= 0.0.6)
msgpack msgpack
nokogiri nokogiri
packetfu (= 1.1.9) packetfu (= 1.1.9)
@ -157,31 +158,21 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
activerecord (>= 3.0.0, < 4.0.0) activerecord (>= 3.0.0, < 4.0.0)
activesupport (>= 3.0.0, < 4.0.0)
bcrypt
factory_girl (>= 4.1.0) factory_girl (>= 4.1.0)
factory_girl_rails factory_girl_rails
fivemat (= 1.2.1) fivemat (= 1.2.1)
json
metasploit-credential! metasploit-credential!
metasploit-framework! metasploit-framework!
metasploit_data_models (>= 0.18.0, < 0.19) metasploit_data_models (>= 0.18.0, < 0.19)
meterpreter_bins (= 0.0.6)
msgpack
network_interface (~> 0.0.1) network_interface (~> 0.0.1)
nokogiri
packetfu (= 1.1.9)
pcaprub pcaprub
pg (>= 0.11) pg (>= 0.11)
pry pry
rake (>= 10.0.0) rake (>= 10.0.0)
redcarpet redcarpet
rkelly-remix (= 0.0.6)
robots
rspec (>= 2.12, < 3.0.0) rspec (>= 2.12, < 3.0.0)
rspec-rails (>= 2.12, < 3.0.0) rspec-rails (>= 2.12, < 3.0.0)
shoulda-matchers shoulda-matchers
simplecov (= 0.5.4) simplecov (= 0.5.4)
sqlite3
timecop timecop
yard yard

View File

@ -47,6 +47,8 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'bcrypt' spec.add_runtime_dependency 'bcrypt'
# Needed for some admin modules (scrutinizer_add_user.rb) # Needed for some admin modules (scrutinizer_add_user.rb)
spec.add_runtime_dependency 'json' spec.add_runtime_dependency 'json'
# Needed for Meterpreter on Windows, soon others.
spec.add_runtime_dependency 'meterpreter_bins', '0.0.6'
# Needed by msfgui and other rpc components # Needed by msfgui and other rpc components
spec.add_runtime_dependency 'msgpack' spec.add_runtime_dependency 'msgpack'
# Needed by anemone crawler # Needed by anemone crawler