require new metasploit-credential and -model

get the new Realm Key constants after the
move to -model
bug/bundler_fix
David Maloney 2014-07-09 10:43:57 -05:00
parent 487cf325d5
commit e5abfea36a
No known key found for this signature in database
GPG Key ID: DEDBA9DC3A913DB2
2 changed files with 42 additions and 38 deletions

View File

@ -7,7 +7,7 @@ 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'
# Metasploit::Credential database models # Metasploit::Credential database models
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.6.pre.electro.pre.release' gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.6.0-electro-release'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
gem 'metasploit_data_models', '>= 0.18.0', '< 0.19' gem 'metasploit_data_models', '>= 0.18.0', '< 0.19'
# Needed for module caching in Mdm::ModuleDetails # Needed for module caching in Mdm::ModuleDetails

View File

@ -1,11 +1,11 @@
GIT GIT
remote: github-metasploit-credential:rapid7/metasploit-credential.git remote: github-metasploit-credential:rapid7/metasploit-credential.git
revision: 8a8b4f74535d728b1852e4d4d55abb9d828b8a8a revision: 1a472b5f7f6df6fa6a01233e0831ec4383c8f5a2
tag: v0.5.6.pre.electro.pre.release tag: v0.6.0-electro-release
specs: specs:
metasploit-credential (0.5.6.pre.electro.pre.release) metasploit-credential (0.6.0)
metasploit-concern (~> 0.1.0) metasploit-concern (~> 0.1.0)
metasploit-model (>= 0.25.1, < 0.26) metasploit-model (>= 0.25.3, < 0.26)
metasploit_data_models (>= 0.18.0, < 0.19) metasploit_data_models (>= 0.18.0, < 0.19)
rubyntlm rubyntlm
rubyzip (~> 1.1) rubyzip (~> 1.1)
@ -30,9 +30,9 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionpack (3.2.17) actionpack (3.2.19)
activemodel (= 3.2.17) activemodel (= 3.2.19)
activesupport (= 3.2.17) activesupport (= 3.2.19)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -40,15 +40,15 @@ GEM
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.17) activemodel (3.2.19)
activesupport (= 3.2.17) activesupport (= 3.2.19)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.17) activerecord (3.2.19)
activemodel (= 3.2.17) activemodel (= 3.2.19)
activesupport (= 3.2.17) activesupport (= 3.2.19)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activesupport (3.2.17) activesupport (3.2.19)
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0) multi_json (~> 1.0)
arel (3.0.3) arel (3.0.3)
@ -69,7 +69,7 @@ GEM
json (1.8.1) json (1.8.1)
metasploit-concern (0.1.1) metasploit-concern (0.1.1)
activesupport (~> 3.0, >= 3.0.0) activesupport (~> 3.0, >= 3.0.0)
metasploit-model (0.25.2) metasploit-model (0.25.3)
activesupport activesupport
metasploit_data_models (0.18.0) metasploit_data_models (0.18.0)
activerecord (>= 3.2.13, < 4.0.0) activerecord (>= 3.2.13, < 4.0.0)
@ -87,9 +87,9 @@ GEM
packetfu (1.1.9) packetfu (1.1.9)
pcaprub (0.11.3) pcaprub (0.11.3)
pg (0.17.1) pg (0.17.1)
pry (0.9.12.6) pry (0.10.0)
coderay (~> 1.0) coderay (~> 1.1.0)
method_source (~> 0.8) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
rack (1.4.5) rack (1.4.5)
rack-cache (1.2) rack-cache (1.2)
@ -98,38 +98,42 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
railties (3.2.17) railties (3.2.19)
actionpack (= 3.2.17) actionpack (= 3.2.19)
activesupport (= 3.2.17) activesupport (= 3.2.19)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (10.3.1) rake (10.3.2)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (3.1.1) redcarpet (3.1.2)
rkelly-remix (0.0.6) rkelly-remix (0.0.6)
robots (0.10.1) robots (0.10.1)
rspec (2.14.1) rspec (3.0.0)
rspec-core (~> 2.14.0) rspec-core (~> 3.0.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 3.0.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 3.0.0)
rspec-core (2.14.8) rspec-core (3.0.2)
rspec-expectations (2.14.5) rspec-support (~> 3.0.0)
diff-lcs (>= 1.1.3, < 2.0) rspec-expectations (3.0.2)
rspec-mocks (2.14.6) diff-lcs (>= 1.2.0, < 2.0)
rspec-rails (2.14.2) rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 2.14.0) rspec-core (~> 3.0.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 3.0.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rubyntlm (0.4.0) rubyntlm (0.4.0)
rubyzip (1.1.4) rubyzip (1.1.6)
shoulda-matchers (2.6.0) shoulda-matchers (2.6.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simplecov (0.5.4) simplecov (0.5.4)
multi_json (~> 1.0.3) multi_json (~> 1.0.3)