From dfd35cd7e349f3c7c9e3d9d6f02a562e045917e5 Mon Sep 17 00:00:00 2001
From: Jeffrey Martin <Jeffrey_Martin@rapid7.com>
Date: Mon, 8 Apr 2019 17:55:43 -0500
Subject: [PATCH] Bump to released metasm 1.0.4

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

diff --git a/Gemfile b/Gemfile
index 8b32db8f0f..c02c55c780 100755
--- a/Gemfile
+++ b/Gemfile
@@ -5,9 +5,6 @@ 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 4d4b5def69..5ff85508b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/rapid7/metasm
-  revision: 916b7ca5a728321a8a4a890bd21e588e1f2ac5a6
-  branch: ruby_2_5_compat
-  specs:
-    metasm (1.0.4)
-
 PATH
   remote: .
   specs:
@@ -165,6 +158,7 @@ GEM
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    metasm (1.0.4)
     metasploit-concern (2.0.5)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -375,7 +369,6 @@ PLATFORMS
 DEPENDENCIES
   factory_bot_rails
   fivemat
-  metasm!
   metasploit-framework!
   octokit
   pry