Skip to content

Commit 5df1336

Browse files
limhoff-r7limhoff-r7
committed
Update to latest metasploit dependencies
MSP-11141
1 parent 95a9d50 commit 5df1336

File tree

5 files changed

+33
-64
lines changed

5 files changed

+33
-64
lines changed

‎Gemfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ source 'https://rubygems.org'
33
# spec.add_runtime_dependency '<name>', [<version requirements>]
44
gemspec name: 'metasploit-framework'
55

6-
gem 'metasploit-model',
7-
github: 'rapid7/metasploit-model',
8-
ref: 'ee4d06009811c21c36ace781b27509f816ef7fee'
9-
106
# separate from test as simplecov is not run on travis-ci
117
group :coverage do
128
# code coverage for tests
@@ -17,12 +13,6 @@ end
1713

1814
group :db do
1915
gemspec name: 'metasploit-framework-db'
20-
gem 'metasploit-credential',
21-
github: 'rapid7/metasploit-credential',
22-
ref: '00954f33ad4d2449fb73b345d819ce96f395b1ef'
23-
gem 'metasploit_data_models',
24-
github: 'rapid7/metasploit_data_models',
25-
ref: 'f29efd129b3843c55289add6affb5465b2969446'
2616
end
2717

2818
group :development do

‎Gemfile.lock

Lines changed: 29 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,3 @@
1-
GIT
2-
remote: git://github.com/rapid7/metasploit-credential.git
3-
revision: 00954f33ad4d2449fb73b345d819ce96f395b1ef
4-
ref: 00954f33ad4d2449fb73b345d819ce96f395b1ef
5-
specs:
6-
metasploit-credential (0.13.10.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
7-
metasploit-concern (~> 0.3.0)
8-
metasploit-model (= 0.29.0.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
9-
metasploit_data_models (= 0.21.4.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
10-
pg
11-
railties (< 4.0.0)
12-
rubyntlm
13-
rubyzip (~> 1.1)
14-
15-
GIT
16-
remote: git://github.com/rapid7/metasploit-model.git
17-
revision: ee4d06009811c21c36ace781b27509f816ef7fee
18-
ref: ee4d06009811c21c36ace781b27509f816ef7fee
19-
specs:
20-
metasploit-model (0.29.0.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
21-
activesupport
22-
railties (< 4.0.0)
23-
24-
GIT
25-
remote: git://github.com/rapid7/metasploit_data_models.git
26-
revision: f29efd129b3843c55289add6affb5465b2969446
27-
ref: f29efd129b3843c55289add6affb5465b2969446
28-
specs:
29-
metasploit_data_models (0.21.4.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
30-
activerecord (>= 3.2.13, < 4.0.0)
31-
activesupport
32-
arel-helpers
33-
metasploit-concern (~> 0.3.0)
34-
metasploit-model (= 0.29.0.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
35-
pg
36-
railties (< 4.0.0)
37-
recog (~> 1.0)
38-
391
PATH
402
remote: .
413
specs:
@@ -46,7 +8,7 @@ PATH
468
jsobfu (~> 0.2.0)
479
json
4810
metasploit-concern (~> 0.3.0)
49-
metasploit-model (= 0.29.0.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
11+
metasploit-model (~> 0.29.0)
5012
meterpreter_bins (= 0.0.12)
5113
msgpack
5214
nokogiri
@@ -60,9 +22,9 @@ PATH
6022
tzinfo
6123
metasploit-framework-db (4.11.0.pre.dev)
6224
activerecord (>= 3.2.21, < 4.0.0)
63-
metasploit-credential (= 0.13.10.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
25+
metasploit-credential (~> 0.13.19)
6426
metasploit-framework (= 4.11.0.pre.dev)
65-
metasploit_data_models (= 0.21.4.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model)
27+
metasploit_data_models (~> 0.22.8)
6628
pg (>= 0.11)
6729
metasploit-framework-pcap (4.11.0.pre.dev)
6830
metasploit-framework (= 4.11.0.pre.dev)
@@ -100,13 +62,13 @@ GEM
10062
i18n (~> 0.6, >= 0.6.4)
10163
multi_json (~> 1.0)
10264
arel (3.0.3)
103-
arel-helpers (2.0.2)
65+
arel-helpers (2.1.0)
10466
activerecord (>= 3.1.0, < 5)
10567
aruba (0.6.1)
10668
childprocess (>= 0.3.6)
10769
cucumber (>= 1.1.1)
10870
rspec-expectations (>= 2.7.0)
109-
bcrypt (3.1.9)
71+
bcrypt (3.1.10)
11072
builder (3.0.4)
11173
capybara (2.4.1)
11274
mime-types (>= 1.16)
@@ -150,18 +112,38 @@ GEM
150112
metasploit-concern (0.3.0)
151113
activesupport (~> 3.0, >= 3.0.0)
152114
railties (< 4.0.0)
115+
metasploit-credential (0.13.19)
116+
metasploit-concern (~> 0.3.0)
117+
metasploit-model (~> 0.29.0)
118+
metasploit_data_models (~> 0.22.8)
119+
pg
120+
railties (< 4.0.0)
121+
rubyntlm
122+
rubyzip (~> 1.1)
123+
metasploit-model (0.29.0)
124+
activesupport
125+
railties (< 4.0.0)
126+
metasploit_data_models (0.22.8)
127+
activerecord (>= 3.2.13, < 4.0.0)
128+
activesupport
129+
arel-helpers
130+
metasploit-concern (~> 0.3.0)
131+
metasploit-model (~> 0.29.0)
132+
pg
133+
railties (< 4.0.0)
134+
recog (~> 1.0)
153135
meterpreter_bins (0.0.12)
154136
method_source (0.8.2)
155137
mime-types (1.25.1)
156138
mini_portile (0.6.1)
157-
msgpack (0.5.9)
139+
msgpack (0.5.11)
158140
multi_json (1.0.4)
159141
network_interface (0.0.1)
160142
nokogiri (1.6.5)
161143
mini_portile (~> 0.6.0)
162144
packetfu (1.1.9)
163145
pcaprub (0.11.3)
164-
pg (0.17.1)
146+
pg (0.18.1)
165147
polyglot (0.3.5)
166148
pry (0.10.0)
167149
coderay (~> 1.1.0)
@@ -193,7 +175,7 @@ GEM
193175
rb-readline (0.5.2)
194176
rdoc (3.12.2)
195177
json (~> 1.4)
196-
recog (1.0.7)
178+
recog (1.0.16)
197179
nokogiri
198180
redcarpet (3.1.2)
199181
rkelly-remix (0.0.6)
@@ -218,7 +200,7 @@ GEM
218200
rspec-expectations (~> 2.99.0)
219201
rspec-mocks (~> 2.99.0)
220202
rubyntlm (0.4.0)
221-
rubyzip (1.1.6)
203+
rubyzip (1.1.7)
222204
shoulda-matchers (2.6.2)
223205
simplecov (0.5.4)
224206
multi_json (~> 1.0.3)
@@ -251,12 +233,9 @@ DEPENDENCIES
251233
factory_girl (>= 4.1.0)
252234
factory_girl_rails
253235
fivemat (= 1.2.1)
254-
metasploit-credential!
255236
metasploit-framework!
256237
metasploit-framework-db!
257238
metasploit-framework-pcap!
258-
metasploit-model!
259-
metasploit_data_models!
260239
pry
261240
rake (>= 10.0.0)
262241
redcarpet

‎db/schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# It's strongly recommended to check this file into your version control system.
1313

14-
ActiveRecord::Schema.define(:version => 20140922170030) do
14+
ActiveRecord::Schema.define(:version => 20150205192745) do
1515

1616
create_table "api_keys", :force => true do |t|
1717
t.text "token"

‎metasploit-framework-db.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
2929

3030
spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
3131
# Metasploit::Credential database models
32-
spec.add_runtime_dependency 'metasploit-credential', '= 0.13.10.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model'
32+
spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.19'
3333
# Database models shared between framework and Pro.
34-
spec.add_runtime_dependency 'metasploit_data_models', '= 0.21.4.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model'
34+
spec.add_runtime_dependency 'metasploit_data_models', '~> 0.22.8'
3535
# depend on metasploit-framewrok as the optional gems are useless with the actual code
3636
spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
3737
# Needed for module caching in Mdm::ModuleDetails

‎metasploit-framework.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Gem::Specification.new do |spec|
6262
spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0'
6363
# Things that would normally be part of the database model, but which
6464
# are needed when there's no database
65-
spec.add_runtime_dependency 'metasploit-model', '= 0.29.0.pre.extract.pre.cache.pre.from.pre.metasploit.pre.model '
65+
spec.add_runtime_dependency 'metasploit-model', '~> 0.29.0'
6666
# Needed for Meterpreter on Windows, soon others.
6767
spec.add_runtime_dependency 'meterpreter_bins', '0.0.12'
6868
# Needed by msfgui and other rpc components

0 commit comments

Comments
 (0)