diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2019-11-05 01:02:49 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2019-11-05 01:02:49 +0000 |
| commit | d61eaac176844796ad13d0abbf748583f4de7b24 (patch) | |
| tree | 49a44efaab2afb8bcfa14023749e40724b3cb4f0 /net | |
| parent | 304f20ad3f80717efc1fc87ecabd19c0287a8381 (diff) | |
| download | pkgsrc-d61eaac176844796ad13d0abbf748583f4de7b24.tar.gz | |
scapy: add a fix for Python 2.7 builds
Diffstat (limited to 'net')
| -rw-r--r-- | net/scapy/Makefile | 3 | ||||
| -rw-r--r-- | net/scapy/distinfo | 3 | ||||
| -rw-r--r-- | net/scapy/patches/patch-scapy_tools_generate__ethertypes.py | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net/scapy/Makefile b/net/scapy/Makefile index aa506a82881..558cf767770 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -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} diff --git a/net/scapy/distinfo b/net/scapy/distinfo index 99de6bba4b4..5f329622612 100644 --- a/net/scapy/distinfo +++ b/net/scapy/distinfo @@ -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) = 09adbe98c2e129438833f1e1212c6ef276e197d0 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 diff --git a/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py b/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py new file mode 100644 index 00000000000..fe34ab697e0 --- /dev/null +++ b/net/scapy/patches/patch-scapy_tools_generate__ethertypes.py @@ -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 |