From: Zero_Chaos <zerochaos@gentoo.org>
Date: Sat, 3 Oct 2015 21:48:46 +0000 (-0400)
Subject: net-analyzer/metasploit: remove masked 2.7, drop some old files and prep new init... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=248567c601e0d19870b07268f20b857686ac088c;p=gentoo.git

net-analyzer/metasploit: remove masked 2.7, drop some old files and prep new init scripts

Package-Manager: portage-2.2.21
---

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 7b154fdb3042..d2acafb1f9f9 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1 @@
-DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f SHA512 a65740c81e6c711e6661170ec0dd87919cad6c4aa3aaac08fdaa72b4825be4bea28ec09c78f818ddab7660f5b485b13f87e3175b43c625319ce89b044a40f2a0 WHIRLPOOL f309608e30488484b24555fec84e65ed0dcbeba62a69e6ec23c507dbc0fcf720551a795e2a0793886fcd38d3a9b160819c864720155f58f274577b0246f05946
 DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
diff --git a/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch b/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch
deleted file mode 100644
index 4f2e353ecb7d..000000000000
--- a/net-analyzer/metasploit/files/agix_psexec_pull-2657.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -Naur metasploit-9999.orig/external/source/shellcode/windows/x86/src/block/block_service.asm metasploit-9999/external/source/shellcode/windows/x86/src/block/block_service.asm
---- metasploit-9999.orig/external/source/shellcode/windows/x86/src/block/block_service.asm	1970-01-01 01:00:00.000000000 +0100
-+++ metasploit-9999/external/source/shellcode/windows/x86/src/block/block_service.asm	2013-11-20 11:50:48.256366095 +0100
-@@ -0,0 +1,64 @@
-+;-----------------------------------------------------------------------------;
-+; Author: agix (florian.gaultier[at]gmail[dot]com)
-+; Compatible: Windows 7, 2008, Vista, 2003, XP, 2000, NT4
-+; Size: 137 bytes
-+;-----------------------------------------------------------------------------;
-+
-+[BITS 32]
-+; Input: EBP must be the address of 'api_call'.
-+
-+push byte 0x0
-+push 0x32336970
-+push 0x61766461
-+push esp
-+push 0x726774c
-+call ebp		;load advapi32.dll
-+push 0x00454349
-+push 0x56524553
-+mov ecx, esp	;ServiceTableEntry.SVCNAME
-+lea eax, [ebp+0xd0];ServiceTableEntry.SvcMain
-+push 0x00000000
-+push eax
-+push ecx
-+mov eax,esp
-+push 0x00000000
-+push eax
-+push 0xCB72F7FA
-+call ebp		;call StartServiceCtrlDispatcherA(ServiceTableEntry)
-+push 0x00000000
-+push 0x56A2B5F0
-+call ebp		;call ExitProcess(0)
-+pop eax			;SvcCtrlHandler
-+pop eax
-+pop eax
-+pop eax
-+xor eax,eax
-+ret
-+cld 			;SvcMain
-+call me
-+me:
-+pop ebp
-+sub ebp, 0xd6	;ebp => hashFunction
-+push 0x00464349
-+push 0x56524553
-+mov ecx, esp	;SVCNAME
-+lea eax, [ebp+0xc9];SvcCtrlHandler
-+push 0x00000000
-+push eax
-+push ecx
-+push 0x5244AA0B
-+call ebp		;RegisterServiceCtrlHandlerExA
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000000
-+push 0x00000004
-+push 0x00000010
-+mov ecx, esp
-+push 0x00000000
-+push ecx
-+push eax
-+push 0x7D3755C6
-+call ebp		;SetServiceStatus RUNNING
-\ No newline at end of file
-diff -Naur metasploit-9999.orig/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm metasploit-9999/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm
---- metasploit-9999.orig/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm	1970-01-01 01:00:00.000000000 +0100
-+++ metasploit-9999/external/source/shellcode/windows/x86/src/single/single_service_stuff.asm	2013-11-20 11:50:48.256366095 +0100
-@@ -0,0 +1,17 @@
-+;-----------------------------------------------------------------------------;
-+; Author: Stephen Fewer (stephen_fewer[at]harmonysecurity[dot]com)
-+; Compatible: Windows 7, 2008, Vista, 2003, XP, 2000, NT4
-+; Version: 1.0 (28 July 2009)
-+; Size: 189 bytes + strlen(libpath) + 1
-+; Build: >build.py single_service_stuff
-+;-----------------------------------------------------------------------------;
-+
-+[BITS 32]
-+[ORG 0]
-+
-+  cld                    ; Clear the direction flag.
-+  call start             ; Call start, this pushes the address of 'api_call' onto the stack.
-+%include "./src/block/block_api.asm"
-+start:                   ;
-+  pop ebp                ; pop off the address of 'api_call' for calling later.
-+%include "./src/block/block_service.asm"
-\ No newline at end of file
-diff -Naur metasploit-9999.orig/lib/msf/util/exe.rb metasploit-9999/lib/msf/util/exe.rb
---- metasploit-9999.orig/lib/msf/util/exe.rb	2013-11-20 11:50:31.748365346 +0100
-+++ metasploit-9999/lib/msf/util/exe.rb	2013-11-20 11:50:48.256366095 +0100
-@@ -402,36 +402,86 @@
- 
-     case opts[:exe_type]
-       when :service_exe
-+        exe = Rex::PeParsey::Pe.new_from_file(opts[:template], true)
-         max_length = 8192
-         name = opts[:servicename]
- 
--        if name
--          bo = pe.index('SERVICENAME')
--          raise RuntimeError, "Invalid PE Service EXE template: missing \"SERVICENAME\" tag" if not bo
--          pe[bo, 11] = [name].pack('a11')
-+        if not name
-+          name = Rex::Text.rand_text_alpha(7)
-         end
--
--        if not opts[:sub_method]
--          pe[136, 4] = [rand(0x100000000)].pack('V')
-+        #code_service could be encoded in the future
-+        code_service =
-+        "\xFC\xE8\x89\x00\x00\x00\x60\x89\xE5\x31\xD2\x64\x8B\x52\x30\x8B" +
-+        "\x52\x0C\x8B\x52\x14\x8B\x72\x28\x0F\xB7\x4A\x26\x31\xFF\x31\xC0" +
-+        "\xAC\x3C\x61\x7C\x02\x2C\x20\xC1\xCF\x0D\x01\xC7\xE2\xF0\x52\x57" +
-+        "\x8B\x52\x10\x8B\x42\x3C\x01\xD0\x8B\x40\x78\x85\xC0\x74\x4A\x01" +
-+        "\xD0\x50\x8B\x48\x18\x8B\x58\x20\x01\xD3\xE3\x3C\x49\x8B\x34\x8B" +
-+        "\x01\xD6\x31\xFF\x31\xC0\xAC\xC1\xCF\x0D\x01\xC7\x38\xE0\x75\xF4" +
-+        "\x03\x7D\xF8\x3B\x7D\x24\x75\xE2\x58\x8B\x58\x24\x01\xD3\x66\x8B" +
-+        "\x0C\x4B\x8B\x58\x1C\x01\xD3\x8B\x04\x8B\x01\xD0\x89\x44\x24\x24" +
-+        "\x5B\x5B\x61\x59\x5A\x51\xFF\xE0\x58\x5F\x5A\x8B\x12\xEB\x86\x5D" +
-+        "\x6A\x00\x68\x70\x69\x33\x32\x68\x61\x64\x76\x61\x54\x68\x4C\x77" +
-+        "\x26\x07\xFF\xD5\x68"+name[4,3]+"\x00\x68"+name[0,4]+"\x89\xE1" +
-+        "\x8D\x85\xD0\x00\x00\x00\x6A\x00\x50\x51\x89\xE0\x6A\x00\x50\x68" +
-+        "\xFA\xF7\x72\xCB\xFF\xD5\x6A\x00\x68\xF0\xB5\xA2\x56\xFF\xD5\x58" +
-+        "\x58\x58\x58\x31\xC0\xC3\xFC\xE8\x00\x00\x00\x00\x5D\x81\xED\xD6" +
-+        "\x00\x00\x00\x68"+name[4,3]+"\x00\x68"+name[0,4]+"\x89\xE1\x8D" +
-+        "\x85\xC9\x00\x00\x00\x6A\x00\x50\x51\x68\x0B\xAA\x44\x52\xFF\xD5" +
-+        "\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x00\x6A\x04\x6A\x10" +
-+        "\x89\xE1\x6A\x00\x51\x50\x68\xC6\x55\x37\x7D\xFF\xD5"
-+
-+        pe_header_size=0x18
-+        section_size=0x28
-+        characteristics_offset=0x24
-+        virtualAddress_offset=0xc
-+        sizeOfRawData_offset=0x10
-+
-+        sections_table_rva = exe._dos_header.v['e_lfanew']+exe._file_header.v['SizeOfOptionalHeader']+pe_header_size
-+        sections_table_offset = exe.rva_to_file_offset(sections_table_rva)
-+        sections_table_characteristics_offset = exe.rva_to_file_offset(sections_table_rva+characteristics_offset)
-+
-+        sections_header = []
-+        exe._file_header.v['NumberOfSections'].times { |i|
-+          sections_header << [sections_table_characteristics_offset+(i*section_size),pe[sections_table_offset+(i*section_size),section_size]]
-+        }
-+
-+        #look for section with entry point
-+        sections_header.each do |sec|
-+          virtualAddress = sec[1][virtualAddress_offset,0x4].unpack('L')[0]
-+          sizeOfRawData = sec[1][sizeOfRawData_offset,0x4].unpack('L')[0]
-+          characteristics = sec[1][characteristics_offset,0x4].unpack('L')[0]
-+          if exe.hdr.opt.AddressOfEntryPoint >= virtualAddress && exe.hdr.opt.AddressOfEntryPoint < virtualAddress+sizeOfRawData
-+            #put this section writable
-+            characteristics|=0x80000000
-+            newcharacteristics = [characteristics].pack('L')
-+            pe[sec[0],newcharacteristics.length]=newcharacteristics
-+          end
-         end
-+
-+        #put the shellcode at the entry point, overwriting template
-+        pe[exe.rva_to_file_offset(exe.hdr.opt.AddressOfEntryPoint),code_service.length+code.length]=code_service+code
-+
-       when :dll
-         max_length = 2048
-       when :exe_sub
-         max_length = 4096
-     end
- 
--    bo = pe.index('PAYLOAD:')
--    raise RuntimeError, "Invalid PE EXE subst template: missing \"PAYLOAD:\" tag" if not bo
-+    if opts[:exe_type] != :service_exe
- 
--    if (code.length <= max_length)
--      pe[bo, code.length] = [code].pack("a*")
--    else
--      raise RuntimeError, "The EXE generator now has a max size of #{max_length} bytes, please fix the calling module"
--    end
-+      bo = pe.index('PAYLOAD:')
-+      raise RuntimeError, "Invalid PE EXE subst template: missing \"PAYLOAD:\" tag" if not bo
- 
--    if opts[:exe_type] == :dll
--      mt = pe.index('MUTEX!!!')
--      pe[mt,8] = Rex::Text.rand_text_alpha(8) if mt
-+      if (code.length <= max_length)
-+        pe[bo, code.length] = [code].pack("a*")
-+      else
-+        raise RuntimeError, "The EXE generator now has a max size of #{max_length} bytes, please fix the calling module"
-+      end
-+
-+      if opts[:exe_type] == :dll
-+        mt = pe.index('MUTEX!!!')
-+        pe[mt,8] = Rex::Text.rand_text_alpha(8) if mt
-+      end
-     end
- 
-     return pe
-@@ -463,7 +513,7 @@
- 
-   def self.to_win32pe_service(framework, code, opts={})
-     # Allow the user to specify their own service EXE template
--    set_template_default(opts, "template_x86_windows_svc.exe")
-+    set_template_default(opts, "template_x86_windows.exe")
-     opts[:exe_type] = :service_exe
-     exe_sub_method(code,opts)
-   end
-diff -Naur metasploit-9999.orig/modules/exploits/windows/smb/psexec.rb metasploit-9999/modules/exploits/windows/smb/psexec.rb
---- metasploit-9999.orig/modules/exploits/windows/smb/psexec.rb	2013-11-20 11:50:31.988365357 +0100
-+++ metasploit-9999/modules/exploits/windows/smb/psexec.rb	2013-11-20 11:50:48.256366095 +0100
-@@ -153,7 +153,7 @@
-       # Disconnect from the ADMIN$
-       simple.disconnect("ADMIN$")
-     else
--      servicename = rand_text_alpha(8)
-+      servicename = rand_text_alpha(7)
- 
-       # Upload the shellcode to a file
-       print_status("Uploading payload...")
diff --git a/net-analyzer/metasploit/files/metasploit.icon b/net-analyzer/metasploit/files/metasploit.icon
deleted file mode 100644
index 87af020fdf0d..000000000000
--- a/net-analyzer/metasploit/files/metasploit.icon
+++ /dev/null
@@ -1,224 +0,0 @@
-/* XPM */
-static char *metasploit[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 170 2 ",
-"   c #000000",
-".  c #0B0B0B",
-"X  c #131313",
-"o  c #1C1C1C",
-"O  c #251B0D",
-"+  c #2C2112",
-"@  c #2C241C",
-"#  c #081933",
-"$  c #061F3B",
-"%  c #07203C",
-"&  c #09223C",
-"*  c #232323",
-"=  c #2D2D2D",
-"-  c #353535",
-";  c #383838",
-":  c #0C2141",
-">  c #0F264C",
-",  c #0F284D",
-"<  c #072755",
-"1  c #082754",
-"2  c #062855",
-"3  c #0E2C57",
-"4  c #072858",
-"5  c #0D2F5C",
-"6  c #033A6E",
-"7  c #1A3166",
-"8  c #043C72",
-"9  c #2F456F",
-"0  c #2A4174",
-"q  c #314774",
-"w  c #314A75",
-"e  c #424242",
-"r  c #444A5F",
-"t  c #545454",
-"y  c #5B5B5B",
-"u  c #414B60",
-"i  c #515A6F",
-"p  c #4B6975",
-"a  c #416679",
-"s  c #46697B",
-"d  c #4D6D7C",
-"f  c #636363",
-"g  c #686868",
-"h  c #727272",
-"j  c #7B7B7B",
-"k  c #B37777",
-"l  c #C76852",
-"z  c #F26E40",
-"x  c #C77A6F",
-"c  c #DA8D75",
-"v  c #023986",
-"b  c #002F99",
-"n  c #043296",
-"m  c #043898",
-"M  c #0038A0",
-"N  c #094089",
-"B  c #1C4583",
-"V  c #194997",
-"C  c #1E4E9F",
-"Z  c #215192",
-"A  c #225A9F",
-"S  c #3D5C98",
-"D  c #3B6F8A",
-"F  c #0D43AD",
-"G  c #1F4EA2",
-"H  c #1F4EAA",
-"J  c #1753BB",
-"K  c #1852B9",
-"L  c #224FA8",
-"P  c #2450A4",
-"I  c #2E55A0",
-"U  c #2755AD",
-"Y  c #2956AE",
-"T  c #3464A5",
-"R  c #2963BC",
-"E  c #466E81",
-"W  c #447082",
-"Q  c #6C739A",
-"!  c #4471B1",
-"~  c #4873B6",
-"^  c #4870BB",
-"/  c #4D78BA",
-"(  c #0D53C3",
-")  c #1866C9",
-"_  c #046EDB",
-"`  c #126FD4",
-"'  c #0C73DD",
-"]  c #3767C7",
-"[  c #326AC2",
-"{  c #3D75C4",
-"}  c #3574C8",
-"|  c #3B74C9",
-" . c #3E79CC",
-".. c #2F74D3",
-"X. c #3B7BD0",
-"o. c #006EE5",
-"O. c #0479E5",
-"+. c #0074E9",
-"@. c #087EEC",
-"#. c #1479E1",
-"$. c #497AC7",
-"%. c #447BCD",
-"&. c #487FD2",
-"*. c #5B84A8",
-"=. c #3B82DA",
-"-. c #0C86EF",
-";. c #1F80E5",
-":. c #1393F9",
-">. c #1C99FB",
-",. c #348FEC",
-"<. c #3290E5",
-"1. c #3491EB",
-"2. c #2490F3",
-"3. c #279EFD",
-"4. c #3CA8FF",
-"5. c #5394D2",
-"6. c #758FC3",
-"7. c #689AD3",
-"8. c #7399D1",
-"9. c #4090E6",
-"0. c #4990E4",
-"q. c #4694EB",
-"w. c #559BED",
-"e. c #4B9BF1",
-"r. c #539FF3",
-"t. c #45A4FD",
-"y. c #47AAFA",
-"u. c #56A0F4",
-"i. c #5AA4F5",
-"p. c #5CA6F8",
-"a. c #56B5FD",
-"s. c #71A3E1",
-"d. c #65AFFB",
-"f. c #66B7FF",
-"g. c #68B7FF",
-"h. c #6CC2FF",
-"j. c #70C9FF",
-"k. c #7CD7FF",
-"l. c #7ED9FF",
-"z. c #838383",
-"x. c #8B8B8B",
-"c. c #939393",
-"v. c #9D9D9D",
-"b. c #B18A8B",
-"n. c #9193AB",
-"m. c #A3A3A3",
-"M. c #AEAEAE",
-"N. c #B2B2B2",
-"B. c #BDBDBD",
-"V. c #8299C5",
-"C. c #8899C3",
-"Z. c #81C2FF",
-"A. c #8BCEFF",
-"S. c #86D7FF",
-"D. c #8BD1FF",
-"F. c #84DCFF",
-"G. c #8ADFFF",
-"H. c #94D6FF",
-"J. c #9DDAFE",
-"K. c #8DE1FF",
-"L. c #97E0FF",
-"P. c #C3C3C3",
-"I. c #CBCBCB",
-"U. c #D3D3D3",
-"Y. c #DCDCDC",
-"T. c #E3E3E3",
-"R. c #ECECEC",
-"E. c #F4F4F4",
-"W. c #FFFFFF",
-"Q. c None",
-/* pixels */
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.8 V P G G G G G G G G G P G G G G G G G G G G G G G G G G G G G G G G G G L V 6 Q.Q.Q.Q.Q.",
-"Q.v N A | &.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.| }  .%. .} | %. .=.} A Z B Q.Q.Q.",
-"Q.F K ..q.u.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.i.p.u.e.u.p.p.w.w.s.8.$.] P 5 Q.Q.",
-"Q.R ) _ ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' #.d.Z.u.;.,.j.g.1./ k x ~ ( n 4 : Q.",
-"Q.` ' +.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.f.D.t.@.2.A.g.1.! l z Q J b 2 % Q.",
-"Q.O.-.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.>.h.D.a.3.4.D.j.y.5.b.c n.[ M 2 & Q.",
-"Q.<.a.F.l.k.k.k.k.k.l.l.k.k.k.k.k.k.k.k.k.l.k.k.k.k.k.k.k.k.l.K.K.G.l.F.L.K.F.S.H.J.L.0.m 1 & Q.",
-"Q.7.*.p d d d d d d d d d d d d d d d d d d d d d d d d d d d s a s d s a s s E D D W T G 3 $ Q.",
-"Q.C.r                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 % Q.",
-"Q.V.u                                                   c.R.W.Y.                      7 Y 3 $ Q.",
-"Q.V.u                                                 g W.W.W.Y.                      7 Y 3 $ Q.",
-"Q.V.u                                                 M.W.W.R.X                       7 Y 3 $ Q.",
-"Q.V.u   T.W.W.E.m.R.E.B.m.W.E.I.-   . j U.E.W.P.e   h E.W.W.W.c.  .                   7 Y 3 $ Q.",
-"Q.V.u   W.W.W.W.W.W.W.W.W.W.W.W.R.X v.W.W.W.W.W.R.  E.W.W.W.W.E.  E.c.*               7 Y 3 $ Q.",
-"Q.V.u   W.W.W.W.W.W.W.W.W.W.W.W.W.f E.W.W.R.X P.f   h W.W.W.E.y   W.W.W.N.e           7 Y 3 $ Q.",
-"Q.V.u   W.W.W.E.= W.W.W.U.- W.W.W.v.P.W.W.W.U.-       W.W.W.Y.    o x.R.W.W.I.f .     7 Y 3 $ Q.",
-"Q.V.u   W.W.W.Y.  W.W.W.I.  W.W.W.B.* Y.W.W.W.W.j     W.W.W.Y.        . f U.W.W.R.z.  7 Y 3 $ Q.",
-"Q.V.u   W.W.W.Y.  W.W.W.Y.  W.W.W.U.g . f T.W.W.W.g   W.W.W.Y.              y W.W.W.  7 Y 3 & Q.",
-"Q.V.u   W.W.W.Y.  W.W.W.Y.. W.W.W.R.W.t   ; W.W.W.M.  W.W.W.Y.          e N.W.W.W.m.  7 Y 3 $ Q.",
-"Q.V.u   W.W.W.Y.  W.W.W.Y.- W.W.W.Y.E.W.U.T.W.W.W.c.  W.W.W.Y.    . g U.W.W.R.z.o     7 Y 3 $ Q.",
-"Q.V.u   W.W.W.Y.  W.W.W.U.m.W.W.W.P.c.W.W.W.W.W.E.*   W.W.W.R.    R.W.W.U.f .         7 Y 3 $ Q.",
-"Q.V.u   U.W.W.U.  W.W.W.m.T.W.W.W.x.. c.R.W.E.N.=     U.W.W.T.    W.N.e               7 Y 3 $ Q.",
-"Q.V.u                                                             *                   7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u                                                                                 7 Y 3 $ Q.",
-"Q.V.u       .   .   .       .     .   .   .           . .   .         . .   .         7 Y 3 $ Q.",
-"Q.6.i O @ @ @ @ + @ @ @ @ @ + @ @ @ @ @ @ @ @ @ @ @ @ @ + @ @ @ @ @ @ @ + @ @ @ @ @ + 0 H 3 & Q.",
-"Q.^ S 9 w w w w q w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w w q I G 3 $ Q.",
-"Q.V V P C G C C C C P C C C C C P C C C C C C C C C C C C C C C C C C C C C C P A C P A B > $ Q.",
-"Q.3 1 > , > > > > > > > > > > > > > > > > > > > > > > > > > , , > > > > > > > > > > > > > & : Q.",
-"Q.Q.Q.Q.Q.# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.",
-"Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q."
-};
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.0-initd b/net-analyzer/metasploit/files/msfrpcd-4.0-initd
deleted file mode 100644
index ad6bf25ba5db..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.0-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.0
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
-	ebegin "Starting msfrpcd${VERSION}"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/lib/metasploit${VERSION}/msfrpcd \
-		--pidfile ${PIDFILE} \
-		--make-pidfile -- -f ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfrpcd${VERSION}"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.0-conf b/net-analyzer/metasploit/files/msfrpcd-4.11-conf
similarity index 100%
rename from net-analyzer/metasploit/files/msfrpcd-4.0-conf
rename to net-analyzer/metasploit/files/msfrpcd-4.11-conf
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.3-initd b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
similarity index 97%
rename from net-analyzer/metasploit/files/msfrpcd-4.3-initd
rename to net-analyzer/metasploit/files/msfrpcd-4.11-initd
index 4880d501fa21..2b8a4cdd47da 100644
--- a/net-analyzer/metasploit/files/msfrpcd-4.3-initd
+++ b/net-analyzer/metasploit/files/msfrpcd-4.11-initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-VERSION=4.3
+VERSION=4.11
 PIDFILE=/var/run/msfrpcd${VERSION}.pid
 
 start() {
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.2-conf b/net-analyzer/metasploit/files/msfrpcd-4.2-conf
deleted file mode 100644
index dc56a9d966a6..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.2-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.2-initd b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
deleted file mode 100644
index 91a373f343ab..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.2-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.2
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
-	ebegin "Starting msfrpcd${VERSION}"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/lib/metasploit${VERSION}/msfrpcd \
-		--pidfile ${PIDFILE} \
-		--make-pidfile -- -f ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfrpcd${VERSION}"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.3-conf b/net-analyzer/metasploit/files/msfrpcd-4.3-conf
deleted file mode 100644
index dc56a9d966a6..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.3-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-conf b/net-analyzer/metasploit/files/msfrpcd-4.4-conf
deleted file mode 100644
index dc56a9d966a6..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.4-conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/msfrpcd
-
-# msfrpcd -h for more info
-
-# Bind to the following IP instead of 0.0.0.0
-MSF_OPTS="-a 127.0.0.1"
-
-# Bind to the following TCP port instead of default 55553
-#MSF_OPTS="${MSF_OPTS} -p 55553"
-
-# Specify the username to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -U msf"
-
-# Specify the password to access msfrpcd
-MSF_OPTS="${MSF_OPTS} -P secret"
-
-# Server type, [Basic|Web]
-#MSF_OPTS="${MSF_OPTS} -t Basic"
-
-# URI for Web server
-#MSF_OPTS="${MSF_OPTS} -u "
-
-# Disable SSL on the XMLRPC socket
-# JAVA GUI doesn't support SSL as of Nov 6, 2010
-MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-initd b/net-analyzer/metasploit/files/msfrpcd-4.4-initd
deleted file mode 100644
index 4880d501fa21..000000000000
--- a/net-analyzer/metasploit/files/msfrpcd-4.4-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION=4.3
-PIDFILE=/var/run/msfrpcd${VERSION}.pid
-
-start() {
-	ebegin "Starting msfrpcd${VERSION}"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/lib/metasploit${VERSION}/msfrpcd \
-		--pidfile ${PIDFILE} \
-		--make-pidfile -- -f ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfrpcd${VERSION}"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb.confd b/net-analyzer/metasploit/files/msfweb.confd
deleted file mode 100644
index 3e9fa64d9a14..000000000000
--- a/net-analyzer/metasploit/files/msfweb.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Pidfile
-PIDFILE=/var/run/msfweb.pid
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb.initd b/net-analyzer/metasploit/files/msfweb.initd
deleted file mode 100644
index 0805d583dc7f..000000000000
--- a/net-analyzer/metasploit/files/msfweb.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-start() {
-	ebegin "Starting msfweb"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/metasploit-2.7.ebuild b/net-analyzer/metasploit/metasploit-2.7.ebuild
deleted file mode 100644
index ed11d9b3a396..000000000000
--- a/net-analyzer/metasploit/metasploit-2.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_P="${P/metasploit/framework}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	 dev-perl/Net-SSLeay
-	 dev-perl/Term-ReadLine-Perl
-	 dev-perl/TermReadKey"
-
-src_install() {
-	dodir /usr/lib/
-	dodir /usr/bin/
-
-	# should be as simple as copying everything into the target...
-	cp -pPR "${S}" "${D}"usr/lib/metasploit || die
-
-	# and creating symlinks in the /usr/bin dir
-	cd "${D}"/usr/bin
-	ln -s ../lib/metasploit/msf* ./ || die
-	chown -R root:0 "${D}"
-
-	newinitd "${FILESDIR}"/msfweb.initd msfweb || die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb.confd msfweb || die "newconfd failed"
-}
-
-pkg_postinst() {
-	elog "To update metasploit modules run:"
-	elog " # cd /usr/lib/metasploit && svn update"
-}
-
-pkg_postrm() {
-	if [[ -d /usr/lib/metasploit ]] ; then
-		ewarn "If you ever updated modules emerge will keep /var/lib/metasploit"
-		ewarn "directory. Thus to remove metasploit completely do not forgive to:"
-		ewarn " # rm -r /usr/lib/metasploit"
-	fi
-}