bug 8792 fixed upstream

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

3 files changed, 6 insertions, 59 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 9e1c73b1b3ab..f5ba019da7e8 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.92 2014/04/28 16:37:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.93 2014/04/28 18:40:24 zerochaos Exp $
+
+  28 Apr 2014; Rick Farina <zerochaos@gentoo.org> -files/bug-8792.patch,
+  metasploit-9999.ebuild:
+  bug 8792 fixed upstream
 
   28 Apr 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild:
   minor updates and fixes for tests (which still don't pass)
diff --git a/net-analyzer/metasploit/files/bug-8792.patch b/net-analyzer/metasploit/files/bug-8792.patch
deleted file mode 100644
index 9e37b3b6615d..000000000000
--- a/net-analyzer/metasploit/files/bug-8792.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/spec/support/shared/contexts/msf/util/exe.rb b/spec/support/shared/contexts/msf/util/exe.rb
-index e1372a6..c1b6ea5 100644
---- a/spec/support/shared/contexts/msf/util/exe.rb
-+++ b/spec/support/shared/contexts/msf/util/exe.rb
-@@ -36,8 +36,8 @@ shared_context 'Msf::Util::Exe' do
-       { :format => "psh",  :arch => "x86_64", :file_fp => /ASCII/  },
-       { :format => "psh-net",  :arch => "x86", :file_fp => /ASCII/  },
-       { :format => "psh-net",  :arch => "x86_64", :file_fp => /ASCII/  },
--      { :format => "war",  :arch => "x86", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "x86_64", :file_fp => /zip/i  },
-+      { :format => "war",  :arch => "x86", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "x86_64", :file_fp => /zip|jar/i  },
-       { :format => "msi",  :arch => "x86", :file_fp => /(Composite Document)|(CDF V2 Document)/  },
-       { :format => "msi",  :arch => "x64", :file_fp => /(Composite Document)|(CDF V2 Document)/  },
-       { :format => "msi",  :arch => "x86_64", :file_fp => /(Composite Document)|(CDF V2 Document)/  },
-@@ -51,29 +51,29 @@ shared_context 'Msf::Util::Exe' do
-       { :format => "elf", :arch => "armle",  :file_fp => /ELF 32.*ARM/ },
-       { :format => "elf", :arch => "mipsbe", :file_fp => /ELF 32-bit MSB executable, MIPS/ },
-       { :format => "elf", :arch => "mipsle", :file_fp => /ELF 32-bit LSB executable, MIPS/ },
--      { :format => "war",  :arch => "x86", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "x64", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "armle", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "mipsbe", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "mipsle", :file_fp => /zip/i  },
-+      { :format => "war",  :arch => "x86", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "x64", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "armle", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "mipsbe", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "mipsle", :file_fp => /zip|jar/i  },
-     ],
-     "bsd" => [
-       { :format => "elf", :arch => "x86", :file_fp => /ELF 32.*BSD/ },
--      { :format => "war",  :arch => "x86", :file_fp => /zip/i  },
-+      { :format => "war",  :arch => "x86", :file_fp => /zip|jar/i  },
-     ],
-     "solaris" => [
-       { :format => "elf", :arch => "x86", :file_fp => /ELF 32/ },
--      { :format => "war",  :arch => "x86", :file_fp => /zip/i  },
-+      { :format => "war",  :arch => "x86", :file_fp => /zip|jar/i  },
-     ],
-     "osx" => [
-       { :format => "macho", :arch => "x86",   :file_fp => /Mach-O.*i386/  },
-       { :format => "macho", :arch => "x64",   :file_fp => /Mach-O 64/     },
-       { :format => "macho", :arch => "armle", :file_fp => /Mach-O.*(acorn|arm)/ },
-       { :format => "macho", :arch => "ppc",   :file_fp => /Mach-O.*ppc/   },
--      { :format => "war",  :arch => "x86", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "x64", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "armle", :file_fp => /zip/i  },
--      { :format => "war",  :arch => "ppc", :file_fp => /zip/i  },
-+      { :format => "war",  :arch => "x86", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "x64", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "armle", :file_fp => /zip|jar/i  },
-+      { :format => "war",  :arch => "ppc", :file_fp => /zip|jar/i  },
-     ],
-   }
- 
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 032b8134ce9e..8e89dc39d846 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.23 2014/04/28 16:37:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.24 2014/04/28 18:40:24 zerochaos Exp $
 
 EAPI="5"
 
@@ -125,7 +125,6 @@ all_ruby_unpack() {
 all_ruby_prepare() {
 	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
 	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch "${FILESDIR}/bug-8792.patch"
 	epatch_user
 
 	#unbundle johntheripper, at least it now defaults to running the system version