From 2da9d54b7b334b914df7c9fea9bddc0f76c1c36c Mon Sep 17 00:00:00 2001
From: Adam Galway <adam_galway@rapid7.com>
Date: Wed, 25 Mar 2020 15:54:37 +0000
Subject: [PATCH 1/2] updates faraday gem to version with disabled warn

---
 Gemfile.lock                 | 10 +++++-----
 metasploit-framework.gemspec |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8abf46af04..a94fdb78ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,7 +17,7 @@ PATH
       em-http-request
       eventmachine
       faker
-      faraday (<= 0.17.0)
+      faraday (= 0.17.3)
       faye-websocket
       filesize
       hrr_rb_ssh (= 0.3.0.pre2)
@@ -119,8 +119,8 @@ GEM
       activerecord (>= 3.1.0, < 7)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.285.0)
-    aws-sdk-core (3.91.1)
+    aws-partitions (1.287.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -173,7 +173,7 @@ GEM
       railties (>= 4.2.0)
     faker (2.2.1)
       i18n (>= 0.8)
-    faraday (0.17.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
@@ -330,7 +330,7 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.22)
+    rex-socket (0.1.23)
       rex-core
     rex-sslscan (0.1.5)
       rex-core
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 49b025671d..6d9eb9a8b1 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -211,6 +211,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'eventmachine'
 
   # Earlier than latest Faraday gem is used to prevent upstream Octokit errors
-  spec.add_runtime_dependency 'faraday', '<= 0.17.0'
+  spec.add_runtime_dependency 'faraday', '0.17.3'
 
 end

From db2e7bb9d7419d5a8b160d55de008dded5418ac3 Mon Sep 17 00:00:00 2001
From: Adam Galway <adam_galway@rapid7.com>
Date: Thu, 26 Mar 2020 10:36:13 +0000
Subject: [PATCH 2/2] set faraday to latest version

---
 Gemfile.lock                 | 4 ++--
 metasploit-framework.gemspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a94fdb78ac..30af467ac5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,7 +17,7 @@ PATH
       em-http-request
       eventmachine
       faker
-      faraday (= 0.17.3)
+      faraday
       faye-websocket
       filesize
       hrr_rb_ssh (= 0.3.0.pre2)
@@ -173,7 +173,7 @@ GEM
       railties (>= 4.2.0)
     faker (2.2.1)
       i18n (>= 0.8)
-    faraday (0.17.3)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 6d9eb9a8b1..65f36aca15 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -211,6 +211,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'eventmachine'
 
   # Earlier than latest Faraday gem is used to prevent upstream Octokit errors
-  spec.add_runtime_dependency 'faraday', '0.17.3'
+  spec.add_runtime_dependency 'faraday'
 
 end