From cedb4b73407d93687ef38af153d05395838139de Mon Sep 17 00:00:00 2001
From: "x90\" * 365" <jjniven@gmail.com>
Date: Mon, 4 Jan 2016 17:21:21 -0500
Subject: [PATCH] Update egghunter.rb msfenv requirements

On Stock Kali 2.0 (after apt-get upgrade), the following command errors ./egghunter.rb --list-formats.  Adding the require 'msfenv' to the file alleviates the issue.

root@kali:/usr/share/metasploit-framework/tools/exploit# ./egghunter.rb --list-formats
/usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rkelly (LoadError)
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto/http/response.rb:5:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto/http.rb:4:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto.rb:2:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex.rb:79:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/msf/core.rb:17:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/msf/base.rb:17:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from ./egghunter.rb:9:in `<main>'
---
 tools/exploit/egghunter.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/exploit/egghunter.rb b/tools/exploit/egghunter.rb
index 48110e27f5..12a42716ba 100755
--- a/tools/exploit/egghunter.rb
+++ b/tools/exploit/egghunter.rb
@@ -5,9 +5,10 @@ while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
-require 'rex'
+require 'msfenv'
 require 'msf/core'
 require 'msf/base'
+require 'rex'
 require 'optparse'
 
 module Egghunter