From 84e870890040133dbd63074e42ebc527f7f0241e Mon Sep 17 00:00:00 2001 From: Louis Sato Date: Fri, 23 Oct 2015 11:07:17 -0500 Subject: [PATCH 1/2] bump mdm to 1.2.9 MS-120 * search scope for vulns now queries host name --- Gemfile.lock | 7 +++++-- metasploit-framework-db.gemspec | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 17e3d82cc6..d6c2239f0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH activerecord (>= 4.0.9, < 4.1.0) metasploit-credential (= 1.0.1) metasploit-framework (= 4.11.4) - metasploit_data_models (= 1.2.8) + metasploit_data_models (= 1.2.9) pg (>= 0.11) metasploit-framework-pcap (4.11.4) metasploit-framework (= 4.11.4) @@ -126,7 +126,7 @@ GEM activesupport (>= 4.0.9, < 4.1.0) railties (>= 4.0.9, < 4.1.0) metasploit-payloads (1.0.15) - metasploit_data_models (1.2.8) + metasploit_data_models (1.2.9) activerecord (>= 4.0.9, < 4.1.0) activesupport (>= 4.0.9, < 4.1.0) arel-helpers @@ -251,3 +251,6 @@ DEPENDENCIES simplecov timecop yard + +BUNDLED WITH + 1.10.6 diff --git a/metasploit-framework-db.gemspec b/metasploit-framework-db.gemspec index 716bc74740..c58aad66dc 100644 --- a/metasploit-framework-db.gemspec +++ b/metasploit-framework-db.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| # Metasploit::Credential database models spec.add_runtime_dependency 'metasploit-credential', '1.0.1' # Database models shared between framework and Pro. - spec.add_runtime_dependency 'metasploit_data_models', '1.2.8' + spec.add_runtime_dependency 'metasploit_data_models', '1.2.9' # depend on metasploit-framewrok as the optional gems are useless with the actual code spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}" # Needed for module caching in Mdm::ModuleDetails From 065fe57ad73ffdba1c7c5dc8aee8c3e4b4f7936c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 23 Oct 2015 15:30:04 -0700 Subject: [PATCH 2/2] bundler 1.10 :( --- Gemfile.lock | 3 --- 1 file changed, 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d6c2239f0b..0444e469b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,6 +251,3 @@ DEPENDENCIES simplecov timecop yard - -BUNDLED WITH - 1.10.6