wifite2: merge with wifite, https://github.com/derv82/wifite2/issues/80

net-wireless/wifite/Manifest

@@ -1 +1,2 @@
 DIST wifite-2.0.89.tar.gz 34201 BLAKE2B e81469c8eaedaa381284566ec94ede9b50ee357f6a55fdf73f0923aafeccd8b24091010efb7c3ae511c17b69683b94dbab1e3dfd2c9275b9540173e9d5387e34 SHA512 fc52fd51b16e9caeae3a71f1a3d3c5ec38f5e19193106acd0acd57a7e8808f692c143a7c4ce82792561a4400320f996ef93fe283540c9c4ead1f483cb0c5a12c
+DIST wifite2-2.1.0.tar.gz 642855 BLAKE2B 741a75bf86f46679687ec46ed69c88d9b16937e2779d446d3adc4c49a7b02e434d22e72163a2735082c2a80b9b686d3c30061b1800ca1553b2f242984d87c82a SHA512 97fb902c9534f6a1b4bb236550e66d213f4b53139bdf1004e84bd436c8e373829a45d6c58851e9186248f2be02226116cf77b16432a8a880a85d51fef48f8f56

net-wireless/wifite/wifite-2.1.0.ebuild

@@ -6,13 +6,23 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
-DESCRIPTION="An automated wireless attack tool, v2"
+MY_P="${PN}2-${PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/derv82/wifite2.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/derv82/wifite2/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="An automated wireless attack tool"
 HOMEPAGE="https://github.com/derv82/wifite2"
-SRC_URI="https://github.com/derv82/wifite2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT="2"
 IUSE="dict extra"
 
 DEPEND=""
@@ -36,7 +46,5 @@ src_prepare() {
 src_install() {
 	dodir /usr/$(get_libdir)/${PN}
 	cp -R * "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed"
-	dosym  "${EPREFIX}"/usr/$(get_libdir)/${PN}/Wifite.py /usr/sbin/${PN}
-
-#	newsbin Wifite.py wifite2
+	dosym  "${EPREFIX}"/usr/$(get_libdir)/${PN}/Wifite.py /usr/sbin/${PN}2
 }

net-wireless/wifite/wifite-9999.ebuild

@@ -0,0 +1 @@
+wifite-2.1.0.ebuild

net-wireless/wifite2/Manifest

@@ -1 +0,0 @@
-DIST wifite2-2.1.0.tar.gz 642855 BLAKE2B 741a75bf86f46679687ec46ed69c88d9b16937e2779d446d3adc4c49a7b02e434d22e72163a2735082c2a80b9b686d3c30061b1800ca1553b2f242984d87c82a SHA512 97fb902c9534f6a1b4bb236550e66d213f4b53139bdf1004e84bd436c8e373829a45d6c58851e9186248f2be02226116cf77b16432a8a880a85d51fef48f8f56

net-wireless/wifite2/files/wifite-2014_noupgrade.patch

@@ -1,11 +0,0 @@
---- wifite.py.org	2014-09-18 18:13:56.000000000 +0800
-+++ wifite.py	2014-09-18 18:14:56.642235807 +0800
-@@ -437,7 +437,7 @@
-                         print R + ' [!]' + O + ' file not found: ' + R + capfile + '\n' + W
-                         self.exit_gracefully(1)
-             if options.update:
--                self.upgrade()
-+                print 'The direct upgrade of this binary has been disabled. Please use a package manager instead'
-                 exit(0)
-             if options.cracked:
-                 if len(self.CRACKED_TARGETS) == 0:

net-wireless/wifite2/files/wifite-noupgrade.patch

@@ -1,11 +0,0 @@
---- wifite.orig	2012-05-29 08:53:04.321780000 +0800
-+++ wifite	2012-05-29 08:54:03.546779995 +0800
-@@ -521,7 +521,7 @@
- 						exit_gracefully(1)
- 					
- 			elif args[i] == '-upgrade' or args[i] == '-update':
--				upgrade()
-+				print 'The direct upgrade of this binary has been disabled. Please use a package manager instead'
- 				exit(0)
- 				
- 			elif args[i] == '-cracked':

net-wireless/wifite2/files/wifite-tshark.patch

@@ -1,38 +0,0 @@
---- wifite.orig	2013-08-03 12:06:00.000000000 +0800
-+++ wifite	2013-08-03 13:55:43.140584142 +0800
-@@ -1701,12 +1701,12 @@
- 	proc = Popen(cmd, stdout=PIPE, stderr=DN)
- 	proc.wait()
- 	for line in proc.communicate()[0].split('\n'):
--		if line.endswith('Key (msg 1/4)') or line.endswith('Key (msg 3/4)'):
-+		if line.endswith('Key (Message 1 of 4)') or line.endswith('Key (Message 3 of 4)'):
- 			while line.startswith(' ') or line.startswith('\t'): line = line[1:]
- 			line = line.replace('\t', ' ')
- 			while line.find('  ') != -1: line = line.replace('  ', ' ')
- 			return line.split(' ')[2]
--		elif line.endswith('Key (msg 2/4)') or line.endswith('Key (msg 4/4)'):
-+		elif line.endswith('Key (Message 2 of 4)') or line.endswith('Key (Message 4 of 4)'):
- 			while line.startswith(' ') or line.startswith('\t'): line = line[1:]
- 			line = line.replace('\t', ' ')
- 			while line.find('  ') != -1: line = line.replace('  ', ' ')
-@@ -1995,18 +1995,10 @@
- 				
- 				fields = line.split(' ')
- 				
--				# Sometimes tshark doesn't display the full header for "Key (msg 3/4)" on the 3rd handshake.
--				# This catches this glitch and fixes it.
--				if len(fields) < 8: 
--					continue
--				elif len(fields) == 8:
--					fields.append('(msg')
--					fields.append('3/4)')
--				
- 				src = fields[2].lower() # Source MAC address
- 				dst = fields[4].lower() # Destination MAC address
--				#msg = fields[9][0]      # The message number (1, 2, 3, or 4)
--				msg = fields[-1][0]
-+				msg = fields[9][0]      # The message number (1, 2, 3, or 4)
-+				#msg = fields[-1][0]
- 				
- 				# First, third msgs in 4-way handshake are from the target to client
- 				if msg_num % 2 == 1 and (src != target.bssid.lower() or dst != client): continue

net-wireless/wifite2/wifite2-9999.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 git-r3
-
-DESCRIPTION="An automated wireless attack tool, v2"
-HOMEPAGE="https://github.com/derv82/wifite2"
-EGIT_REPO_URI="https://github.com/derv82/wifite2.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="dict extra"
-
-DEPEND=""
-RDEPEND="net-wireless/aircrack-ng
-	dev-python/pexpect
-	dict? ( sys-apps/cracklib-words )
-	extra? ( net-analyzer/wireshark
-		net-wireless/reaver-wps-fork-t6x
-		!net-wireless/reaver
-		net-wireless/bully
-		net-wireless/cowpatty
-		net-wireless/pyrit
-		net-analyzer/macchanger
-	)"
-
-src_prepare() {
-	python_fix_shebang .
-	eapply_user
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/${PN}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed"
-	dosym  "${EPREFIX}"/usr/$(get_libdir)/${PN}/Wifite.py /usr/sbin/${PN}
-
-#	newsbin Wifite.py wifite2
-}

profiles/pentoo/base/package.accept_keywords/net-wireless

@@ -81,7 +81,6 @@ net-wireless/lorcon
 ~net-wireless/nfcpy-0.10.2
 
 net-wireless/wifite
-net-wireless/wifite2
 
 #below here likely needs cleanup
 net-wireless/acx