Updated: PKGBUILD

3 files changed, 52 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 196f96c56433..cbc094822cce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cpyrit-cuda
 	pkgdesc = The famous WPA precomputed cracker for NVIDIA-CUDA.
 	pkgver = 0.5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/JPaulMora/Pyrit
 	arch = i686
 	arch = x86_64
@@ -16,13 +16,14 @@ pkgbase = cpyrit-cuda
 	depends = zlib
 	depends = libpcap
 	depends = nvidia
-	depends = pyrit
 	optdepends = scapy: packet capture analyzation support
 	optdepends = python2-sqlalchemy: storage support
 	source = cpyrit-cuda-0.5.0.tar.gz::https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz
 	source = scapy-2.3.2.patch
+	source = fix-broken-join.patch
 	sha256sums = c610b7e5930e71ef466365418e58ce72f4b7dea5a3398c3296192f0c4a7175aa
 	sha256sums = 41cd140e25862a5474d520a781cb49ee9152e4ce5a163119902de8d2daac0c7e
+	sha256sums = 22ca97c7a9223c2beb20a25b925c44261bef9b1dcb51d647824a2f1a5c765a88
 
 pkgname = cpyrit-cuda
 
diff --git a/PKGBUILD b/PKGBUILD
index bee8fd153aee..53059abbf862 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,49 @@
-# Maintainer:
-# Contributor: Felix Golatofski <contact@xdfr.de>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: pino <pinoverclock@gmail.com>
 # Contributor: William Díaz <wdiaz [at] archlinux [dot] us>
 
 pkgname=cpyrit-cuda
 _pkgname=Pyrit
 pkgver=0.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The famous WPA precomputed cracker for NVIDIA-CUDA."
 url='https://github.com/JPaulMora/Pyrit'
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('openssl' 'python2' 'zlib' 'libpcap' 'nvidia' 'pyrit')
+depends=('openssl' 'python2' 'zlib' 'libpcap' 'nvidia')
 makedepends=('gcc' 'python2' 'cuda')
 optdepends=(
   'scapy: packet capture analyzation support'
   'python2-sqlalchemy: storage support'
 )
 checkdepends=('python2-sqlalchemy' 'scapy')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JPaulMora/Pyrit/archive/v${pkgver}.tar.gz
-        scapy-2.3.2.patch)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/JPaulMora/Pyrit/archive/v${pkgver}.tar.gz"
+        "scapy-2.3.2.patch"
+	"fix-broken-join.patch")
 sha256sums=('c610b7e5930e71ef466365418e58ce72f4b7dea5a3398c3296192f0c4a7175aa'
-            '41cd140e25862a5474d520a781cb49ee9152e4ce5a163119902de8d2daac0c7e')
+            '41cd140e25862a5474d520a781cb49ee9152e4ce5a163119902de8d2daac0c7e'
+            '22ca97c7a9223c2beb20a25b925c44261bef9b1dcb51d647824a2f1a5c765a88')
 
 prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}
+
+  # cpyrit CUDA module mod
+  sed -i 's/ -ccbin clang / /' ${srcdir}/${_pkgname}-${pkgver}/modules/cpyrit_cuda/setup.py
   patch -p1 < "${srcdir}/scapy-2.3.2.patch"
+  patch -p1 < "${srcdir}/fix-broken-join.patch"
+  # Fix file cpyrit.py
+  sed -i 's/CUDA =  cpyrit_cuda.listDevices()/CUDA = _cpyrit_cuda.listDevices()/;s/CUDA -= 1/#CUDA -= 1/' ${srcdir}/Pyrit-${pkgver}/cpyrit/cpyrit.py
 }
 
+
 build() {
+  # cpyrit CUDA module compile
+  cd ${srcdir}/${_pkgname}-${pkgver}/modules/cpyrit_cuda
+  python2 setup.py clean build
+
+  # Pyrit compile
   cd ${srcdir}/${_pkgname}-${pkgver}
-  python2 setup.py build
+  python2 setup.py clean build
 }
 
 check() {
@@ -40,7 +54,9 @@ check() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/Pyrit-${pkgver}/modules/cpyrit_cuda
+  python2 setup.py install -O1 --root="${pkgdir}" --skip-build
+  cd ${srcdir}/Pyrit-${pkgver}
   python2 setup.py install -O1 --root="${pkgdir}" --skip-build
   install -Dm 644 README.md CHANGELOG -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
diff --git a/fix-broken-join.patch b/fix-broken-join.patch
new file mode 100644
index 000000000000..aed1c4cd140a
--- /dev/null
+++ b/fix-broken-join.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <raphael@offensive-security.com>
+Date: Tue, 4 Feb 2020 12:35:11 +0100
+Subject: Fix broken join
+
+---
+ cpyrit/storage.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cpyrit/storage.py b/cpyrit/storage.py
+index 3933f62..dcf3a51 100644
+--- a/cpyrit/storage.py
++++ b/cpyrit/storage.py
+@@ -962,7 +962,10 @@ if 'sqlalchemy' in sys.modules:
+                 pwtotal = 0 if pwtotal is None else int(pwtotal)
+                 q = session.query(ESSID_DBObject.essid,
+                                   sql.func.sum(PAW2_DBObject.numElems))
+-                q = q.outerjoin(PYR2_DBObject).outerjoin(PAW2_DBObject)
++                q = q.outerjoin(PYR2_DBObject,
++                                PYR2_DBObject.essid_id==ESSID_DBObject.essid_id)
++                q = q.outerjoin(PAW2_DBObject,
++                                PAW2_DBObject.key==PYR2_DBObject.key)
+                 q = q.group_by(ESSID_DBObject.essid)
+                 essid_results = {}
+                 for essid, pwcount in q: