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, 17 Jan 2023 01:33:17 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Jan 17 01:33:17 UTC 2023

Modified Files:
        pkgsrc/net/scapy: Makefile PLIST distinfo
        pkgsrc/net/scapy/patches: patch-ab patch-ad
            patch-scapy_arch_bpf_supersocket.py
Removed Files:
        pkgsrc/net/scapy/patches: patch-test_bpf.uts patch-test_run__tests

Log Message:
scapy: update to 2.5.0

Changelog

Scapy v2.5.0 is the last version to support Python 2.7
Main Changes

    Type hinting of Scapy core: Scapy now provides type hintings for all of its core
    Python 3.9 and 3.10 support
    macOS 10.15 support
    update built-in dependencies (six) + and our cryptography imports that created warnings
    fix sniffing performance issues with 2.4.4+ on Windows
    greatly improve BPF (macOS) support (timestamps...)
    enhanced loopback interface support on Linux, *BSD, and Windows
    SPDX License identifiers added
    several major CLI improvements, especially in autocompletion: you can now auto-complete the names for all Scapy fields, automatons, answering machines thanks to signature injection (and patches 
in IPython/bpython)

Core

    improved support of BPF
    support pcapng writing, comments, TLS secrets decryption block
    Re-work how sent_time is shared across packets iterators
    support new LINUX_SLL2 packet type (new tcpdump versions)
    pipes: performances issues fixed
    tools: fixes to hexdiff, lhex...
    [breaking] FlagsField in dict mode now uses values instead of offsets

Layers

    new layers related to Windows: DCERPC/NTLM/KERBEROS/GSSAPI/SPNEGO/(C)LDAP.
    new contrib layers: ESMC/RTPS/RTPC/metawatch
    rework Netbios/SMB1/SMB2, basic SMB clients & server, ntlm relay
    several fixes to the TLS implementation
    major zigbee/6lowpan improvements
    bug fixes in TLS: properly support FFDH, fix the TLS 1.3 notebooks... among other things
    p0f module update
    IPsec: fixes, x25519 support...
    various updates to the ASN.1 engine
    IKEv2: fixes, UDP encapsulation
    STUN support
    Postgres line protocol 3.0 support
    EDNS0 client subnet support
    ESMC protocol added
    support TCP-MD5 and TCP-AO options
    ERF Ethernet Support
    many fixes: modbus, 802.11, BTLE, SCTP, DNS, LLDP, Kerberos, RTPS, DHCP, MQTT, BGP, L2TP...

Automotive

    ISOTPSoftSocket: Bug fixes and performance improvements
    Documentation and API-Doc improvements
    Unit-Test speedups for Scanners
    IPv6 support for DoIP
    Bugfixes for DoIP
    Unit-Test cleanups
    UDS-, GMLAN- and OBD-Scanner refactoring
    CANFD support

Misc

    new sanity rules prevent fields from having the same name in all packets
        Currently displays a warning but will become a SyntaxError in the future!
    archives of the Scapy repo should now have more consistent hashes


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/scapy/patches/patch-ab \
    pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/scapy/patches/patch-ad
cvs rdiff -u -r1.1 -r0 pkgsrc/net/scapy/patches/patch-test_bpf.uts
cvs rdiff -u -r1.2 -r0 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.40 pkgsrc/net/scapy/Makefile:1.41
--- pkgsrc/net/scapy/Makefile:1.40      Thu Jun 30 11:18:43 2022
+++ pkgsrc/net/scapy/Makefile   Tue Jan 17 01:33:17 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2022/06/30 11:18:43 nia Exp $
+# $NetBSD: Makefile,v 1.41 2023/01/17 01:33:17 gutteridge Exp $
 
-DISTNAME=      scapy-2.4.5
-PKGREVISION=   4
+DISTNAME=      scapy-2.5.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.11 pkgsrc/net/scapy/PLIST:1.12
--- pkgsrc/net/scapy/PLIST:1.11 Tue Apr 27 21:53:11 2021
+++ pkgsrc/net/scapy/PLIST      Tue Jan 17 01:33:17 2023
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.11 2021/04/27 21:53:11 gutteridge Exp $
-bin/UTscapy
+@comment $NetBSD: PLIST,v 1.12 2023/01/17 01:33:17 gutteridge Exp $
 bin/scapy
-${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}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/scapy/__init__.py
 ${PYSITELIB}/scapy/__init__.pyc
 ${PYSITELIB}/scapy/__init__.pyo
@@ -116,6 +115,9 @@ ${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/enumerator.py
+${PYSITELIB}/scapy/contrib/automotive/bmw/enumerator.pyc
+${PYSITELIB}/scapy/contrib/automotive/bmw/enumerator.pyo
 ${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.py
 ${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.pyc
 ${PYSITELIB}/scapy/contrib/automotive/bmw/hsfz.pyo
@@ -128,9 +130,6 @@ ${PYSITELIB}/scapy/contrib/automotive/do
 ${PYSITELIB}/scapy/contrib/automotive/ecu.py
 ${PYSITELIB}/scapy/contrib/automotive/ecu.pyc
 ${PYSITELIB}/scapy/contrib/automotive/ecu.pyo
-${PYSITELIB}/scapy/contrib/automotive/enumerator.py
-${PYSITELIB}/scapy/contrib/automotive/enumerator.pyc
-${PYSITELIB}/scapy/contrib/automotive/enumerator.pyo
 ${PYSITELIB}/scapy/contrib/automotive/gm/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/gm/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/gm/__init__.pyo
@@ -143,12 +142,15 @@ ${PYSITELIB}/scapy/contrib/automotive/gm
 ${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/gmlan_scanner.py
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_scanner.pyc
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlan_scanner.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/kwp.py
+${PYSITELIB}/scapy/contrib/automotive/kwp.pyc
+${PYSITELIB}/scapy/contrib/automotive/kwp.pyo
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyo
@@ -206,6 +208,27 @@ ${PYSITELIB}/scapy/contrib/automotive/ob
 ${PYSITELIB}/scapy/contrib/automotive/obd/tid/tids.py
 ${PYSITELIB}/scapy/contrib/automotive/obd/tid/tids.pyc
 ${PYSITELIB}/scapy/contrib/automotive/obd/tid/tids.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/__init__.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/__init__.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/__init__.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/configuration.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/configuration.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/configuration.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/enumerator.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/enumerator.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/enumerator.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/executor.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/executor.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/executor.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/graph.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/graph.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/graph.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/staged_test_case.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/staged_test_case.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/staged_test_case.pyo
+${PYSITELIB}/scapy/contrib/automotive/scanner/test_case.py
+${PYSITELIB}/scapy/contrib/automotive/scanner/test_case.pyc
+${PYSITELIB}/scapy/contrib/automotive/scanner/test_case.pyo
 ${PYSITELIB}/scapy/contrib/automotive/someip.py
 ${PYSITELIB}/scapy/contrib/automotive/someip.pyc
 ${PYSITELIB}/scapy/contrib/automotive/someip.pyo
@@ -218,6 +241,9 @@ ${PYSITELIB}/scapy/contrib/automotive/ud
 ${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/uds_scan.py
+${PYSITELIB}/scapy/contrib/automotive/uds_scan.pyc
+${PYSITELIB}/scapy/contrib/automotive/uds_scan.pyo
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/volkswagen/__init__.pyo
@@ -281,9 +307,6 @@ ${PYSITELIB}/scapy/contrib/coap.pyo
 ${PYSITELIB}/scapy/contrib/concox.py
 ${PYSITELIB}/scapy/contrib/concox.pyc
 ${PYSITELIB}/scapy/contrib/concox.pyo
-${PYSITELIB}/scapy/contrib/dce_rpc.py
-${PYSITELIB}/scapy/contrib/dce_rpc.pyc
-${PYSITELIB}/scapy/contrib/dce_rpc.pyo
 ${PYSITELIB}/scapy/contrib/diameter.py
 ${PYSITELIB}/scapy/contrib/diameter.pyc
 ${PYSITELIB}/scapy/contrib/diameter.pyo
@@ -302,6 +325,9 @@ ${PYSITELIB}/scapy/contrib/enipTCP.pyo
 ${PYSITELIB}/scapy/contrib/erspan.py
 ${PYSITELIB}/scapy/contrib/erspan.pyc
 ${PYSITELIB}/scapy/contrib/erspan.pyo
+${PYSITELIB}/scapy/contrib/esmc.py
+${PYSITELIB}/scapy/contrib/esmc.pyc
+${PYSITELIB}/scapy/contrib/esmc.pyo
 ${PYSITELIB}/scapy/contrib/ethercat.py
 ${PYSITELIB}/scapy/contrib/ethercat.pyc
 ${PYSITELIB}/scapy/contrib/ethercat.pyo
@@ -320,6 +346,9 @@ ${PYSITELIB}/scapy/contrib/gtp.pyo
 ${PYSITELIB}/scapy/contrib/gtp_v2.py
 ${PYSITELIB}/scapy/contrib/gtp_v2.pyc
 ${PYSITELIB}/scapy/contrib/gtp_v2.pyo
+${PYSITELIB}/scapy/contrib/gxrp.py
+${PYSITELIB}/scapy/contrib/gxrp.pyc
+${PYSITELIB}/scapy/contrib/gxrp.pyo
 ${PYSITELIB}/scapy/contrib/homeplugav.py
 ${PYSITELIB}/scapy/contrib/homeplugav.pyc
 ${PYSITELIB}/scapy/contrib/homeplugav.pyo
@@ -353,9 +382,27 @@ ${PYSITELIB}/scapy/contrib/ikev2.pyo
 ${PYSITELIB}/scapy/contrib/isis.py
 ${PYSITELIB}/scapy/contrib/isis.pyc
 ${PYSITELIB}/scapy/contrib/isis.pyo
-${PYSITELIB}/scapy/contrib/isotp.py
-${PYSITELIB}/scapy/contrib/isotp.pyc
-${PYSITELIB}/scapy/contrib/isotp.pyo
+${PYSITELIB}/scapy/contrib/isotp/__init__.py
+${PYSITELIB}/scapy/contrib/isotp/__init__.pyc
+${PYSITELIB}/scapy/contrib/isotp/__init__.pyo
+${PYSITELIB}/scapy/contrib/isotp/isotp_native_socket.py
+${PYSITELIB}/scapy/contrib/isotp/isotp_native_socket.pyc
+${PYSITELIB}/scapy/contrib/isotp/isotp_native_socket.pyo
+${PYSITELIB}/scapy/contrib/isotp/isotp_packet.py
+${PYSITELIB}/scapy/contrib/isotp/isotp_packet.pyc
+${PYSITELIB}/scapy/contrib/isotp/isotp_packet.pyo
+${PYSITELIB}/scapy/contrib/isotp/isotp_scanner.py
+${PYSITELIB}/scapy/contrib/isotp/isotp_scanner.pyc
+${PYSITELIB}/scapy/contrib/isotp/isotp_scanner.pyo
+${PYSITELIB}/scapy/contrib/isotp/isotp_soft_socket.py
+${PYSITELIB}/scapy/contrib/isotp/isotp_soft_socket.pyc
+${PYSITELIB}/scapy/contrib/isotp/isotp_soft_socket.pyo
+${PYSITELIB}/scapy/contrib/isotp/isotp_utils.py
+${PYSITELIB}/scapy/contrib/isotp/isotp_utils.pyc
+${PYSITELIB}/scapy/contrib/isotp/isotp_utils.pyo
+${PYSITELIB}/scapy/contrib/knx.py
+${PYSITELIB}/scapy/contrib/knx.pyc
+${PYSITELIB}/scapy/contrib/knx.pyo
 ${PYSITELIB}/scapy/contrib/lacp.py
 ${PYSITELIB}/scapy/contrib/lacp.pyc
 ${PYSITELIB}/scapy/contrib/lacp.pyo
@@ -377,6 +424,9 @@ ${PYSITELIB}/scapy/contrib/mac_control.p
 ${PYSITELIB}/scapy/contrib/macsec.py
 ${PYSITELIB}/scapy/contrib/macsec.pyc
 ${PYSITELIB}/scapy/contrib/macsec.pyo
+${PYSITELIB}/scapy/contrib/metawatch.py
+${PYSITELIB}/scapy/contrib/metawatch.pyc
+${PYSITELIB}/scapy/contrib/metawatch.pyo
 ${PYSITELIB}/scapy/contrib/modbus.py
 ${PYSITELIB}/scapy/contrib/modbus.pyc
 ${PYSITELIB}/scapy/contrib/modbus.pyo
@@ -434,6 +484,9 @@ ${PYSITELIB}/scapy/contrib/pnio_rpc.pyo
 ${PYSITELIB}/scapy/contrib/portmap.py
 ${PYSITELIB}/scapy/contrib/portmap.pyc
 ${PYSITELIB}/scapy/contrib/portmap.pyo
+${PYSITELIB}/scapy/contrib/postgres.py
+${PYSITELIB}/scapy/contrib/postgres.pyc
+${PYSITELIB}/scapy/contrib/postgres.pyo
 ${PYSITELIB}/scapy/contrib/ppi_cace.py
 ${PYSITELIB}/scapy/contrib/ppi_cace.pyc
 ${PYSITELIB}/scapy/contrib/ppi_cace.pyo
@@ -455,6 +508,21 @@ ${PYSITELIB}/scapy/contrib/rpl_metrics.p
 ${PYSITELIB}/scapy/contrib/rsvp.py
 ${PYSITELIB}/scapy/contrib/rsvp.pyc
 ${PYSITELIB}/scapy/contrib/rsvp.pyo
+${PYSITELIB}/scapy/contrib/rtcp.py
+${PYSITELIB}/scapy/contrib/rtcp.pyc
+${PYSITELIB}/scapy/contrib/rtcp.pyo
+${PYSITELIB}/scapy/contrib/rtps/__init__.py
+${PYSITELIB}/scapy/contrib/rtps/__init__.pyc
+${PYSITELIB}/scapy/contrib/rtps/__init__.pyo
+${PYSITELIB}/scapy/contrib/rtps/common_types.py
+${PYSITELIB}/scapy/contrib/rtps/common_types.pyc
+${PYSITELIB}/scapy/contrib/rtps/common_types.pyo
+${PYSITELIB}/scapy/contrib/rtps/pid_types.py
+${PYSITELIB}/scapy/contrib/rtps/pid_types.pyc
+${PYSITELIB}/scapy/contrib/rtps/pid_types.pyo
+${PYSITELIB}/scapy/contrib/rtps/rtps.py
+${PYSITELIB}/scapy/contrib/rtps/rtps.pyc
+${PYSITELIB}/scapy/contrib/rtps/rtps.pyo
 ${PYSITELIB}/scapy/contrib/rtr.py
 ${PYSITELIB}/scapy/contrib/rtr.pyc
 ${PYSITELIB}/scapy/contrib/rtr.pyo
@@ -488,15 +556,27 @@ ${PYSITELIB}/scapy/contrib/send.pyo
 ${PYSITELIB}/scapy/contrib/skinny.py
 ${PYSITELIB}/scapy/contrib/skinny.pyc
 ${PYSITELIB}/scapy/contrib/skinny.pyo
+${PYSITELIB}/scapy/contrib/slowprot.py
+${PYSITELIB}/scapy/contrib/slowprot.pyc
+${PYSITELIB}/scapy/contrib/slowprot.pyo
 ${PYSITELIB}/scapy/contrib/socks.py
 ${PYSITELIB}/scapy/contrib/socks.pyc
 ${PYSITELIB}/scapy/contrib/socks.pyo
 ${PYSITELIB}/scapy/contrib/spbm.py
 ${PYSITELIB}/scapy/contrib/spbm.pyc
 ${PYSITELIB}/scapy/contrib/spbm.pyo
+${PYSITELIB}/scapy/contrib/stamp.py
+${PYSITELIB}/scapy/contrib/stamp.pyc
+${PYSITELIB}/scapy/contrib/stamp.pyo
+${PYSITELIB}/scapy/contrib/stun.py
+${PYSITELIB}/scapy/contrib/stun.pyc
+${PYSITELIB}/scapy/contrib/stun.pyo
 ${PYSITELIB}/scapy/contrib/tacacs.py
 ${PYSITELIB}/scapy/contrib/tacacs.pyc
 ${PYSITELIB}/scapy/contrib/tacacs.pyo
+${PYSITELIB}/scapy/contrib/tcpao.py
+${PYSITELIB}/scapy/contrib/tcpao.pyc
+${PYSITELIB}/scapy/contrib/tcpao.pyo
 ${PYSITELIB}/scapy/contrib/tzsp.py
 ${PYSITELIB}/scapy/contrib/tzsp.pyc
 ${PYSITELIB}/scapy/contrib/tzsp.pyo
@@ -524,9 +604,6 @@ ${PYSITELIB}/scapy/data.pyo
 ${PYSITELIB}/scapy/error.py
 ${PYSITELIB}/scapy/error.pyc
 ${PYSITELIB}/scapy/error.pyo
-${PYSITELIB}/scapy/extlib.py
-${PYSITELIB}/scapy/extlib.pyc
-${PYSITELIB}/scapy/extlib.pyo
 ${PYSITELIB}/scapy/fields.py
 ${PYSITELIB}/scapy/fields.pyc
 ${PYSITELIB}/scapy/fields.pyo
@@ -551,6 +628,9 @@ ${PYSITELIB}/scapy/layers/can.pyo
 ${PYSITELIB}/scapy/layers/clns.py
 ${PYSITELIB}/scapy/layers/clns.pyc
 ${PYSITELIB}/scapy/layers/clns.pyo
+${PYSITELIB}/scapy/layers/dcerpc.py
+${PYSITELIB}/scapy/layers/dcerpc.pyc
+${PYSITELIB}/scapy/layers/dcerpc.pyo
 ${PYSITELIB}/scapy/layers/dhcp.py
 ${PYSITELIB}/scapy/layers/dhcp.pyc
 ${PYSITELIB}/scapy/layers/dhcp.pyo
@@ -572,6 +652,9 @@ ${PYSITELIB}/scapy/layers/eap.pyo
 ${PYSITELIB}/scapy/layers/gprs.py
 ${PYSITELIB}/scapy/layers/gprs.pyc
 ${PYSITELIB}/scapy/layers/gprs.pyo
+${PYSITELIB}/scapy/layers/gssapi.py
+${PYSITELIB}/scapy/layers/gssapi.pyc
+${PYSITELIB}/scapy/layers/gssapi.pyo
 ${PYSITELIB}/scapy/layers/hsrp.py
 ${PYSITELIB}/scapy/layers/hsrp.pyc
 ${PYSITELIB}/scapy/layers/hsrp.pyo
@@ -593,12 +676,18 @@ ${PYSITELIB}/scapy/layers/ir.pyo
 ${PYSITELIB}/scapy/layers/isakmp.py
 ${PYSITELIB}/scapy/layers/isakmp.pyc
 ${PYSITELIB}/scapy/layers/isakmp.pyo
+${PYSITELIB}/scapy/layers/kerberos.py
+${PYSITELIB}/scapy/layers/kerberos.pyc
+${PYSITELIB}/scapy/layers/kerberos.pyo
 ${PYSITELIB}/scapy/layers/l2.py
 ${PYSITELIB}/scapy/layers/l2.pyc
 ${PYSITELIB}/scapy/layers/l2.pyo
 ${PYSITELIB}/scapy/layers/l2tp.py
 ${PYSITELIB}/scapy/layers/l2tp.pyc
 ${PYSITELIB}/scapy/layers/l2tp.pyo
+${PYSITELIB}/scapy/layers/ldap.py
+${PYSITELIB}/scapy/layers/ldap.pyc
+${PYSITELIB}/scapy/layers/ldap.pyo
 ${PYSITELIB}/scapy/layers/llmnr.py
 ${PYSITELIB}/scapy/layers/llmnr.pyc
 ${PYSITELIB}/scapy/layers/llmnr.pyo
@@ -611,12 +700,18 @@ ${PYSITELIB}/scapy/layers/mgcp.pyo
 ${PYSITELIB}/scapy/layers/mobileip.py
 ${PYSITELIB}/scapy/layers/mobileip.pyc
 ${PYSITELIB}/scapy/layers/mobileip.pyo
+${PYSITELIB}/scapy/layers/mspac.py
+${PYSITELIB}/scapy/layers/mspac.pyc
+${PYSITELIB}/scapy/layers/mspac.pyo
 ${PYSITELIB}/scapy/layers/netbios.py
 ${PYSITELIB}/scapy/layers/netbios.pyc
 ${PYSITELIB}/scapy/layers/netbios.pyo
 ${PYSITELIB}/scapy/layers/netflow.py
 ${PYSITELIB}/scapy/layers/netflow.pyc
 ${PYSITELIB}/scapy/layers/netflow.pyo
+${PYSITELIB}/scapy/layers/ntlm.py
+${PYSITELIB}/scapy/layers/ntlm.pyc
+${PYSITELIB}/scapy/layers/ntlm.pyo
 ${PYSITELIB}/scapy/layers/ntp.py
 ${PYSITELIB}/scapy/layers/ntp.pyc
 ${PYSITELIB}/scapy/layers/ntp.pyo
@@ -656,6 +751,12 @@ ${PYSITELIB}/scapy/layers/smb.pyo
 ${PYSITELIB}/scapy/layers/smb2.py
 ${PYSITELIB}/scapy/layers/smb2.pyc
 ${PYSITELIB}/scapy/layers/smb2.pyo
+${PYSITELIB}/scapy/layers/smbclient.py
+${PYSITELIB}/scapy/layers/smbclient.pyc
+${PYSITELIB}/scapy/layers/smbclient.pyo
+${PYSITELIB}/scapy/layers/smbserver.py
+${PYSITELIB}/scapy/layers/smbserver.pyc
+${PYSITELIB}/scapy/layers/smbserver.pyo
 ${PYSITELIB}/scapy/layers/snmp.py
 ${PYSITELIB}/scapy/layers/snmp.pyc
 ${PYSITELIB}/scapy/layers/snmp.pyo
@@ -722,6 +823,9 @@ ${PYSITELIB}/scapy/layers/tls/crypto/hkd
 ${PYSITELIB}/scapy/layers/tls/crypto/kx_algs.py
 ${PYSITELIB}/scapy/layers/tls/crypto/kx_algs.pyc
 ${PYSITELIB}/scapy/layers/tls/crypto/kx_algs.pyo
+${PYSITELIB}/scapy/layers/tls/crypto/md4.py
+${PYSITELIB}/scapy/layers/tls/crypto/md4.pyc
+${PYSITELIB}/scapy/layers/tls/crypto/md4.pyo
 ${PYSITELIB}/scapy/layers/tls/crypto/pkcs1.py
 ${PYSITELIB}/scapy/layers/tls/crypto/pkcs1.pyc
 ${PYSITELIB}/scapy/layers/tls/crypto/pkcs1.pyo
@@ -785,9 +889,21 @@ ${PYSITELIB}/scapy/libs/__init__.pyo
 ${PYSITELIB}/scapy/libs/ethertypes.py
 ${PYSITELIB}/scapy/libs/ethertypes.pyc
 ${PYSITELIB}/scapy/libs/ethertypes.pyo
+${PYSITELIB}/scapy/libs/matplot.py
+${PYSITELIB}/scapy/libs/matplot.pyc
+${PYSITELIB}/scapy/libs/matplot.pyo
+${PYSITELIB}/scapy/libs/rfc3961.py
+${PYSITELIB}/scapy/libs/rfc3961.pyc
+${PYSITELIB}/scapy/libs/rfc3961.pyo
+${PYSITELIB}/scapy/libs/six.py
+${PYSITELIB}/scapy/libs/six.pyc
+${PYSITELIB}/scapy/libs/six.pyo
 ${PYSITELIB}/scapy/libs/structures.py
 ${PYSITELIB}/scapy/libs/structures.pyc
 ${PYSITELIB}/scapy/libs/structures.pyo
+${PYSITELIB}/scapy/libs/test_pyx.py
+${PYSITELIB}/scapy/libs/test_pyx.pyc
+${PYSITELIB}/scapy/libs/test_pyx.pyo
 ${PYSITELIB}/scapy/libs/winpcapy.py
 ${PYSITELIB}/scapy/libs/winpcapy.pyc
 ${PYSITELIB}/scapy/libs/winpcapy.pyo
@@ -812,9 +928,9 @@ ${PYSITELIB}/scapy/modules/nmap.pyo
 ${PYSITELIB}/scapy/modules/p0f.py
 ${PYSITELIB}/scapy/modules/p0f.pyc
 ${PYSITELIB}/scapy/modules/p0f.pyo
-${PYSITELIB}/scapy/modules/six.py
-${PYSITELIB}/scapy/modules/six.pyc
-${PYSITELIB}/scapy/modules/six.pyo
+${PYSITELIB}/scapy/modules/p0fv2.py
+${PYSITELIB}/scapy/modules/p0fv2.pyc
+${PYSITELIB}/scapy/modules/p0fv2.pyo
 ${PYSITELIB}/scapy/modules/voip.py
 ${PYSITELIB}/scapy/modules/voip.pyc
 ${PYSITELIB}/scapy/modules/voip.pyo
@@ -887,5 +1003,20 @@ ${PYSITELIB}/scapy/utils6.pyo
 ${PYSITELIB}/scapy/volatile.py
 ${PYSITELIB}/scapy/volatile.pyc
 ${PYSITELIB}/scapy/volatile.pyo
+${PYSITELIB}/test/__init__.py
+${PYSITELIB}/test/__init__.pyc
+${PYSITELIB}/test/__init__.pyo
+${PYSITELIB}/test/testsocket.py
+${PYSITELIB}/test/testsocket.pyc
+${PYSITELIB}/test/testsocket.pyo
+${PYSITELIB}/test/tls/__init__.py
+${PYSITELIB}/test/tls/__init__.pyc
+${PYSITELIB}/test/tls/__init__.pyo
+${PYSITELIB}/test/tls/example_client.py
+${PYSITELIB}/test/tls/example_client.pyc
+${PYSITELIB}/test/tls/example_client.pyo
+${PYSITELIB}/test/tls/example_server.py
+${PYSITELIB}/test/tls/example_server.pyc
+${PYSITELIB}/test/tls/example_server.pyo
 man/man1/scapy.1
 share/examples/scapy/ethertypes

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.18 pkgsrc/net/scapy/distinfo:1.19
--- pkgsrc/net/scapy/distinfo:1.18      Tue Oct 26 11:06:55 2021
+++ pkgsrc/net/scapy/distinfo   Tue Jan 17 01:33:17 2023
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:06:55 nia Exp $
+$NetBSD: distinfo,v 1.19 2023/01/17 01:33:17 gutteridge Exp $
 
-BLAKE2s (scapy-2.4.5.tar.gz) = 6b2d5f131e2c8bb6d097e3d33942f087296910fe1ae0703c572ab5a8761f93b0
-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) = 910c893fa3a90daffa14d8c963b65186fca313f8
+BLAKE2s (scapy-2.5.0.tar.gz) = 048ee1b0af5fa86ac9e4bf29b0150f2c1f37694605932b237b8768ac299e039c
+SHA512 (scapy-2.5.0.tar.gz) = 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
+Size (scapy-2.5.0.tar.gz) = 6082895 bytes
+SHA1 (patch-ab) = 0f9761c3eac568543eaa951523bcb730198832d9
+SHA1 (patch-ad) = 874ee58db9203b8eac3b99336834b3764ffcb10d
+SHA1 (patch-scapy_arch_bpf_supersocket.py) = 0bbf632684e945f63e43075766574031620161d0
 SHA1 (patch-scapy_consts.py) = c897229e444d363e2aeea12cdd7264d3d275f4ab
-SHA1 (patch-test_bpf.uts) = 628c8da78c16ab5628eb2b9a5d10229c5de197f8
-SHA1 (patch-test_run__tests) = cf152ca5a81652ff9fbfebf79d7f318e8d79e18e

Index: pkgsrc/net/scapy/patches/patch-ab
diff -u pkgsrc/net/scapy/patches/patch-ab:1.5 pkgsrc/net/scapy/patches/patch-ab:1.6
--- pkgsrc/net/scapy/patches/patch-ab:1.5       Tue Apr 27 21:53:11 2021
+++ pkgsrc/net/scapy/patches/patch-ab   Tue Jan 17 01:33:17 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.5 2021/04/27 21:53:11 gutteridge Exp $
+$NetBSD: patch-ab,v 1.6 2023/01/17 01:33:17 gutteridge Exp $
 
 Add DragonFly support.
 
---- scapy/arch/unix.py.orig    2021-04-18 18:36:15.000000000 +0000
+--- scapy/arch/unix.py.orig    2022-12-24 14:06:26.000000000 +0000
 +++ scapy/arch/unix.py
-@@ -13,7 +13,7 @@ import socket
+@@ -15,7 +15,7 @@ from fcntl import ioctl
  import scapy.config
  import scapy.utils
  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 log_runtime, warning
+ from scapy.interfaces import network_name, NetworkInterface
  from scapy.pton_ntop import inet_pton
- from scapy.utils6 import in6_getscope, construct_source_candidate_set
-@@ -57,7 +57,7 @@ def read_routes():
+@@ -98,7 +98,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")
-@@ -291,7 +291,7 @@ def read_routes6():
+@@ -332,7 +332,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.5 pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.6
--- pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.5    Wed Aug 18 01:44:21 2021
+++ pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py        Tue Jan 17 01:33:17 2023
@@ -1,83 +1,32 @@
-$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.5 2021/08/18 01:44:21 gutteridge Exp $
+$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.6 2023/01/17 01:33:17 gutteridge Exp $
 
 Add DragonFly support.
 
-Fix NetBSD 32-bit architecture alignment.
-
-Fix send() on loopback and utun devices for Darwin and FreeBSD.
-https://github.com/secdev/scapy/pull/3257
-
---- scapy/arch/bpf/supersocket.py.orig 2021-04-18 18:36:15.000000000 +0000
+--- scapy/arch/bpf/supersocket.py.orig 2022-12-24 14:06:26.000000000 +0000
 +++ scapy/arch/bpf/supersocket.py
-@@ -18,7 +18,7 @@ from scapy.arch.bpf.consts import BIOCGB
-     BIOCIMMEDIATE, BIOCPROMISC, BIOCSBLEN, BIOCSETIF, BIOCSHDRCMPLT, \
-     BPF_BUFFER_LENGTH, BIOCSDLT, DLT_IEEE802_11_RADIO
+@@ -33,7 +33,7 @@ from scapy.arch.bpf.consts import (
+     BPF_T_NANOTIME,
+ )
  from scapy.config import conf
--from scapy.consts import FREEBSD, NETBSD, DARWIN
-+from scapy.consts import FREEBSD, NETBSD, DARWIN, DRAGONFLY
- from scapy.data import ETH_P_ALL
+-from scapy.consts import DARWIN, FREEBSD, NETBSD
++from scapy.consts import DARWIN, FREEBSD, NETBSD, DRAGONFLY
+ from scapy.data import ETH_P_ALL, DLT_IEEE802_11_RADIO
  from scapy.error import Scapy_Exception, warning
  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:
+@@ -45,6 +45,6 @@ from scapy.compat import raw
+-if FREEBSD or NETBSD:
++if FREEBSD or NETBSD or DRAGONFLY:
      # On 32bit architectures long might be 32bit.
-     BPF_ALIGNMENT = sizeof(c_long)
--elif NETBSD:
-+elif DRAGONFLY:
-     BPF_ALIGNMENT = 8  # sizeof(long)
+     BPF_ALIGNMENT = ctypes.sizeof(ctypes.c_long)
  else:
-     BPF_ALIGNMENT = 4  # sizeof(int32_t)
-@@ -295,6 +295,9 @@ class L2bpfListenSocket(_L2bpfSocket):
-                 bh_tstamp_offset = 16
-         elif NETBSD:
-             # struct bpf_hdr or struct bpf_hdr32
-+            bh_tstamp_offset = sizeof(c_long) * 2
-+        elif DRAGONFLY:
-+            # struct bpf_hdr
-             bh_tstamp_offset = 16
-         else:
-             # struct bpf_hdr
-@@ -390,14 +393,31 @@ class L3bpfSocket(L2bpfSocket):
-             self.assigned_interface = iff
- 
-         # Build the frame
--        if self.guessed_cls == Loopback:
--            # bpf(4) man page (from macOS, but also for BSD):
--            # "A packet can be sent out on the network by writing to a bpf
--            # file descriptor. [...] Currently only writes to Ethernets and
--            # SLIP links are supported"
--            #
--            # Headers are only mentioned for reads, not writes. tuntaposx's tun
--            # device reports as a "loopback" device, but it does IP.
-+        #
-+        # LINKTYPE_NULL / DLT_NULL (Loopback) is a special case. From the
-+        # bpf(4) man page (from macOS/Darwin, but also for BSD):
-+        #
-+        # "A packet can be sent out on the network by writing to a bpf file
-+        # descriptor. [...] Currently only writes to Ethernets and SLIP links
-+        # are supported."
-+        #
-+        # Headers are only mentioned for reads, not writes, and it has the
-+        # name "NULL" and id=0.
-+        #
-+        # The _correct_ behaviour appears to be that one should add a BSD
-+        # Loopback header to every sent packet. This is needed by FreeBSD's
-+        # if_lo, and Darwin's if_lo & if_utun.
-+        #
-+        # tuntaposx appears to have interpreted "NULL" as "no headers".
-+        # Thankfully its interfaces have a different name (tunX) to Darwin's
-+        # if_utun interfaces (utunX).
-+        #
-+        # There might be other drivers which make the same mistake as
-+        # tuntaposx, but these are typically provided with VPN software, and
-+        # Apple are breaking these kexts in a future version of macOS... so
-+        # the problem will eventually go away. They already don't work on Macs
-+        # with Apple Silicon (M1).
-+        if DARWIN and iff.startswith('tun') and self.guessed_cls == Loopback:
-             frame = raw(pkt)
-         else:
-             frame = raw(self.guessed_cls() / pkt)
+     # DARWIN, OPENBSD
+     BPF_ALIGNMENT = ctypes.sizeof(ctypes.c_int32)
+@@ -56,7 +56,7 @@ if _NANOTIME:
+         # actually a bpf_timespec
+         _fields_ = [("tv_sec", ctypes.c_ulong),
+                     ("tv_nsec", ctypes.c_ulong)]
+-elif NETBSD:
++elif NETBSD or DRAGONFLY:
+     class bpf_timeval(ctypes.Structure):
+         _fields_ = [("tv_sec", ctypes.c_ulong),
+                     ("tv_usec", ctypes.c_ulong)]

Index: pkgsrc/net/scapy/patches/patch-ad
diff -u pkgsrc/net/scapy/patches/patch-ad:1.4 pkgsrc/net/scapy/patches/patch-ad:1.5
--- pkgsrc/net/scapy/patches/patch-ad:1.4       Mon Nov  4 05:48:26 2019
+++ pkgsrc/net/scapy/patches/patch-ad   Tue Jan 17 01:33:17 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.4 2019/11/04 05:48:26 gutteridge Exp $
+$NetBSD: patch-ad,v 1.5 2023/01/17 01:33:17 gutteridge Exp $
 
 Apply pkgsrc-specific config path.
 
---- scapy/data.py.orig 2019-08-04 16:12:30.000000000 +0000
+--- scapy/data.py.orig 2022-12-24 14:06:26.000000000 +0000
 +++ scapy/data.py
-@@ -314,7 +314,7 @@ if WINDOWS:
+@@ -529,7 +529,7 @@ if WINDOWS:
      MANUFDB = ManufDA()
  else:
      IP_PROTOS = load_protocols("/etc/protocols")
 -    ETHER_TYPES = load_ethertypes("/etc/ethertypes")
 +    ETHER_TYPES = load_ethertypes("@PKG_SYSCONFDIR@/ethertypes")
-     TCP_SERVICES, UDP_SERVICES = load_services("/etc/services")
+     TCP_SERVICES, UDP_SERVICES, SCTP_SERVICES = load_services("/etc/services")
      MANUFDB = ManufDA()
      manuf_path = select_path(

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