From 7d37756e644e814de156593be5fe19428009431d Mon Sep 17 00:00:00 2001 From: David Maloney Date: Tue, 9 Dec 2014 11:39:24 -0600 Subject: [PATCH 1/2] pull latest version of Metasploit-Credential fixes multi-threaded handling of uniqueness validations around credential objects MSP-11757 --- metasploit-framework-db.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metasploit-framework-db.gemspec b/metasploit-framework-db.gemspec index a91c98e6af..ac279f2c89 100644 --- a/metasploit-framework-db.gemspec +++ b/metasploit-framework-db.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', rails_version_constraint # Metasploit::Credential database models - spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.3' + spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.6' # Database models shared between framework and Pro. spec.add_runtime_dependency 'metasploit_data_models', '~> 0.21.1' # depend on metasploit-framewrok as the optional gems are useless with the actual code From 703f6128e6c9028effeb7717bd8160b2dfec696d Mon Sep 17 00:00:00 2001 From: David Maloney Date: Tue, 9 Dec 2014 15:37:40 -0600 Subject: [PATCH 2/2] update lock file --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3b32939278..01bf290b31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ PATH tzinfo metasploit-framework-db (4.10.1.pre.dev) activerecord (< 4.0.0) - metasploit-credential (~> 0.13.3) + metasploit-credential (~> 0.13.6) metasploit-framework (= 4.10.1.pre.dev) metasploit_data_models (~> 0.21.1) pg (>= 0.11) @@ -62,7 +62,7 @@ GEM i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) - arel-helpers (2.0.1) + arel-helpers (2.0.2) activerecord (>= 3.1.0, < 5) aruba (0.6.1) childprocess (>= 0.3.6) @@ -112,7 +112,7 @@ GEM metasploit-concern (0.3.0) activesupport (~> 3.0, >= 3.0.0) railties (< 4.0.0) - metasploit-credential (0.13.5) + metasploit-credential (0.13.6) metasploit-concern (~> 0.3.0) metasploit-model (~> 0.28.0) metasploit_data_models (~> 0.21.0) @@ -139,7 +139,7 @@ GEM msgpack (0.5.9) multi_json (1.0.4) network_interface (0.0.1) - nokogiri (1.6.4.1) + nokogiri (1.6.5) mini_portile (~> 0.6.0) packetfu (1.1.9) pcaprub (0.11.3) @@ -171,11 +171,11 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.3.2) + rake (10.4.2) rb-readline (0.5.1) rdoc (3.12.2) json (~> 1.4) - recog (1.0.5) + recog (1.0.6) nokogiri redcarpet (3.1.2) rkelly-remix (0.0.6)