--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package pyrit
RC bug fixed (FTBFS). Trivial upstream patch
unblock pyrit/0.4.0-7.1
thanks
G.
diff -Nru pyrit-0.4.0/debian/changelog pyrit-0.4.0/debian/changelog
--- pyrit-0.4.0/debian/changelog 2016-04-17 16:31:10.000000000 +0200
+++ pyrit-0.4.0/debian/changelog 2017-02-14 10:28:20.000000000 +0100
@@ -1,3 +1,12 @@
+pyrit (0.4.0-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ Sophie Brun ]
+ * debian/patches/update-for-scapy-2.3.3.patch:
+ - fix build failure with new python-scapy (Closes: #850692)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 14 Feb 2017 10:27:30 +0100
+
pyrit (0.4.0-7) unstable; urgency=medium
* d/control:
diff -Nru pyrit-0.4.0/debian/patches/series pyrit-0.4.0/debian/patches/series
--- pyrit-0.4.0/debian/patches/series 2016-03-21 22:33:10.000000000 +0100
+++ pyrit-0.4.0/debian/patches/series 2017-02-14 10:27:30.000000000 +0100
@@ -1,3 +1,4 @@
0006-custom-config-file.patch
0014-performancecounter-handle-empty-result-gracefully.patch
0015-increase-timeout-in-unittests.patch
+update-for-scapy-2.3.3.patch
diff -Nru pyrit-0.4.0/debian/patches/update-for-scapy-2.3.3.patch pyrit-0.4.0/debian/patches/update-for-scapy-2.3.3.patch
--- pyrit-0.4.0/debian/patches/update-for-scapy-2.3.3.patch 1970-01-01 01:00:00.000000000 +0100
+++ pyrit-0.4.0/debian/patches/update-for-scapy-2.3.3.patch 2017-02-14 10:35:17.000000000 +0100
@@ -0,0 +1,45 @@
+Subject: 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.
+Author: Ilya Terentyev <bacondropped@gmail.com>
+Origin: https://github.com/JPaulMora/Pyrit/commit/14ec997174b8e8fd20d22b6a97c57e19633f12a0
+Bug: https://github.com/JPaulMora/Pyrit/issues/500
+Bug-Kali: https://bugs.kali.org/view.php?id=3801
+Date: Tue, 1 Nov 2016 20:40:15 +0300
+Forwarded: not-needed
+Last-Update: 2017-01-06
+
+---
+ 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
--- End Message ---