From f1946b080b68fd45fc4c2ead0ca9bbe657332abe Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 8 Apr 2019 09:10:15 -0500
Subject: [PATCH] Land #11694, early merge fix for
 https://github.com/jjyg/metasm/pull/39

---
 Gemfile      | 3 +++
 Gemfile.lock | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7b3f7821d2..18fb8725bf 100755
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,9 @@ gemspec name: 'metasploit-framework'
 
 gem 'sqlite3', '~>1.3.0'
 
+# use custom metasm until fix for 2.5 is released
+gem 'metasm', git: "https://github.com/rapid7/metasm", branch: "ruby_2_5_compat"
+
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests
diff --git a/Gemfile.lock b/Gemfile.lock
index f7542e8220..a84b68cb81 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/rapid7/metasm
+  revision: 916b7ca5a728321a8a4a890bd21e588e1f2ac5a6
+  branch: ruby_2_5_compat
+  specs:
+    metasm (1.0.4)
+
 PATH
   remote: .
   specs:
@@ -142,7 +149,6 @@ GEM
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    metasm (1.0.3)
     metasploit-concern (2.0.5)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -338,6 +344,7 @@ PLATFORMS
 DEPENDENCIES
   factory_girl_rails
   fivemat
+  metasm!
   metasploit-framework!
   octokit
   pry