[arch-commits] Commit in pyrit/trunk (PKGBUILD fix-broken-join.patch)

[Antonio Rojas]

    Date: Saturday, May 30, 2020 @ 20:40:13
  Author: arojas
Revision: 637523

BUILDINFO rebuild

Added:
  pyrit/trunk/fix-broken-join.patch
Modified:
  pyrit/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 fix-broken-join.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 20:36:39 UTC (rev 637522)
+++ PKGBUILD	2020-05-30 20:40:13 UTC (rev 637523)
@@ -4,7 +4,7 @@
 pkgname=pyrit
 _pkgname=Pyrit
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc='The famous WPA precomputed cracker'
 url='https://github.com/JPaulMora/Pyrit'
 arch=('x86_64')
@@ -16,13 +16,16 @@
 )
 checkdepends=('python2-sqlalchemy' 'scapy')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JPaulMora/Pyrit/archive/v${pkgver}.tar.gz
-        scapy-2.3.2.patch)
+        scapy-2.3.2.patch
+        fix-broken-join.patch)
 sha512sums=('912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25'
-            '99d4ae2159be2d829337f3481cbb6580da1c6a2d2b6b28c7ed17348daa983859b7cd6ba3ee8575cbcba16efa27bf230bac075599b1fa0b531178dbdc45f853b2')
+            '99d4ae2159be2d829337f3481cbb6580da1c6a2d2b6b28c7ed17348daa983859b7cd6ba3ee8575cbcba16efa27bf230bac075599b1fa0b531178dbdc45f853b2'
+            '4a8d868a4adc94d5c6dd3c467572edd49efe0e0f4b0ea61ccfe830499e7cdedb0da81b27166caac23332fe90505fe0bbcfb67e61fde632cd58ce290e46426d67')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
   patch -p1 < "${srcdir}/scapy-2.3.2.patch"
+  patch -p1 -i ../fix-broken-join.patch # Fix tests (Debian)
 }
 
 build() {

Added: fix-broken-join.patch
===================================================================
--- fix-broken-join.patch	                        (rev 0)
+++ fix-broken-join.patch	2020-05-30 20:40:13 UTC (rev 637523)
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <raphael at 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: