CVS commit: pkgsrc/net/scapy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/scapy
From: "David H. Gutteridge" <gutteridge%netbsd.org@localhost>
Date: Tue, 27 Apr 2021 21:53:11 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Apr 27 21:53:11 UTC 2021

Modified Files:
        pkgsrc/net/scapy: Makefile PLIST distinfo
        pkgsrc/net/scapy/patches: patch-ab patch-scapy_arch_bpf_supersocket.py
            patch-scapy_consts.py
Added Files:
        pkgsrc/net/scapy/patches: patch-test_run__tests

Log Message:
scapy: update to 2.4.5

Changelog
Core

    354 commits to master since v2.4.4, from 73 contributors
    Python 3.9 support
    New interfaces system. conf.iface is now an object (retro-compatible as a string) which contains additional information about the interface and allows for an automatic selection of the socket 
type. conf.ifaces now lists all available interfaces.
    Fix *BSD support. Improve filters handling on Linux and libpcap
    Automaton: support for STOP event - allows to cleanly end an Automata. Implemented in all Scapy's automatons
    [Deprecated] Naming different fields with the same name will now raise a deprecation warning. This behavior has never properly worked and should never be necessary
    Enhance Net and Net6
    Improvements to scapy's logging, colored output and to UTscapy
    Fix edge-cases with ConditionalField and MultipleTypeField to make them more resilient
    [Doc] Enhancements: improved MultipleTypeField handling, add view source.
    [Internal] Move the test suite to GitHub Actions
    [Internal] Unit test housekeeping
    [Internal] Begin type hinting

Layers

    6LoWPAN refactor
    TLS improvements (TLS 1.3 server downgrade, TLS 1.2 EXT MS...)
    HTTP improvements (http_request, support for zstd...)
    Refactor TunTap support
    Cleanup MACsec
    Many small bug fixes or improvements to layers (SMB2, BFD, DNS, Zigbee, EAP, HomeplugGP, DHCPv6, 802.11...)

Automotive

    Renaming of ENET to HSFZ
    Added XCP layer
    Added DoIP layer
    [Internal] Cleanup of interface preparation code in unit tests
    Renaming of ECU to Ecu
    Refactoring of EcuState class to be more versatile
    [Internal] Started with typing
    [Internal] Multiple minor cleanups
    Minor updates to the documentation


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/scapy/patches/patch-ab
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/scapy/patches/patch-scapy_consts.py
cvs rdiff -u -r0 -r1.1 pkgsrc/net/scapy/patches/patch-test_run__tests

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.34 pkgsrc/net/scapy/Makefile:1.35
--- pkgsrc/net/scapy/Makefile:1.34      Tue Mar 23 02:03:11 2021
+++ pkgsrc/net/scapy/Makefile   Tue Apr 27 21:53:11 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2021/03/23 02:03:11 gutteridge Exp $
+# $NetBSD: Makefile,v 1.35 2021/04/27 21:53:11 gutteridge Exp $
 
-DISTNAME=      scapy-2.4.4
-PKGREVISION=   1
+DISTNAME=      scapy-2.4.5
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,8 +12,6 @@ LICENSE=      gnu-gpl-v2
 
 NO_BUILD=      yes
 
-PYTHON_VERSIONS_ACCEPTED=      38 37 36 27 # 3.9 not officially supported yet
-
 INSTALLATION_DIRS+=    share/examples/scapy
 
 .include "options.mk"

Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.10 pkgsrc/net/scapy/PLIST:1.11
--- pkgsrc/net/scapy/PLIST:1.10 Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/PLIST      Tue Apr 27 21:53:11 2021
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2021/03/21 19:50:54 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/04/27 21:53:11 gutteridge Exp $
 bin/UTscapy
 bin/scapy
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/scapy-git_archive.dev95ba5b8504-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/entry_points.txt
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/not-zip-safe
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/requires.txt
+${PYSITELIB}/scapy-git_archive.dev8b63d73a17-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/scapy/__init__.py
 ${PYSITELIB}/scapy/__init__.pyc
 ${PYSITELIB}/scapy/__init__.pyo
@@ -38,12 +38,12 @@ ${PYSITELIB}/scapy/arch/bpf/supersocket.
 ${PYSITELIB}/scapy/arch/common.py
 ${PYSITELIB}/scapy/arch/common.pyc
 ${PYSITELIB}/scapy/arch/common.pyo
+${PYSITELIB}/scapy/arch/libpcap.py
+${PYSITELIB}/scapy/arch/libpcap.pyc
+${PYSITELIB}/scapy/arch/libpcap.pyo
 ${PYSITELIB}/scapy/arch/linux.py
 ${PYSITELIB}/scapy/arch/linux.pyc
 ${PYSITELIB}/scapy/arch/linux.pyo
-${PYSITELIB}/scapy/arch/pcapdnet.py
-${PYSITELIB}/scapy/arch/pcapdnet.pyc
-${PYSITELIB}/scapy/arch/pcapdnet.pyo
 ${PYSITELIB}/scapy/arch/solaris.py
 ${PYSITELIB}/scapy/arch/solaris.pyc
 ${PYSITELIB}/scapy/arch/solaris.pyo
@@ -116,12 +116,15 @@ ${PYSITELIB}/scapy/contrib/automotive/bm
 ${PYSITELIB}/scapy/contrib/automotive/bmw/definitions.py
 ${PYSITELIB}/scapy/contrib/automotive/bmw/definitions.pyc
 ${PYSITELIB}/scapy/contrib/automotive/bmw/definitions.pyo
-${PYSITELIB}/scapy/contrib/automotive/bmw/enet.py
-${PYSITELIB}/scapy/contrib/automotive/bmw/enet.pyc
-${PYSITELIB}/scapy/contrib/automotive/bmw/enet.pyo
+${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.py
+${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.pyc
+${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.pyo
 ${PYSITELIB}/scapy/contrib/automotive/ccp.py
 ${PYSITELIB}/scapy/contrib/automotive/ccp.pyc
 ${PYSITELIB}/scapy/contrib/automotive/ccp.pyo
+${PYSITELIB}/scapy/contrib/automotive/doip.py
+${PYSITELIB}/scapy/contrib/automotive/doip.pyc
+${PYSITELIB}/scapy/contrib/automotive/doip.pyo
 ${PYSITELIB}/scapy/contrib/automotive/ecu.py
 ${PYSITELIB}/scapy/contrib/automotive/ecu.pyc
 ${PYSITELIB}/scapy/contrib/automotive/ecu.pyo
@@ -134,9 +137,18 @@ ${PYSITELIB}/scapy/contrib/automotive/gm
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlan.py
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlan.pyc
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlan.pyo
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_ecu_states.py
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_ecu_states.pyc
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_ecu_states.pyo
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_logging.py
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_logging.pyc
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_logging.pyo
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlanutils.py
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlanutils.pyc
 ${PYSITELIB}/scapy/contrib/automotive/gm/gmlanutils.pyo
+${PYSITELIB}/scapy/contrib/automotive/graph.py
+${PYSITELIB}/scapy/contrib/automotive/graph.pyc
+${PYSITELIB}/scapy/contrib/automotive/graph.pyo
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyo
@@ -200,12 +212,36 @@ ${PYSITELIB}/scapy/contrib/automotive/so
 ${PYSITELIB}/scapy/contrib/automotive/uds.py
 ${PYSITELIB}/scapy/contrib/automotive/uds.pyc
 ${PYSITELIB}/scapy/contrib/automotive/uds.pyo
+${PYSITELIB}/scapy/contrib/automotive/uds_ecu_states.py
+${PYSITELIB}/scapy/contrib/automotive/uds_ecu_states.pyc
+${PYSITELIB}/scapy/contrib/automotive/uds_ecu_states.pyo
+${PYSITELIB}/scapy/contrib/automotive/uds_logging.py
+${PYSITELIB}/scapy/contrib/automotive/uds_logging.pyc
+${PYSITELIB}/scapy/contrib/automotive/uds_logging.pyo
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.pyo
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/definitions.py
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/definitions.pyc
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/definitions.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/__init__.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/__init__.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/__init__.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_master.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_master.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_master.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_slave.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_slave.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/cto_commands_slave.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/scanner.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/scanner.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/scanner.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/utils.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/utils.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/utils.pyo
+${PYSITELIB}/scapy/contrib/automotive/xcp/xcp.py
+${PYSITELIB}/scapy/contrib/automotive/xcp/xcp.pyc
+${PYSITELIB}/scapy/contrib/automotive/xcp/xcp.pyo
 ${PYSITELIB}/scapy/contrib/avs.py
 ${PYSITELIB}/scapy/contrib/avs.pyc
 ${PYSITELIB}/scapy/contrib/avs.pyo
@@ -383,6 +419,9 @@ ${PYSITELIB}/scapy/contrib/ospf.pyo
 ${PYSITELIB}/scapy/contrib/pfcp.py
 ${PYSITELIB}/scapy/contrib/pfcp.pyc
 ${PYSITELIB}/scapy/contrib/pfcp.pyo
+${PYSITELIB}/scapy/contrib/pim.py
+${PYSITELIB}/scapy/contrib/pim.pyc
+${PYSITELIB}/scapy/contrib/pim.pyo
 ${PYSITELIB}/scapy/contrib/pnio.py
 ${PYSITELIB}/scapy/contrib/pnio.pyc
 ${PYSITELIB}/scapy/contrib/pnio.pyo
@@ -491,6 +530,9 @@ ${PYSITELIB}/scapy/extlib.pyo
 ${PYSITELIB}/scapy/fields.py
 ${PYSITELIB}/scapy/fields.pyc
 ${PYSITELIB}/scapy/fields.pyo
+${PYSITELIB}/scapy/interfaces.py
+${PYSITELIB}/scapy/interfaces.pyc
+${PYSITELIB}/scapy/interfaces.pyo
 ${PYSITELIB}/scapy/layers/__init__.py
 ${PYSITELIB}/scapy/layers/__init__.pyc
 ${PYSITELIB}/scapy/layers/__init__.pyo
@@ -719,6 +761,9 @@ ${PYSITELIB}/scapy/layers/tls/session.py
 ${PYSITELIB}/scapy/layers/tls/tools.py
 ${PYSITELIB}/scapy/layers/tls/tools.pyc
 ${PYSITELIB}/scapy/layers/tls/tools.pyo
+${PYSITELIB}/scapy/layers/tuntap.py
+${PYSITELIB}/scapy/layers/tuntap.pyc
+${PYSITELIB}/scapy/layers/tuntap.pyo
 ${PYSITELIB}/scapy/layers/usb.py
 ${PYSITELIB}/scapy/layers/usb.pyc
 ${PYSITELIB}/scapy/layers/usb.pyo
@@ -821,6 +866,9 @@ ${PYSITELIB}/scapy/tools/automotive/isot
 ${PYSITELIB}/scapy/tools/automotive/obdscanner.py
 ${PYSITELIB}/scapy/tools/automotive/obdscanner.pyc
 ${PYSITELIB}/scapy/tools/automotive/obdscanner.pyo
+${PYSITELIB}/scapy/tools/automotive/xcpscanner.py
+${PYSITELIB}/scapy/tools/automotive/xcpscanner.pyc
+${PYSITELIB}/scapy/tools/automotive/xcpscanner.pyo
 ${PYSITELIB}/scapy/tools/check_asdis.py
 ${PYSITELIB}/scapy/tools/check_asdis.pyc
 ${PYSITELIB}/scapy/tools/check_asdis.pyo

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.13 pkgsrc/net/scapy/distinfo:1.14
--- pkgsrc/net/scapy/distinfo:1.13      Tue Mar 23 02:03:11 2021
+++ pkgsrc/net/scapy/distinfo   Tue Apr 27 21:53:11 2021
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.13 2021/03/23 02:03:11 gutteridge Exp $
+$NetBSD: distinfo,v 1.14 2021/04/27 21:53:11 gutteridge Exp $
 
-SHA1 (scapy-2.4.4.tar.gz) = 9bd34442e7feca4f37e928c7723d6180694f3bc8
-RMD160 (scapy-2.4.4.tar.gz) = 4269d7bde1d5e24f6ada49aa1fb467dee9c44495
-SHA512 (scapy-2.4.4.tar.gz) = d6078901839157b3f3d63c304f43f88a41b9bd2fb32cc917624c12fe822818d02256d6661b5076689c0f59c51e4ab35195ddf555f0d1f6df95faac1c646ee8c6
-Size (scapy-2.4.4.tar.gz) = 3240879 bytes
-SHA1 (patch-ab) = 08f606f7ab380a3a4d3d2bc7a2fbddfc6720b4f3
+SHA1 (scapy-2.4.5.tar.gz) = 28f3a240cbbb3b6df45e239be8fbf5fb138591f6
+RMD160 (scapy-2.4.5.tar.gz) = d0b23b55251802fab1f78e8e2f5170fc595d1a8e
+SHA512 (scapy-2.4.5.tar.gz) = b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
+Size (scapy-2.4.5.tar.gz) = 3323309 bytes
+SHA1 (patch-ab) = a0ef3c66ed5578e53d76ee38f6931be9c293baa5
 SHA1 (patch-ad) = bac7c72eff08608d4d73911a94bfc3125b8b53b6
-SHA1 (patch-scapy_arch_bpf_supersocket.py) = ad08376931780306a3b2a24747c344bd0086976b
-SHA1 (patch-scapy_consts.py) = 46da1b276299e1d98600ea477da8d19c1a78f3ef
+SHA1 (patch-scapy_arch_bpf_supersocket.py) = 4c11a8e9cd8212314cc3d881d906d83c893f1755
+SHA1 (patch-scapy_consts.py) = c897229e444d363e2aeea12cdd7264d3d275f4ab
+SHA1 (patch-test_run__tests) = 286b729ebfe82ba93820fee677446b04726318ff

Index: pkgsrc/net/scapy/patches/patch-ab
diff -u pkgsrc/net/scapy/patches/patch-ab:1.4 pkgsrc/net/scapy/patches/patch-ab:1.5
--- pkgsrc/net/scapy/patches/patch-ab:1.4       Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/patches/patch-ab   Tue Apr 27 21:53:11 2021
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.4 2021/03/21 19:50:54 gutteridge Exp $
+$NetBSD: patch-ab,v 1.5 2021/04/27 21:53:11 gutteridge Exp $
 
 Add DragonFly support.
 
---- scapy/arch/unix.py.orig    2020-09-02 11:26:21.000000000 +0000
+--- scapy/arch/unix.py.orig    2021-04-18 18:36:15.000000000 +0000
 +++ scapy/arch/unix.py
-@@ -14,7 +14,7 @@ import scapy.config
+@@ -13,7 +13,7 @@ import socket
+ import scapy.config
  import scapy.utils
- from scapy.arch import get_if_addr
  from scapy.config import conf
 -from scapy.consts import FREEBSD, NETBSD, OPENBSD, SOLARIS
 +from scapy.consts import FREEBSD, NETBSD, OPENBSD, SOLARIS, DRAGONFLY
- from scapy.error import warning, log_interactive
+ from scapy.error import log_runtime, warning
  from scapy.pton_ntop import inet_pton
  from scapy.utils6 import in6_getscope, construct_source_candidate_set
-@@ -48,7 +48,7 @@ def read_routes():
+@@ -57,7 +57,7 @@ def read_routes():
      """
      if SOLARIS:
          f = os.popen("netstat -rvn -f inet")
@@ -22,7 +22,7 @@ Add DragonFly support.
          f = os.popen("netstat -rnW -f inet")  # -W to show long interface names
      else:
          f = os.popen("netstat -rn -f inet")
-@@ -276,7 +276,7 @@ def read_routes6():
+@@ -291,7 +291,7 @@ def read_routes6():
              destination, next_hop, flags = splitted_line[:3]
              dev = splitted_line[index]
          else:

Index: pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
diff -u pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.3 pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.4
--- pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.3    Tue Mar 23 02:03:11 2021
+++ pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py        Tue Apr 27 21:53:11 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.3 2021/03/23 02:03:11 gutteridge Exp $
+$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.4 2021/04/27 21:53:11 gutteridge Exp $
 
 Add DragonFly support.
 Fix NetBSD 32-bit architecture alignment.
 
---- scapy/arch/bpf/supersocket.py.orig 2020-09-02 11:26:21.000000000 +0000
+--- scapy/arch/bpf/supersocket.py.orig 2021-04-18 18:36:15.000000000 +0000
 +++ scapy/arch/bpf/supersocket.py
-@@ -18,18 +18,16 @@ from scapy.arch.bpf.consts import BIOCGB
+@@ -18,7 +18,7 @@ from scapy.arch.bpf.consts import BIOCGB
      BIOCIMMEDIATE, BIOCPROMISC, BIOCSBLEN, BIOCSETIF, BIOCSHDRCMPLT, \
      BPF_BUFFER_LENGTH, BIOCSDLT, DLT_IEEE802_11_RADIO
  from scapy.config import conf
@@ -13,20 +13,21 @@ Fix NetBSD 32-bit architecture alignment
 +from scapy.consts import FREEBSD, NETBSD, DARWIN, DRAGONFLY
  from scapy.data import ETH_P_ALL
  from scapy.error import Scapy_Exception, warning
- from scapy.supersocket import SuperSocket
- from scapy.compat import raw
+ from scapy.interfaces import network_name
+@@ -27,10 +27,10 @@ from scapy.compat import raw
+ from scapy.layers.l2 import Loopback
  
  
 -if FREEBSD:
-+if FREEBSD or NETBSD or DRAGONFLY:
++if FREEBSD or NETBSD:
      # On 32bit architectures long might be 32bit.
      BPF_ALIGNMENT = sizeof(c_long)
 -elif NETBSD:
--    BPF_ALIGNMENT = 8  # sizeof(long)
++elif DRAGONFLY:
+     BPF_ALIGNMENT = 8  # sizeof(long)
  else:
      BPF_ALIGNMENT = 4  # sizeof(int32_t)
- 
-@@ -283,6 +281,9 @@ class L2bpfListenSocket(_L2bpfSocket):
+@@ -295,6 +295,9 @@ class L2bpfListenSocket(_L2bpfSocket):
                  bh_tstamp_offset = 16
          elif NETBSD:
              # struct bpf_hdr or struct bpf_hdr32

Index: pkgsrc/net/scapy/patches/patch-scapy_consts.py
diff -u pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.2 pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.3
--- pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.2  Sun Mar 21 19:50:54 2021
+++ pkgsrc/net/scapy/patches/patch-scapy_consts.py      Tue Apr 27 21:53:11 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-scapy_consts.py,v 1.2 2021/03/21 19:50:54 gutteridge Exp $
+$NetBSD: patch-scapy_consts.py,v 1.3 2021/04/27 21:53:11 gutteridge Exp $
 
 Add DragonFly support.
 
---- scapy/consts.py.orig       2020-09-02 11:26:21.000000000 +0000
+--- scapy/consts.py.orig       2021-04-18 18:36:15.000000000 +0000
 +++ scapy/consts.py
-@@ -14,7 +14,8 @@ DARWIN = platform.startswith("darwin")
+@@ -18,7 +18,8 @@ DARWIN = platform.startswith("darwin")
  SOLARIS = platform.startswith("sunos")
  WINDOWS = platform.startswith("win32")
  WINDOWS_XP = platform_lib.release() == "XP"
@@ -13,4 +13,4 @@ Add DragonFly support.
 +BSD = DARWIN or FREEBSD or OPENBSD or NETBSD or DRAGONFLY
  # See https://docs.python.org/3/library/platform.html#cross-platform
  IS_64BITS = maxsize > 2**32
- # LOOPBACK_NAME moved to conf.loopback_name
+ BIG_ENDIAN = byteorder == 'big'

Added files:

Index: pkgsrc/net/scapy/patches/patch-test_run__tests
diff -u /dev/null pkgsrc/net/scapy/patches/patch-test_run__tests:1.1
--- /dev/null   Tue Apr 27 21:53:11 2021
+++ pkgsrc/net/scapy/patches/patch-test_run__tests      Tue Apr 27 21:53:11 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-test_run__tests,v 1.1 2021/04/27 21:53:11 gutteridge Exp $
+
+Ensure command line arguments are passed to the test script.
+
+--- test/run_tests.orig        2021-04-18 18:36:15.000000000 +0000
++++ test/run_tests
+@@ -27,6 +27,8 @@ then
+     esac
+   done
+   PYTHON=${PYTHON:-python3}
++else
++  ARGS="$@"
+ fi
+ $PYTHON --version > /dev/null 2>&1
+ if [ ! $? -eq 0 ]

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index