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, 1 Oct 2024 01:08:29 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Oct  1 01:08:29 UTC 2024

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

Log Message:
scapy: update to 2.6.0

General

    [removal] DROP SUPPORT OF PYTHON 2.7
    Python 3.11-3.13 support. The full range of supported Python versions is therefore 3.7-3.13
    Improve packaging (pyproject.toml) and version handling. Scapy will now include wheels on pypi.
    We welcome Nils Weiss (polybassa) as a new maintainer !

Main changes

    [major] support for RFC6874-like scope identifiers. This is very useful for multicast IPs as one can now do the following on L3: sr(IP(dst="224.0.0.1%eth0")/..., multi=True)
    [major] using the iface= argument is deprecated on level3 functions (send, sr, sr1), as its behavior was undefined. It remains in use for level2 functions (sendp, srp, srp1). RFC6874-like scope 
identifiers (see just above) should be used.
    [major] the internals that read the routes and interfaces configuration have been rewritten on Linux and BSD:
        on linux, to use RTNETLINK. (this should help on machines that have huge BPG tables)
        on *BSDs, to use PF_ROUTE.
        on Linux, NetBSD and FreeBSD, link-local and multicast routes should now properly be loaded
    [new] Windows protocols:
        DCE/RPC: DCERPC_Client and DCERPC_Server with support for NCACN_IP_TCP and NCACN_NP
        SMB2/3:
            Protocol refactor, many more SMB2/3 structures supported
            Server (class + 'simple' util smbserver()) (2.0.2 to 3.1.1)
            Client (class + interactive CLI smbclient()) (2.0.2 to 3.1.1)
            SMB socket, RPC over SMB socket, etc.
        Kerberos:
            KerberosSSP to use in SMB/RPC clients/servers, [MS-KILE] variants, SFU and more !
            Crypto: use cryptography, latest RFC8009, GSS_WrapEx support, typing, etc.
            Util functions krb_as_req, krb_tgt_req, kpasswd (both modes), etc.
            Ticketer++: ccache support, ask/renew/resign/edit tickets, etc
        NTLM:
            refactor, clean SSP
        Extensive GSSAPI / SPNEGO support !
        LDAP
            Fixes, ASN.1 Windows variation support
            dclocator, answering machine for "LDAP PING", etc.
            add a (very) basic LDAP_client (support for various binding mechanisms, encryption, etc.)
    [dep] Support for recent cryptography (42/43.0) versions
    [new] CLI improvements
        [breaking] Scapy CLI configuration now available in ~/.config/scapy/startup.py. This follows XDG variables. (Older ~/.scapy_startup.py is now non functional)
        Support for bpython, ptpython and ptipython
    [new] Wireshark extcap interfaces support (load_extcap())
    Automaton:
        fixes memory usage on Windows
        support for EOF events
        spawn() mode, better socket.socket support
    [breaking] StreamSocket changes, support for TCP reassembly, etc. TCPSession(app=True) must no longer be used with StreamSocket. Custom sessions are marked as unstable.
    Use L3RawSocket(6) automatically on the loopback interface on linux
    L3pcapSocket (the default L3 on Windows or when libpcap is used) now follows the same behavior as other L3 sockets when routing
    the sr* class of functions now properly supports sending on multiple interfaces (Windows & Linux)
    performance issues with the sr* class of functions have also been fixed
    manufdb (from wireshark) is now bundled and cached in ~/.cache/scapy, as it is no longer shipped as a standalone file in Wireshark.
    Improve builtin answering machines (dnsd, llmnrd, nbnsd, dhcpd...). Add mdnsd for mDNS support
    Fix performance issues with nested *ListFields
    [new] conf.nameservers contains the DNS servers. Also adds dns_resolve()
    [new] SSHv2 layer
    [breaking] Rework Session objects
    Fix L2 address computation when ARP is used over Ether (intrusive ARPs, bad guessing..)
    [breaking] change sendpfast loop argument to be consistent with sendp
    automaton: improve graph() to include implicit links
    HTTP:
        [new] add HTTP_Client and HTTP_Server which support the same SSPs as Windows
        rework http_client
        various fixes to reassembly when using TCPSession
    TLS:
        support for TLS 1.3 post handshake
        support for EdDSA signatures / keys (ed25519/ed448)
        various fixes (ffdhe generation, middlebox compat)
        support choosing of curve, signature algorithms, etc.
    More options supported in DHCP(v6), IPv6, DNS/LLMNR (special thanks to evverx)
    Bluetooth, 802.11: new payloads supported
    IPSEC: AES-NULL-GMAC support
    [breaking] Merge EAPOL contrib into EAP
    fix latex theme
    IKEv2, ISAKMP: NAT traversal support, and other fixes (notify, ...)
    Minor fixes in Netflow, NTP, SCTP, TACACS
    [deprecation] Deprecate Winpcap support on Windows (please use Npcap instead if you are not already using it).
    [removal] Remove ubberlogger.
    cache get_if_hwaddr for performance
    fix arping without IP
    [new] tcpros layer (ROS 1.1)
    many more fixes


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/scapy/patches/patch-ab \
    pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
cvs rdiff -u -r0 -r1.1 pkgsrc/net/scapy/patches/patch-scapy_____init____.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.46 pkgsrc/net/scapy/Makefile:1.47
--- pkgsrc/net/scapy/Makefile:1.46      Sat Jul 20 13:05:14 2024
+++ pkgsrc/net/scapy/Makefile   Tue Oct  1 01:08:28 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2024/07/20 13:05:14 adam Exp $
+# $NetBSD: Makefile,v 1.47 2024/10/01 01:08:28 gutteridge Exp $
 
-DISTNAME=      scapy-2.5.0
-PKGREVISION=   3
+DISTNAME=      scapy-2.6.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=secdev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -21,11 +20,20 @@ PYTHON_VERSIONS_INCOMPATIBLE=       27 38 39 #
 
 .include "options.mk"
 
-SUBST_CLASSES+=                config
-SUBST_STAGE.config=    pre-configure
-SUBST_FILES.config=    setup.py
-SUBST_SED.config+=     -e "s|share/man|${PKGMANDIR}|g"
-SUBST_MESSAGE.config=  Fixing paths.
+# Upstream has an unorthodox means of defining the software version for Python
+# packaging, where they advise packagers to force the correct value, as their
+# tooling won't do it correctly for tagged releases.
+SUBST_CLASSES+=                version
+SUBST_STAGE.version=   pre-configure
+SUBST_FILES.version=   scapy/__init__.py
+SUBST_VARS.version+=   PKGVERSION_NOREV
+SUBST_MESSAGE.version= Fixing version.
+
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+
+# Upstream mistakenly removed their scripting to install the man page.
+post-install:
+       ${MV} ${WRKSRC}/doc/scapy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scapy.1
 
 DATE_VAL=      ${DATE} "+%Y%m%d-%H%M%S"
 

Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.14 pkgsrc/net/scapy/PLIST:1.15
--- pkgsrc/net/scapy/PLIST:1.14 Tue Apr 30 10:38:15 2024
+++ pkgsrc/net/scapy/PLIST      Tue Oct  1 01:08:28 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2024/04/30 10:38:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2024/10/01 01:08:28 gutteridge Exp $
 bin/scapy
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
@@ -6,6 +6,7 @@ ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
 ${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
 ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
+${PYSITELIB}/scapy/VERSION
 ${PYSITELIB}/scapy/__init__.py
 ${PYSITELIB}/scapy/__init__.pyc
 ${PYSITELIB}/scapy/__init__.pyo
@@ -30,6 +31,9 @@ ${PYSITELIB}/scapy/arch/bpf/consts.pyo
 ${PYSITELIB}/scapy/arch/bpf/core.py
 ${PYSITELIB}/scapy/arch/bpf/core.pyc
 ${PYSITELIB}/scapy/arch/bpf/core.pyo
+${PYSITELIB}/scapy/arch/bpf/pfroute.py
+${PYSITELIB}/scapy/arch/bpf/pfroute.pyc
+${PYSITELIB}/scapy/arch/bpf/pfroute.pyo
 ${PYSITELIB}/scapy/arch/bpf/supersocket.py
 ${PYSITELIB}/scapy/arch/bpf/supersocket.pyc
 ${PYSITELIB}/scapy/arch/bpf/supersocket.pyo
@@ -39,9 +43,12 @@ ${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/linux/__init__.py
+${PYSITELIB}/scapy/arch/linux/__init__.pyc
+${PYSITELIB}/scapy/arch/linux/__init__.pyo
+${PYSITELIB}/scapy/arch/linux/rtnetlink.py
+${PYSITELIB}/scapy/arch/linux/rtnetlink.pyc
+${PYSITELIB}/scapy/arch/linux/rtnetlink.pyo
 ${PYSITELIB}/scapy/arch/solaris.py
 ${PYSITELIB}/scapy/arch/solaris.pyc
 ${PYSITELIB}/scapy/arch/solaris.pyo
@@ -108,6 +115,21 @@ ${PYSITELIB}/scapy/contrib/aoe.pyo
 ${PYSITELIB}/scapy/contrib/automotive/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/__init__.pyo
+${PYSITELIB}/scapy/contrib/automotive/autosar/__init__.py
+${PYSITELIB}/scapy/contrib/automotive/autosar/__init__.pyc
+${PYSITELIB}/scapy/contrib/automotive/autosar/__init__.pyo
+${PYSITELIB}/scapy/contrib/automotive/autosar/pdu.py
+${PYSITELIB}/scapy/contrib/automotive/autosar/pdu.pyc
+${PYSITELIB}/scapy/contrib/automotive/autosar/pdu.pyo
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc.py
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc.pyc
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc.pyo
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_canfd.py
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_canfd.pyc
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_canfd.pyo
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_pdu.py
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_pdu.pyc
+${PYSITELIB}/scapy/contrib/automotive/autosar/secoc_pdu.pyo
 ${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.py
 ${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.pyc
 ${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.pyo
@@ -348,6 +370,9 @@ ${PYSITELIB}/scapy/contrib/gtp_v2.pyo
 ${PYSITELIB}/scapy/contrib/gxrp.py
 ${PYSITELIB}/scapy/contrib/gxrp.pyc
 ${PYSITELIB}/scapy/contrib/gxrp.pyo
+${PYSITELIB}/scapy/contrib/hicp.py
+${PYSITELIB}/scapy/contrib/hicp.pyc
+${PYSITELIB}/scapy/contrib/hicp.pyo
 ${PYSITELIB}/scapy/contrib/homeplugav.py
 ${PYSITELIB}/scapy/contrib/homeplugav.pyc
 ${PYSITELIB}/scapy/contrib/homeplugav.pyo
@@ -447,9 +472,15 @@ ${PYSITELIB}/scapy/contrib/nfs.pyo
 ${PYSITELIB}/scapy/contrib/nlm.py
 ${PYSITELIB}/scapy/contrib/nlm.pyc
 ${PYSITELIB}/scapy/contrib/nlm.pyo
+${PYSITELIB}/scapy/contrib/nrf_sniffer.py
+${PYSITELIB}/scapy/contrib/nrf_sniffer.pyc
+${PYSITELIB}/scapy/contrib/nrf_sniffer.pyo
 ${PYSITELIB}/scapy/contrib/nsh.py
 ${PYSITELIB}/scapy/contrib/nsh.pyc
 ${PYSITELIB}/scapy/contrib/nsh.pyo
+${PYSITELIB}/scapy/contrib/oam.py
+${PYSITELIB}/scapy/contrib/oam.pyc
+${PYSITELIB}/scapy/contrib/oam.pyo
 ${PYSITELIB}/scapy/contrib/oncrpc.py
 ${PYSITELIB}/scapy/contrib/oncrpc.pyc
 ${PYSITELIB}/scapy/contrib/oncrpc.pyo
@@ -525,6 +556,9 @@ ${PYSITELIB}/scapy/contrib/rtps/rtps.pyo
 ${PYSITELIB}/scapy/contrib/rtr.py
 ${PYSITELIB}/scapy/contrib/rtr.pyc
 ${PYSITELIB}/scapy/contrib/rtr.pyo
+${PYSITELIB}/scapy/contrib/rtsp.py
+${PYSITELIB}/scapy/contrib/rtsp.pyc
+${PYSITELIB}/scapy/contrib/rtsp.pyo
 ${PYSITELIB}/scapy/contrib/scada/__init__.py
 ${PYSITELIB}/scapy/contrib/scada/__init__.pyc
 ${PYSITELIB}/scapy/contrib/scada/__init__.pyo
@@ -561,9 +595,6 @@ ${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
@@ -576,12 +607,12 @@ ${PYSITELIB}/scapy/contrib/tacacs.pyo
 ${PYSITELIB}/scapy/contrib/tcpao.py
 ${PYSITELIB}/scapy/contrib/tcpao.pyc
 ${PYSITELIB}/scapy/contrib/tcpao.pyo
+${PYSITELIB}/scapy/contrib/tcpros.py
+${PYSITELIB}/scapy/contrib/tcpros.pyc
+${PYSITELIB}/scapy/contrib/tcpros.pyo
 ${PYSITELIB}/scapy/contrib/tzsp.py
 ${PYSITELIB}/scapy/contrib/tzsp.pyc
 ${PYSITELIB}/scapy/contrib/tzsp.pyo
-${PYSITELIB}/scapy/contrib/ubberlogger.py
-${PYSITELIB}/scapy/contrib/ubberlogger.pyc
-${PYSITELIB}/scapy/contrib/ubberlogger.pyo
 ${PYSITELIB}/scapy/contrib/vqp.py
 ${PYSITELIB}/scapy/contrib/vqp.pyc
 ${PYSITELIB}/scapy/contrib/vqp.pyo
@@ -591,9 +622,6 @@ ${PYSITELIB}/scapy/contrib/vtp.pyo
 ${PYSITELIB}/scapy/contrib/wireguard.py
 ${PYSITELIB}/scapy/contrib/wireguard.pyc
 ${PYSITELIB}/scapy/contrib/wireguard.pyo
-${PYSITELIB}/scapy/contrib/wpa_eapol.py
-${PYSITELIB}/scapy/contrib/wpa_eapol.pyc
-${PYSITELIB}/scapy/contrib/wpa_eapol.pyo
 ${PYSITELIB}/scapy/dadict.py
 ${PYSITELIB}/scapy/dadict.pyc
 ${PYSITELIB}/scapy/dadict.pyo
@@ -699,9 +727,51 @@ ${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/msrpce/__init__.py
+${PYSITELIB}/scapy/layers/msrpce/__init__.pyc
+${PYSITELIB}/scapy/layers/msrpce/__init__.pyo
+${PYSITELIB}/scapy/layers/msrpce/all.py
+${PYSITELIB}/scapy/layers/msrpce/all.pyc
+${PYSITELIB}/scapy/layers/msrpce/all.pyo
+${PYSITELIB}/scapy/layers/msrpce/ept.py
+${PYSITELIB}/scapy/layers/msrpce/ept.pyc
+${PYSITELIB}/scapy/layers/msrpce/ept.pyo
+${PYSITELIB}/scapy/layers/msrpce/msdcom.py
+${PYSITELIB}/scapy/layers/msrpce/msdcom.pyc
+${PYSITELIB}/scapy/layers/msrpce/msdcom.pyo
+${PYSITELIB}/scapy/layers/msrpce/msnrpc.py
+${PYSITELIB}/scapy/layers/msrpce/msnrpc.pyc
+${PYSITELIB}/scapy/layers/msrpce/msnrpc.pyo
+${PYSITELIB}/scapy/layers/msrpce/mspac.py
+${PYSITELIB}/scapy/layers/msrpce/mspac.pyc
+${PYSITELIB}/scapy/layers/msrpce/mspac.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/__init__.py
+${PYSITELIB}/scapy/layers/msrpce/raw/__init__.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/__init__.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ept.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ept.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ept.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_dcom.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_dcom.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_dcom.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_nrpc.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_nrpc.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_nrpc.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_samr.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_samr.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_samr.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_srvs.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_srvs.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_srvs.pyo
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_wkst.py
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_wkst.pyc
+${PYSITELIB}/scapy/layers/msrpce/raw/ms_wkst.pyo
+${PYSITELIB}/scapy/layers/msrpce/rpcclient.py
+${PYSITELIB}/scapy/layers/msrpce/rpcclient.pyc
+${PYSITELIB}/scapy/layers/msrpce/rpcclient.pyo
+${PYSITELIB}/scapy/layers/msrpce/rpcserver.py
+${PYSITELIB}/scapy/layers/msrpce/rpcserver.pyc
+${PYSITELIB}/scapy/layers/msrpce/rpcserver.pyo
 ${PYSITELIB}/scapy/layers/netbios.py
 ${PYSITELIB}/scapy/layers/netbios.pyc
 ${PYSITELIB}/scapy/layers/netbios.pyo
@@ -759,6 +829,12 @@ ${PYSITELIB}/scapy/layers/smbserver.pyo
 ${PYSITELIB}/scapy/layers/snmp.py
 ${PYSITELIB}/scapy/layers/snmp.pyc
 ${PYSITELIB}/scapy/layers/snmp.pyo
+${PYSITELIB}/scapy/layers/spnego.py
+${PYSITELIB}/scapy/layers/spnego.pyc
+${PYSITELIB}/scapy/layers/spnego.pyo
+${PYSITELIB}/scapy/layers/ssh.py
+${PYSITELIB}/scapy/layers/ssh.pyc
+${PYSITELIB}/scapy/layers/ssh.pyo
 ${PYSITELIB}/scapy/layers/tftp.py
 ${PYSITELIB}/scapy/layers/tftp.pyc
 ${PYSITELIB}/scapy/layers/tftp.pyo
@@ -888,15 +964,18 @@ ${PYSITELIB}/scapy/libs/__init__.pyo
 ${PYSITELIB}/scapy/libs/ethertypes.py
 ${PYSITELIB}/scapy/libs/ethertypes.pyc
 ${PYSITELIB}/scapy/libs/ethertypes.pyo
+${PYSITELIB}/scapy/libs/extcap.py
+${PYSITELIB}/scapy/libs/extcap.pyc
+${PYSITELIB}/scapy/libs/extcap.pyo
+${PYSITELIB}/scapy/libs/manuf.py
+${PYSITELIB}/scapy/libs/manuf.pyc
+${PYSITELIB}/scapy/libs/manuf.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
@@ -930,6 +1009,9 @@ ${PYSITELIB}/scapy/modules/p0f.pyo
 ${PYSITELIB}/scapy/modules/p0fv2.py
 ${PYSITELIB}/scapy/modules/p0fv2.pyc
 ${PYSITELIB}/scapy/modules/p0fv2.pyo
+${PYSITELIB}/scapy/modules/ticketer.py
+${PYSITELIB}/scapy/modules/ticketer.pyc
+${PYSITELIB}/scapy/modules/ticketer.pyo
 ${PYSITELIB}/scapy/modules/voip.py
 ${PYSITELIB}/scapy/modules/voip.pyc
 ${PYSITELIB}/scapy/modules/voip.pyo
@@ -945,6 +1027,7 @@ ${PYSITELIB}/scapy/plist.pyo
 ${PYSITELIB}/scapy/pton_ntop.py
 ${PYSITELIB}/scapy/pton_ntop.pyc
 ${PYSITELIB}/scapy/pton_ntop.pyo
+${PYSITELIB}/scapy/py.typed
 ${PYSITELIB}/scapy/route.py
 ${PYSITELIB}/scapy/route.pyc
 ${PYSITELIB}/scapy/route.pyo
@@ -990,6 +1073,9 @@ ${PYSITELIB}/scapy/tools/check_asdis.pyo
 ${PYSITELIB}/scapy/tools/generate_ethertypes.py
 ${PYSITELIB}/scapy/tools/generate_ethertypes.pyc
 ${PYSITELIB}/scapy/tools/generate_ethertypes.pyo
+${PYSITELIB}/scapy/tools/generate_manuf.py
+${PYSITELIB}/scapy/tools/generate_manuf.pyc
+${PYSITELIB}/scapy/tools/generate_manuf.pyo
 ${PYSITELIB}/scapy/tools/scapy_pyannotate.py
 ${PYSITELIB}/scapy/tools/scapy_pyannotate.pyc
 ${PYSITELIB}/scapy/tools/scapy_pyannotate.pyo
@@ -1002,19 +1088,4 @@ ${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

Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.20 pkgsrc/net/scapy/distinfo:1.21
--- pkgsrc/net/scapy/distinfo:1.20      Thu Jan 19 00:35:26 2023
+++ pkgsrc/net/scapy/distinfo   Tue Oct  1 01:08:28 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.20 2023/01/19 00:35:26 gutteridge Exp $
+$NetBSD: distinfo,v 1.21 2024/10/01 01:08:28 gutteridge Exp $
 
-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-scapy_arch_bpf_supersocket.py) = 0bbf632684e945f63e43075766574031620161d0
+BLAKE2s (scapy-2.6.0.tar.gz) = cebfa06ccf9c6ab4b06e58b1df71fef7cda63db37b0f330c06ca62db25502f0b
+SHA512 (scapy-2.6.0.tar.gz) = a5543b44411fcc22eb909e806e729605616ce98ab15ff208ee90ad606265c6604ef295bc0b9b130f22711ffed0ad9fd4c52783c8df7ef79849f7db38b97d9e1d
+Size (scapy-2.6.0.tar.gz) = 7039399 bytes
+SHA1 (patch-ab) = c544db1e6d4cf8c42f7c2b0010d898bf61413e22
+SHA1 (patch-scapy_____init____.py) = d204cb7eef75637bd0de50cadef53ebe40cc100c
+SHA1 (patch-scapy_arch_bpf_supersocket.py) = 7f2ad841643c2e347871b54e476998de403d2a01
 SHA1 (patch-scapy_consts.py) = c897229e444d363e2aeea12cdd7264d3d275f4ab

Index: pkgsrc/net/scapy/patches/patch-ab
diff -u pkgsrc/net/scapy/patches/patch-ab:1.6 pkgsrc/net/scapy/patches/patch-ab:1.7
--- pkgsrc/net/scapy/patches/patch-ab:1.6       Tue Jan 17 01:33:17 2023
+++ pkgsrc/net/scapy/patches/patch-ab   Tue Oct  1 01:08:29 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2023/01/17 01:33:17 gutteridge Exp $
+$NetBSD: patch-ab,v 1.7 2024/10/01 01:08:29 gutteridge Exp $
 
 Add DragonFly support.
 
---- scapy/arch/unix.py.orig    2022-12-24 14:06:26.000000000 +0000
+--- scapy/arch/unix.py.orig    2024-09-28 13:11:32.000000000 +0000
 +++ scapy/arch/unix.py
 @@ -15,7 +15,7 @@ from fcntl import ioctl
  import scapy.config
@@ -11,9 +11,9 @@ Add DragonFly support.
 -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
-@@ -98,7 +98,7 @@ def read_routes():
+ from scapy.utils6 import in6_getscope, construct_source_candidate_set
+@@ -96,7 +96,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")
-@@ -332,7 +332,7 @@ def read_routes6():
+@@ -330,7 +330,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.6 pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.7
--- pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.6    Tue Jan 17 01:33:17 2023
+++ pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py        Tue Oct  1 01:08:29 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.6 2023/01/17 01:33:17 gutteridge Exp $
+$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.7 2024/10/01 01:08:29 gutteridge Exp $
 
 Add DragonFly support.
 
---- scapy/arch/bpf/supersocket.py.orig 2022-12-24 14:06:26.000000000 +0000
+--- scapy/arch/bpf/supersocket.py.orig 2024-09-28 13:11:32.000000000 +0000
 +++ scapy/arch/bpf/supersocket.py
-@@ -33,7 +33,7 @@ from scapy.arch.bpf.consts import (
+@@ -35,7 +35,7 @@ from scapy.arch.bpf.consts import (
      BPF_T_NANOTIME,
  )
  from scapy.config import conf
@@ -12,16 +12,17 @@ Add DragonFly support.
 +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
-@@ -45,6 +45,6 @@ from scapy.compat import raw
+ from scapy.interfaces import network_name, _GlobInterfaceType
+@@ -56,7 +56,7 @@ if TYPE_CHECKING:
+ 
+ # Structures & c types
+ 
 -if FREEBSD or NETBSD:
 +if FREEBSD or NETBSD or DRAGONFLY:
      # On 32bit architectures long might be 32bit.
      BPF_ALIGNMENT = ctypes.sizeof(ctypes.c_long)
  else:
-     # DARWIN, OPENBSD
-     BPF_ALIGNMENT = ctypes.sizeof(ctypes.c_int32)
-@@ -56,7 +56,7 @@ if _NANOTIME:
+@@ -70,7 +70,7 @@ if _NANOTIME:
          # actually a bpf_timespec
          _fields_ = [("tv_sec", ctypes.c_ulong),
                      ("tv_nsec", ctypes.c_ulong)]

Added files:

Index: pkgsrc/net/scapy/patches/patch-scapy_____init____.py
diff -u /dev/null pkgsrc/net/scapy/patches/patch-scapy_____init____.py:1.1
--- /dev/null   Tue Oct  1 01:08:29 2024
+++ pkgsrc/net/scapy/patches/patch-scapy_____init____.py        Tue Oct  1 01:08:29 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-scapy_____init____.py,v 1.1 2024/10/01 01:08:29 gutteridge Exp $
+
+Supply expected version, not inconsistent date value set by upstream.
+
+--- scapy/__init__.py.orig     2024-09-28 13:11:32.000000000 +0000
++++ scapy/__init__.py
+@@ -133,7 +133,7 @@ def _version():
+     # Method 0: from external packaging
+     try:
+         # possibly forced by external packaging
+-        return os.environ['SCAPY_VERSION']
++        return "@PKGVERSION_NOREV@"
+     except KeyError:
+         pass
+

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