From 34ef0c43db6f6073a5dfff617055baea9ec9c5f0 Mon Sep 17 00:00:00 2001 From: rpmbuild Date: Sep 26 2019 18:04:12 +0000 Subject: bump to 2.4.3 --- diff --git a/scapy-2.4.3-ethertypes.patch b/scapy-2.4.3-ethertypes.patch new file mode 100644 index 0000000..c61a1a2 --- /dev/null +++ b/scapy-2.4.3-ethertypes.patch @@ -0,0 +1,23 @@ +https://github.com/secdev/scapy/commit/0c3d5e417bbd923c4729d15572c3d693d58aff81.patch +From 0c3d5e417bbd923c4729d15572c3d693d58aff81 Mon Sep 17 00:00:00 2001 +From: Gabriel +Date: Wed, 21 Aug 2019 18:18:14 +0800 +Subject: [PATCH] Small Python 2 fix + +--- + scapy/tools/generate_ethertypes.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scapy/tools/generate_ethertypes.py b/scapy/tools/generate_ethertypes.py +index 5bc5cdf98..47c38c4f9 100644 +--- a/scapy/tools/generate_ethertypes.py ++++ b/scapy/tools/generate_ethertypes.py +@@ -20,7 +20,7 @@ + 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