CVS commit: pkgsrc/net/scapy

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Nov  5 01:02:50 UTC 2019

Modified Files:
        pkgsrc/net/scapy: Makefile distinfo
Added Files:
        pkgsrc/net/scapy/patches: patch-scapy_tools_generate__ethertypes.py

Log Message:
scapy: add a fix for Python 2.7 builds


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/scapy/Makefile
diff -u pkgsrc/net/scapy/Makefile:1.30 pkgsrc/net/scapy/Makefile:1.31
--- pkgsrc/net/scapy/Makefile:1.30      Mon Nov  4 05:48:26 2019
+++ pkgsrc/net/scapy/Makefile   Tue Nov  5 01:02:49 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2019/11/04 05:48:26 gutteridge Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/05 01:02:49 gutteridge Exp $
 
 DISTNAME=      scapy-2.4.3
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.10 pkgsrc/net/scapy/distinfo:1.11
--- pkgsrc/net/scapy/distinfo:1.10      Mon Nov  4 05:48:26 2019
+++ pkgsrc/net/scapy/distinfo   Tue Nov  5 01:02:49 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2019/11/04 05:48:26 gutteridge Exp $
+$NetBSD: distinfo,v 1.11 2019/11/05 01:02:49 gutteridge Exp $
 
 SHA1 (scapy-2.4.3.tar.gz) = 62dfd58a8e3799f083a157209b8b0902f53e76f0
 RMD160 (scapy-2.4.3.tar.gz) = fee72af411c6b42961feb6f46ad5ba7e8c0c426b
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 09adbe98c2e129438833f1
 SHA1 (patch-ad) = bac7c72eff08608d4d73911a94bfc3125b8b53b6
 SHA1 (patch-scapy_arch_bpf_supersocket.py) = d1850020a54799155e8046de0994d7df821c6046
 SHA1 (patch-scapy_consts.py) = 3495fc2716b78bf0689f2eb8d1095c746d9700e3
+SHA1 (patch-scapy_tools_generate__ethertypes.py) = 1222be8736cadf5c6148cd7a24584177bb522446

Added files:

Index: pkgsrc/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py
diff -u /dev/null pkgsrc/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py:1.1
--- /dev/null   Tue Nov  5 01:02:50 2019
+++ pkgsrc/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py  Tue Nov  5 01:02:49 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-scapy_tools_generate__ethertypes.py,v 1.1 2019/11/05 01:02:49 gutteridge Exp $
+
+Fix order of Python string prefix flags, so this works with 2.7.
+
+--- scapy/tools/generate_ethertypes.py.orig    2019-08-04 16:12:30.000000000 +0000
++++ scapy/tools/generate_ethertypes.py
+@@ -20,7 +20,7 @@ URL = "https://raw.githubusercontent.com
+ with urllib.request.urlopen(URL) as stream:
+     DATA = stream.read()
+ 
+-reg = rb".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/"
++reg = br".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/"
+ COMPILED = b"""#
+ # Ethernet frame types
+ #       This file describes some of the various Ethernet