add hashcat optdependency; experimental patch to fix process/kill issues

3 files changed, 67 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d131864df3f1..6ab4c75fd02c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,8 +19,11 @@ pkgbase = wifite2-git
 	optdepends = hcxdumptool
 	optdepends = hcxtools
 	optdepends = john
+	optdepends = hashcat
 	source = wifite2-git::git+https://github.com/derv82/wifite2.git
+	source = processes.patch
 	sha256sums = SKIP
+	sha256sums = 2feaf268219cd981eeda19bb82627ba066938e9a296b3feef224236f7f9a1bcc
 
 pkgname = wifite2-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e8cd3eec2420..82f8fdd72069 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,24 @@ arch=(any)
 url="https://github.com/derv82/wifite2"
 license=('GPL')
 depends=(python aircrack-ng wireless_tools net-tools)
-optdepends=(macchanger wireshark-cli reaver bully cowpatty pyrit hcxdumptool hcxtools john)
+optdepends=(macchanger wireshark-cli reaver bully
+            cowpatty pyrit hcxdumptool hcxtools john hashcat)
 makedepends=(git)
-source=($pkgname::git+https://github.com/derv82/wifite2.git)
-sha256sums=('SKIP')
+source=($pkgname::git+https://github.com/derv82/wifite2.git
+        processes.patch)
+sha256sums=('SKIP'
+            '2feaf268219cd981eeda19bb82627ba066938e9a296b3feef224236f7f9a1bcc')
 
 pkgver() {
   cd "$pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "$pkgname"
+  patch -Np1 -i ../processes.patch
+}
+
 package() {
   mkdir -p ${pkgdir}/usr/bin
   mkdir -p ${pkgdir}/usr/share/wifite2
diff --git a/processes.patch b/processes.patch
new file mode 100644
index 000000000000..1498ac4ecf01
--- /dev/null
+++ b/processes.patch
@@ -0,0 +1,53 @@
+diff --git a/wifite/tools/airmon.py b/wifite/tools/airmon.py
+index a2a4538..b18570e 100755
+--- a/wifite/tools/airmon.py
++++ b/wifite/tools/airmon.py
+@@ -354,7 +354,16 @@ class Airmon(Dependency):
+ 
+         Color.pl('{!} {O}Killing {R}%d {O}conflicting processes' % len(pid_pnames))
+         for pid, pname in pid_pnames:
+-            if pname == 'NetworkManager' and Process.exists('service'):
++            if pname == 'NetworkManager' and Process.exists('systemctl'):
++                Color.pl('{!} {O}stopping network-manager ({R}systemctl stop NetworkManager{O})')
++                # Can't just pkill network manager; it's a service
++                Process(['systemctl', 'stop', 'NetworkManager']).wait()
++                Airmon.killed_network_manager = True
++            elif pname == 'avahi-daemon' and Process.exists('systemctl'):
++                Color.pl('{!} {O}stopping avahi-daemon ({R}systemctl stop avahi-daemon{O})')
++                # Can't just pkill avahi-daemon; it's a service
++                Process(['systemctl', 'stop', 'avahi-daemon']).wait()
++            elif pname == 'NetworkManager' and Process.exists('service'):
+                 Color.pl('{!} {O}stopping network-manager ({R}service network-manager stop{O})')
+                 # Can't just pkill network manager; it's a service
+                 Process(['service', 'network-manager', 'stop']).wait()
+@@ -381,8 +390,8 @@ class Airmon(Dependency):
+     def start_network_manager():
+         Color.p('{!} {O}restarting {R}NetworkManager{O}...')
+ 
+-        if Process.exists('service'):
+-            cmd = 'service network-manager start'
++        if Process.exists('systemctl'):
++            cmd = 'systemctl start NetworkManager'
+             proc = Process(cmd)
+             (out, err) = proc.get_output()
+             if proc.poll() != 0:
+@@ -394,9 +403,8 @@ class Airmon(Dependency):
+             else:
+                 Color.pl(' {G}done{W} ({C}%s{W})' % cmd)
+                 return
+-
+-        if Process.exists('systemctl'):
+-            cmd = 'systemctl start NetworkManager'
++        elif Process.exists('service'):
++            cmd = 'service network-manager start'
+             proc = Process(cmd)
+             (out, err) = proc.get_output()
+             if proc.poll() != 0:
+@@ -408,6 +416,7 @@ class Airmon(Dependency):
+             else:
+                 Color.pl(' {G}done{W} ({C}%s{W})' % cmd)
+                 return
++
+         else:
+             Color.pl(' {R}cannot restart NetworkManager: {O}systemctl{R} or {O}service{R} not found{W}')
+