[arch-commits] Commit in pyrit/trunk (PKGBUILD fix-broken-join.patch)
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
===
--- PKGBUILD2020-05-30 20:36:39 UTC (rev 637522)
+++ PKGBUILD2020-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?=
+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:
[arch-commits] Commit in pyrit/trunk (PKGBUILD)
Date: Sunday, March 25, 2018 @ 11:03:12
Author: bpiotrowski
Revision: 312558
0.5.0-3: remove external optdepends
Modified:
pyrit/trunk/PKGBUILD
--+
PKGBUILD |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-25 11:03:05 UTC (rev 312557)
+++ PKGBUILD2018-03-25 11:03:12 UTC (rev 312558)
@@ -4,7 +4,7 @@
pkgname=pyrit
_pkgname=Pyrit
pkgver=0.5.0
-pkgrel=2
+pkgrel=3
pkgdesc='The famous WPA precomputed cracker'
url='https://github.com/JPaulMora/Pyrit'
arch=('x86_64')
@@ -11,8 +11,6 @@
license=('GPL3')
depends=('openssl' 'python2' 'zlib' 'libpcap')
optdepends=(
- 'cpyrit-cuda: nvidia gpu support'
- 'cpyrit-opencl: opencl support'
'scapy: packet capture analyzation support'
'python2-sqlalchemy: storage support'
)
[arch-commits] Commit in pyrit/trunk (PKGBUILD)
Date: Thursday, March 16, 2017 @ 19:36:56
Author: jelle
Revision: 216797
upgpkg: pyrit 0.5.0-2
openssl 1.1.0 rebuild
Modified:
pyrit/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-16 19:30:24 UTC (rev 216796)
+++ PKGBUILD2017-03-16 19:36:56 UTC (rev 216797)
@@ -4,7 +4,7 @@
pkgname=pyrit
_pkgname=Pyrit
pkgver=0.5.0
-pkgrel=1
+pkgrel=2
pkgdesc='The famous WPA precomputed cracker'
url='https://github.com/JPaulMora/Pyrit'
arch=('i686' 'x86_64')
[arch-commits] Commit in pyrit/trunk (PKGBUILD scapy-2.3.2.patch)
Date: Sunday, November 13, 2016 @ 21:22:29
Author: anthraxx
Revision: 195535
upgpkg: pyrit 0.5.0-1
Added:
pyrit/trunk/scapy-2.3.2.patch
Modified:
pyrit/trunk/PKGBUILD
---+
PKGBUILD | 29 +++--
scapy-2.3.2.patch | 42 ++
2 files changed, 61 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-13 19:49:52 UTC (rev 195534)
+++ PKGBUILD2016-11-13 21:22:29 UTC (rev 195535)
@@ -2,10 +2,11 @@
# Contributor: Fabian Melters
pkgname=pyrit
-pkgver=0.4.0
-pkgrel=3
-pkgdesc="WPA/WPA2-PSK attacking with gpu and cluster"
-url="https://code.google.com/p/pyrit;
+_pkgname=Pyrit
+pkgver=0.5.0
+pkgrel=1
+pkgdesc='The famous WPA precomputed cracker'
+url='https://github.com/JPaulMora/Pyrit'
arch=('i686' 'x86_64')
license=('GPL3')
depends=('openssl' 'python2' 'zlib' 'libpcap')
@@ -16,16 +17,23 @@
'python2-sqlalchemy: storage support'
)
checkdepends=('python2-sqlalchemy' 'scapy')
-source=(${pkgname}-${pkgver}.tar.gz::https://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('8111b3f6f1a94319f5e146db6c184eb391c03ca554b20ea7227237afbc546a064898835ad16007333bb63aa725079046d413be11dfc3ecb76c77b6ac5096f7e9')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JPaulMora/Pyrit/archive/v${pkgver}.tar.gz
+scapy-2.3.2.patch)
+sha512sums=('912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25'
+
'99d4ae2159be2d829337f3481cbb6580da1c6a2d2b6b28c7ed17348daa983859b7cd6ba3ee8575cbcba16efa27bf230bac075599b1fa0b531178dbdc45f853b2')
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ patch -p1 < "${srcdir}/scapy-2.3.2.patch"
+}
+
build() {
- cd ${pkgname}-${pkgver}
+ cd ${_pkgname}-${pkgver}
python2 setup.py build
}
check() {
- cd ${pkgname}-${pkgver}/test
+ cd ${_pkgname}-${pkgver}/test
local PYTHONVERSION="$(python2 -c 'import sys;
print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')"
PYTHONPATH="../build/lib.linux-${CARCH}-${PYTHONVERSION}" \
python2 test_pyrit.py
@@ -32,8 +40,9 @@
}
package() {
- cd ${pkgname}-${pkgver}
- python2 setup.py install -O1 --root="${pkgdir}"
+ cd ${_pkgname}-${pkgver}
+ python2 setup.py install -O1 --root="${pkgdir}" --skip-build
+ install -Dm 644 README.md CHANGELOG -t "${pkgdir}/usr/share/doc/${pkgname}"
}
# vim: ts=2 sw=2 et:
Added: scapy-2.3.2.patch
===
--- scapy-2.3.2.patch (rev 0)
+++ scapy-2.3.2.patch 2016-11-13 21:22:29 UTC (rev 195535)
@@ -0,0 +1,42 @@
+From 14ec997174b8e8fd20d22b6a97c57e19633f12a0 Mon Sep 17 00:00:00 2001
+From: Ilya Terentyev
+Date: Tue, 1 Nov 2016 20:40:15 +0300
+Subject: [PATCH] update isinstance(EnumField) for scapy 2.3.3+
+
+scapy 2.3.2- requires that scapy.fields.EnumField is passed to
+isinstance, while scapy 2.3.3+ needs scapy.fields._EnumField.
+This patch accomodates pyrit for both versions.
+Fixes #500.
+---
+ cpyrit/pckttools.py | 13 -
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/cpyrit/pckttools.py b/cpyrit/pckttools.py
+index 326829d..d58fff1 100644
+--- a/cpyrit/pckttools.py
b/cpyrit/pckttools.py
+@@ -54,12 +54,23 @@
+ scapy.layers.dot11.PrismHeader)
+
+
++def isEnumField(f):
++"""Return True if f is an instance of EnumField. This function tries to
be
++ portable: scapy versions 2.3.2 and earlier need isinstance(EnumField),
++ while scapy 2.3.3+ requires isinstance(_EnumField).
++"""
++try:
++return isinstance(f, scapy.fields._EnumField)
++except AttributeError:
++return isinstance(f, scapy.fields.EnumField)
++
++
+ def isFlagSet(self, name, value):
+ """Return True if the given field 'includes' the given value.
+Exact behaviour of this function is specific to the field-type.
+ """
+ field, val = self.getfield_and_val(name)
+-if isinstance(field, scapy.fields.EnumField):
++if isEnumField(field):
+ if val not in field.i2s:
+ return False
+ return field.i2s[val] == value
