[arch-commits] Commit in pyrit/repos/community-x86_64 (5 files)

Antonio Rojas arojas at archlinux.org
Sat May 30 20:40:40 UTC 2020


    Date: Saturday, May 30, 2020 @ 20:40:39
  Author: arojas
Revision: 637524

archrelease: copy trunk to community-x86_64

Added:
  pyrit/repos/community-x86_64/PKGBUILD
    (from rev 637523, pyrit/trunk/PKGBUILD)
  pyrit/repos/community-x86_64/fix-broken-join.patch
    (from rev 637523, pyrit/trunk/fix-broken-join.patch)
  pyrit/repos/community-x86_64/scapy-2.3.2.patch
    (from rev 637523, pyrit/trunk/scapy-2.3.2.patch)
Deleted:
  pyrit/repos/community-x86_64/PKGBUILD
  pyrit/repos/community-x86_64/scapy-2.3.2.patch

-----------------------+
 PKGBUILD              |   95 ++++++++++++++++++++++++------------------------
 fix-broken-join.patch |   24 ++++++++++++
 scapy-2.3.2.patch     |   84 +++++++++++++++++++++---------------------
 3 files changed, 115 insertions(+), 88 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-30 20:40:13 UTC (rev 637523)
+++ PKGBUILD	2020-05-30 20:40:39 UTC (rev 637524)
@@ -1,46 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Fabian Melters <melters [at] gmail [dot] com>
-
-pkgname=pyrit
-_pkgname=Pyrit
-pkgver=0.5.0
-pkgrel=3
-pkgdesc='The famous WPA precomputed cracker'
-url='https://github.com/JPaulMora/Pyrit'
-arch=('x86_64')
-license=('GPL3')
-depends=('openssl' 'python2' 'zlib' 'libpcap')
-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)
-sha512sums=('912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25'
-            '99d4ae2159be2d829337f3481cbb6580da1c6a2d2b6b28c7ed17348daa983859b7cd6ba3ee8575cbcba16efa27bf230bac075599b1fa0b531178dbdc45f853b2')
-
-prepare() {
-  cd ${_pkgname}-${pkgver}
-  patch -p1 < "${srcdir}/scapy-2.3.2.patch"
-}
-
-build() {
-  cd ${_pkgname}-${pkgver}
-  python2 setup.py build
-}
-
-check() {
-  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
-}
-
-package() {
-  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:

Copied: pyrit/repos/community-x86_64/PKGBUILD (from rev 637523, pyrit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-30 20:40:39 UTC (rev 637524)
@@ -0,0 +1,49 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Fabian Melters <melters [at] gmail [dot] com>
+
+pkgname=pyrit
+_pkgname=Pyrit
+pkgver=0.5.0
+pkgrel=4
+pkgdesc='The famous WPA precomputed cracker'
+url='https://github.com/JPaulMora/Pyrit'
+arch=('x86_64')
+license=('GPL3')
+depends=('openssl' 'python2' 'zlib' 'libpcap')
+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
+        fix-broken-join.patch)
+sha512sums=('912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25'
+            '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() {
+  cd ${_pkgname}-${pkgver}
+  python2 setup.py build
+}
+
+check() {
+  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
+}
+
+package() {
+  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:

Copied: pyrit/repos/community-x86_64/fix-broken-join.patch (from rev 637523, pyrit/trunk/fix-broken-join.patch)
===================================================================
--- fix-broken-join.patch	                        (rev 0)
+++ fix-broken-join.patch	2020-05-30 20:40:39 UTC (rev 637524)
@@ -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:

Deleted: scapy-2.3.2.patch
===================================================================
--- scapy-2.3.2.patch	2020-05-30 20:40:13 UTC (rev 637523)
+++ scapy-2.3.2.patch	2020-05-30 20:40:39 UTC (rev 637524)
@@ -1,42 +0,0 @@
-From 14ec997174b8e8fd20d22b6a97c57e19633f12a0 Mon Sep 17 00:00:00 2001
-From: Ilya Terentyev <bacondropped at gmail.com>
-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

Copied: pyrit/repos/community-x86_64/scapy-2.3.2.patch (from rev 637523, pyrit/trunk/scapy-2.3.2.patch)
===================================================================
--- scapy-2.3.2.patch	                        (rev 0)
+++ scapy-2.3.2.patch	2020-05-30 20:40:39 UTC (rev 637524)
@@ -0,0 +1,42 @@
+From 14ec997174b8e8fd20d22b6a97c57e19633f12a0 Mon Sep 17 00:00:00 2001
+From: Ilya Terentyev <bacondropped at gmail.com>
+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


More information about the arch-commits mailing list