pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/scapy
Module Name: pkgsrc
Committed By: gutteridge
Date: Sun Mar 21 19:50:54 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
Removed Files:
pkgsrc/net/scapy/patches: patch-scapy_tools_generate__ethertypes.py
Log Message:
scapy: update to 2.4.4
Main Changes
Core
784 commits to master since this v2.4.3
fix how timestamps are measured on layer 3 (broken since 2.4.1)
drop DNET support (deprecated since 2.4.0)
Scapy will now use libpcap instead of tcpdump to compile the filters (tcpdump is still used to filter pcaps)
major changes to the online doc: add an automatically generated API reference with visual representation of each layer, move to Sphinx 3.0.0, new layer-specific doc...
*BSD fixes
more doc to many functions
Layers
New layers (homeplug sg, smb2, NSH, RPL, ERSPAN, BFD, ROCE...)
TLS: TLS 1.3 support & many fixes
802.11 improvements / WPA3 detection
Netflow 9 fixes
Major refactor & changes of the Automotive layers
HTTP changes
DHCPv6 fixes according to revision of the RFC
Bluetooth improvements (+BLE)
minor fixes to Radius, PPP, GTP, IPsec, CDP, VTP, HTTP/2, ...
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/scapy/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/scapy/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/scapy/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/scapy/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py \
pkgsrc/net/scapy/patches/patch-scapy_consts.py
cvs rdiff -u -r1.1 -r0 \
pkgsrc/net/scapy/patches/patch-scapy_tools_generate__ethertypes.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.32 pkgsrc/net/scapy/Makefile:1.33
--- pkgsrc/net/scapy/Makefile:1.32 Fri Dec 4 20:45:36 2020
+++ pkgsrc/net/scapy/Makefile Sun Mar 21 19:50:54 2021
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.32 2020/12/04 20:45:36 nia Exp $
+# $NetBSD: Makefile,v 1.33 2021/03/21 19:50:54 gutteridge Exp $
-DISTNAME= scapy-2.4.3
-PKGREVISION= 2
+DISTNAME= scapy-2.4.4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=secdev/}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.secdev.org/projects/scapy/
+HOMEPAGE= https://scapy.net/
COMMENT= Interactive packet manipulation program
LICENSE= gnu-gpl-v2
NO_BUILD= yes
-PYTHON_VERSIONS_ACCEPTED= 37 36 27 # 3.8 not officially supported yet
+PYTHON_VERSIONS_ACCEPTED= 38 37 36 27 # 3.9 not officially supported yet
INSTALLATION_DIRS+= share/examples/scapy
@@ -35,8 +34,12 @@ post-extract:
post-install:
${INSTALL_DATA} ${WRKSRC}/ethertypes ${DESTDIR}${PREFIX}/share/examples/scapy/
+DATE_VAL= ${DATE} "+%Y%m%d-%H%M%S"
+
do-test:
- cd ${WRKSRC}/test && ${SETENV} PYTHON=${PYTHONBIN} ./run_tests
+ cd ${WRKSRC}/test && ${SETENV} PYTHON=${PYTHONBIN} ./run_tests \
+ -t regression.uts -f html -K ipv6 -l \
+ -o /tmp/scapy_regression_test_${DATE_VAL:sh}.html
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
Index: pkgsrc/net/scapy/PLIST
diff -u pkgsrc/net/scapy/PLIST:1.9 pkgsrc/net/scapy/PLIST:1.10
--- pkgsrc/net/scapy/PLIST:1.9 Mon Nov 4 05:48:26 2019
+++ pkgsrc/net/scapy/PLIST Sun Mar 21 19:50:54 2021
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.9 2019/11/04 05:48:26 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/03/21 19:50:54 gutteridge Exp $
bin/UTscapy
bin/scapy
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/scapy-git_archive.dev304758016-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${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/__init__.py
${PYSITELIB}/scapy/__init__.pyc
${PYSITELIB}/scapy/__init__.pyo
@@ -113,18 +113,30 @@ ${PYSITELIB}/scapy/contrib/automotive/__
${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.py
${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.pyc
${PYSITELIB}/scapy/contrib/automotive/bmw/__init__.pyo
+${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/ccp.py
${PYSITELIB}/scapy/contrib/automotive/ccp.pyc
${PYSITELIB}/scapy/contrib/automotive/ccp.pyo
+${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
${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/gmlanutils.py
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlanutils.pyc
+${PYSITELIB}/scapy/contrib/automotive/gm/gmlanutils.pyo
${PYSITELIB}/scapy/contrib/automotive/obd/__init__.py
${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyc
${PYSITELIB}/scapy/contrib/automotive/obd/__init__.pyo
@@ -170,6 +182,9 @@ ${PYSITELIB}/scapy/contrib/automotive/ob
${PYSITELIB}/scapy/contrib/automotive/obd/pid/pids_A0_C0.py
${PYSITELIB}/scapy/contrib/automotive/obd/pid/pids_A0_C0.pyc
${PYSITELIB}/scapy/contrib/automotive/obd/pid/pids_A0_C0.pyo
+${PYSITELIB}/scapy/contrib/automotive/obd/scanner.py
+${PYSITELIB}/scapy/contrib/automotive/obd/scanner.pyc
+${PYSITELIB}/scapy/contrib/automotive/obd/scanner.pyo
${PYSITELIB}/scapy/contrib/automotive/obd/services.py
${PYSITELIB}/scapy/contrib/automotive/obd/services.pyc
${PYSITELIB}/scapy/contrib/automotive/obd/services.pyo
@@ -182,15 +197,21 @@ ${PYSITELIB}/scapy/contrib/automotive/ob
${PYSITELIB}/scapy/contrib/automotive/someip.py
${PYSITELIB}/scapy/contrib/automotive/someip.pyc
${PYSITELIB}/scapy/contrib/automotive/someip.pyo
-${PYSITELIB}/scapy/contrib/automotive/someip_sd.py
-${PYSITELIB}/scapy/contrib/automotive/someip_sd.pyc
-${PYSITELIB}/scapy/contrib/automotive/someip_sd.pyo
${PYSITELIB}/scapy/contrib/automotive/uds.py
${PYSITELIB}/scapy/contrib/automotive/uds.pyc
${PYSITELIB}/scapy/contrib/automotive/uds.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/avs.py
${PYSITELIB}/scapy/contrib/avs.pyc
${PYSITELIB}/scapy/contrib/avs.pyo
+${PYSITELIB}/scapy/contrib/bfd.py
+${PYSITELIB}/scapy/contrib/bfd.pyc
+${PYSITELIB}/scapy/contrib/bfd.pyo
${PYSITELIB}/scapy/contrib/bgp.py
${PYSITELIB}/scapy/contrib/bgp.pyc
${PYSITELIB}/scapy/contrib/bgp.pyo
@@ -221,6 +242,9 @@ ${PYSITELIB}/scapy/contrib/chdlc.pyo
${PYSITELIB}/scapy/contrib/coap.py
${PYSITELIB}/scapy/contrib/coap.pyc
${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
@@ -239,12 +263,18 @@ ${PYSITELIB}/scapy/contrib/eigrp.pyo
${PYSITELIB}/scapy/contrib/enipTCP.py
${PYSITELIB}/scapy/contrib/enipTCP.pyc
${PYSITELIB}/scapy/contrib/enipTCP.pyo
+${PYSITELIB}/scapy/contrib/erspan.py
+${PYSITELIB}/scapy/contrib/erspan.pyc
+${PYSITELIB}/scapy/contrib/erspan.pyo
${PYSITELIB}/scapy/contrib/ethercat.py
${PYSITELIB}/scapy/contrib/ethercat.pyc
${PYSITELIB}/scapy/contrib/ethercat.pyo
${PYSITELIB}/scapy/contrib/etherip.py
${PYSITELIB}/scapy/contrib/etherip.pyc
${PYSITELIB}/scapy/contrib/etherip.pyo
+${PYSITELIB}/scapy/contrib/exposure_notification.py
+${PYSITELIB}/scapy/contrib/exposure_notification.pyc
+${PYSITELIB}/scapy/contrib/exposure_notification.pyo
${PYSITELIB}/scapy/contrib/geneve.py
${PYSITELIB}/scapy/contrib/geneve.pyc
${PYSITELIB}/scapy/contrib/geneve.pyo
@@ -257,6 +287,12 @@ ${PYSITELIB}/scapy/contrib/gtp_v2.pyo
${PYSITELIB}/scapy/contrib/homeplugav.py
${PYSITELIB}/scapy/contrib/homeplugav.pyc
${PYSITELIB}/scapy/contrib/homeplugav.pyo
+${PYSITELIB}/scapy/contrib/homepluggp.py
+${PYSITELIB}/scapy/contrib/homepluggp.pyc
+${PYSITELIB}/scapy/contrib/homepluggp.pyo
+${PYSITELIB}/scapy/contrib/homeplugsg.py
+${PYSITELIB}/scapy/contrib/homeplugsg.pyc
+${PYSITELIB}/scapy/contrib/homeplugsg.pyo
${PYSITELIB}/scapy/contrib/http2.py
${PYSITELIB}/scapy/contrib/http2.pyc
${PYSITELIB}/scapy/contrib/http2.pyo
@@ -293,6 +329,9 @@ ${PYSITELIB}/scapy/contrib/ldp.pyo
${PYSITELIB}/scapy/contrib/lldp.py
${PYSITELIB}/scapy/contrib/lldp.pyc
${PYSITELIB}/scapy/contrib/lldp.pyo
+${PYSITELIB}/scapy/contrib/loraphy2wan.py
+${PYSITELIB}/scapy/contrib/loraphy2wan.pyc
+${PYSITELIB}/scapy/contrib/loraphy2wan.pyo
${PYSITELIB}/scapy/contrib/ltp.py
${PYSITELIB}/scapy/contrib/ltp.pyc
${PYSITELIB}/scapy/contrib/ltp.pyo
@@ -305,6 +344,9 @@ ${PYSITELIB}/scapy/contrib/macsec.pyo
${PYSITELIB}/scapy/contrib/modbus.py
${PYSITELIB}/scapy/contrib/modbus.pyc
${PYSITELIB}/scapy/contrib/modbus.pyo
+${PYSITELIB}/scapy/contrib/mount.py
+${PYSITELIB}/scapy/contrib/mount.pyc
+${PYSITELIB}/scapy/contrib/mount.pyo
${PYSITELIB}/scapy/contrib/mpls.py
${PYSITELIB}/scapy/contrib/mpls.pyc
${PYSITELIB}/scapy/contrib/mpls.pyo
@@ -314,9 +356,18 @@ ${PYSITELIB}/scapy/contrib/mqtt.pyo
${PYSITELIB}/scapy/contrib/mqttsn.py
${PYSITELIB}/scapy/contrib/mqttsn.pyc
${PYSITELIB}/scapy/contrib/mqttsn.pyo
+${PYSITELIB}/scapy/contrib/nfs.py
+${PYSITELIB}/scapy/contrib/nfs.pyc
+${PYSITELIB}/scapy/contrib/nfs.pyo
+${PYSITELIB}/scapy/contrib/nlm.py
+${PYSITELIB}/scapy/contrib/nlm.pyc
+${PYSITELIB}/scapy/contrib/nlm.pyo
${PYSITELIB}/scapy/contrib/nsh.py
${PYSITELIB}/scapy/contrib/nsh.pyc
${PYSITELIB}/scapy/contrib/nsh.pyo
+${PYSITELIB}/scapy/contrib/oncrpc.py
+${PYSITELIB}/scapy/contrib/oncrpc.pyc
+${PYSITELIB}/scapy/contrib/oncrpc.pyo
${PYSITELIB}/scapy/contrib/opc_da.py
${PYSITELIB}/scapy/contrib/opc_da.pyc
${PYSITELIB}/scapy/contrib/opc_da.pyo
@@ -329,6 +380,9 @@ ${PYSITELIB}/scapy/contrib/openflow3.pyo
${PYSITELIB}/scapy/contrib/ospf.py
${PYSITELIB}/scapy/contrib/ospf.pyc
${PYSITELIB}/scapy/contrib/ospf.pyo
+${PYSITELIB}/scapy/contrib/pfcp.py
+${PYSITELIB}/scapy/contrib/pfcp.pyc
+${PYSITELIB}/scapy/contrib/pfcp.pyo
${PYSITELIB}/scapy/contrib/pnio.py
${PYSITELIB}/scapy/contrib/pnio.pyc
${PYSITELIB}/scapy/contrib/pnio.pyo
@@ -338,6 +392,9 @@ ${PYSITELIB}/scapy/contrib/pnio_dcp.pyo
${PYSITELIB}/scapy/contrib/pnio_rpc.py
${PYSITELIB}/scapy/contrib/pnio_rpc.pyc
${PYSITELIB}/scapy/contrib/pnio_rpc.pyo
+${PYSITELIB}/scapy/contrib/portmap.py
+${PYSITELIB}/scapy/contrib/portmap.pyc
+${PYSITELIB}/scapy/contrib/portmap.pyo
${PYSITELIB}/scapy/contrib/ppi_cace.py
${PYSITELIB}/scapy/contrib/ppi_cace.pyc
${PYSITELIB}/scapy/contrib/ppi_cace.pyo
@@ -347,6 +404,15 @@ ${PYSITELIB}/scapy/contrib/ppi_geotag.py
${PYSITELIB}/scapy/contrib/ripng.py
${PYSITELIB}/scapy/contrib/ripng.pyc
${PYSITELIB}/scapy/contrib/ripng.pyo
+${PYSITELIB}/scapy/contrib/roce.py
+${PYSITELIB}/scapy/contrib/roce.pyc
+${PYSITELIB}/scapy/contrib/roce.pyo
+${PYSITELIB}/scapy/contrib/rpl.py
+${PYSITELIB}/scapy/contrib/rpl.pyc
+${PYSITELIB}/scapy/contrib/rpl.pyo
+${PYSITELIB}/scapy/contrib/rpl_metrics.py
+${PYSITELIB}/scapy/contrib/rpl_metrics.pyc
+${PYSITELIB}/scapy/contrib/rpl_metrics.pyo
${PYSITELIB}/scapy/contrib/rsvp.py
${PYSITELIB}/scapy/contrib/rsvp.pyc
${PYSITELIB}/scapy/contrib/rsvp.pyo
@@ -359,9 +425,6 @@ ${PYSITELIB}/scapy/contrib/scada/__init_
${PYSITELIB}/scapy/contrib/scada/iec104/__init__.py
${PYSITELIB}/scapy/contrib/scada/iec104/__init__.pyc
${PYSITELIB}/scapy/contrib/scada/iec104/__init__.pyo
-${PYSITELIB}/scapy/contrib/scada/iec104/iec104.py
-${PYSITELIB}/scapy/contrib/scada/iec104/iec104.pyc
-${PYSITELIB}/scapy/contrib/scada/iec104/iec104.pyo
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_fields.py
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_fields.pyc
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_fields.pyo
@@ -371,6 +434,9 @@ ${PYSITELIB}/scapy/contrib/scada/iec104/
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_information_objects.py
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_information_objects.pyc
${PYSITELIB}/scapy/contrib/scada/iec104/iec104_information_objects.pyo
+${PYSITELIB}/scapy/contrib/scada/pcom.py
+${PYSITELIB}/scapy/contrib/scada/pcom.pyc
+${PYSITELIB}/scapy/contrib/scada/pcom.pyo
${PYSITELIB}/scapy/contrib/sdnv.py
${PYSITELIB}/scapy/contrib/sdnv.pyc
${PYSITELIB}/scapy/contrib/sdnv.pyo
@@ -545,6 +611,9 @@ ${PYSITELIB}/scapy/layers/skinny.pyo
${PYSITELIB}/scapy/layers/smb.py
${PYSITELIB}/scapy/layers/smb.pyc
${PYSITELIB}/scapy/layers/smb.pyo
+${PYSITELIB}/scapy/layers/smb2.py
+${PYSITELIB}/scapy/layers/smb2.pyc
+${PYSITELIB}/scapy/layers/smb2.pyo
${PYSITELIB}/scapy/layers/snmp.py
${PYSITELIB}/scapy/layers/snmp.pyc
${PYSITELIB}/scapy/layers/snmp.pyo
@@ -665,15 +734,24 @@ ${PYSITELIB}/scapy/layers/x509.pyo
${PYSITELIB}/scapy/layers/zigbee.py
${PYSITELIB}/scapy/layers/zigbee.pyc
${PYSITELIB}/scapy/layers/zigbee.pyo
+${PYSITELIB}/scapy/libs/__init__.py
+${PYSITELIB}/scapy/libs/__init__.pyc
+${PYSITELIB}/scapy/libs/__init__.pyo
+${PYSITELIB}/scapy/libs/ethertypes.py
+${PYSITELIB}/scapy/libs/ethertypes.pyc
+${PYSITELIB}/scapy/libs/ethertypes.pyo
+${PYSITELIB}/scapy/libs/structures.py
+${PYSITELIB}/scapy/libs/structures.pyc
+${PYSITELIB}/scapy/libs/structures.pyo
+${PYSITELIB}/scapy/libs/winpcapy.py
+${PYSITELIB}/scapy/libs/winpcapy.pyc
+${PYSITELIB}/scapy/libs/winpcapy.pyo
${PYSITELIB}/scapy/main.py
${PYSITELIB}/scapy/main.pyc
${PYSITELIB}/scapy/main.pyo
${PYSITELIB}/scapy/modules/__init__.py
${PYSITELIB}/scapy/modules/__init__.pyc
${PYSITELIB}/scapy/modules/__init__.pyo
-${PYSITELIB}/scapy/modules/ethertypes.py
-${PYSITELIB}/scapy/modules/ethertypes.pyc
-${PYSITELIB}/scapy/modules/ethertypes.pyo
${PYSITELIB}/scapy/modules/krack/__init__.py
${PYSITELIB}/scapy/modules/krack/__init__.pyc
${PYSITELIB}/scapy/modules/krack/__init__.pyo
@@ -695,9 +773,6 @@ ${PYSITELIB}/scapy/modules/six.pyo
${PYSITELIB}/scapy/modules/voip.py
${PYSITELIB}/scapy/modules/voip.pyc
${PYSITELIB}/scapy/modules/voip.pyo
-${PYSITELIB}/scapy/modules/winpcapy.py
-${PYSITELIB}/scapy/modules/winpcapy.pyc
-${PYSITELIB}/scapy/modules/winpcapy.pyo
${PYSITELIB}/scapy/packet.py
${PYSITELIB}/scapy/packet.pyc
${PYSITELIB}/scapy/packet.pyo
@@ -743,12 +818,18 @@ ${PYSITELIB}/scapy/tools/automotive/__in
${PYSITELIB}/scapy/tools/automotive/isotpscanner.py
${PYSITELIB}/scapy/tools/automotive/isotpscanner.pyc
${PYSITELIB}/scapy/tools/automotive/isotpscanner.pyo
+${PYSITELIB}/scapy/tools/automotive/obdscanner.py
+${PYSITELIB}/scapy/tools/automotive/obdscanner.pyc
+${PYSITELIB}/scapy/tools/automotive/obdscanner.pyo
${PYSITELIB}/scapy/tools/check_asdis.py
${PYSITELIB}/scapy/tools/check_asdis.pyc
${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/scapy_pyannotate.py
+${PYSITELIB}/scapy/tools/scapy_pyannotate.pyc
+${PYSITELIB}/scapy/tools/scapy_pyannotate.pyo
${PYSITELIB}/scapy/utils.py
${PYSITELIB}/scapy/utils.pyc
${PYSITELIB}/scapy/utils.pyo
Index: pkgsrc/net/scapy/distinfo
diff -u pkgsrc/net/scapy/distinfo:1.11 pkgsrc/net/scapy/distinfo:1.12
--- pkgsrc/net/scapy/distinfo:1.11 Tue Nov 5 01:02:49 2019
+++ pkgsrc/net/scapy/distinfo Sun Mar 21 19:50:54 2021
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.11 2019/11/05 01:02:49 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2021/03/21 19:50:54 gutteridge Exp $
-SHA1 (scapy-2.4.3.tar.gz) = 62dfd58a8e3799f083a157209b8b0902f53e76f0
-RMD160 (scapy-2.4.3.tar.gz) = fee72af411c6b42961feb6f46ad5ba7e8c0c426b
-SHA512 (scapy-2.4.3.tar.gz) = 48bf86ed851f4b15d4f3b1e2668f1516fff712b67d709963cb986076cfeec0724e20b400a75368309f3d99a45d7b1082fd049fbb67edef0ab5d838e2ae141e44
-Size (scapy-2.4.3.tar.gz) = 2969754 bytes
-SHA1 (patch-ab) = 09adbe98c2e129438833f1e1212c6ef276e197d0
+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 (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
+SHA1 (patch-scapy_arch_bpf_supersocket.py) = b2b119986b714ef478c2f8583358b8f1455135e4
+SHA1 (patch-scapy_consts.py) = 46da1b276299e1d98600ea477da8d19c1a78f3ef
Index: pkgsrc/net/scapy/patches/patch-ab
diff -u pkgsrc/net/scapy/patches/patch-ab:1.3 pkgsrc/net/scapy/patches/patch-ab:1.4
--- pkgsrc/net/scapy/patches/patch-ab:1.3 Mon Nov 4 05:48:26 2019
+++ pkgsrc/net/scapy/patches/patch-ab Sun Mar 21 19:50:54 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2019/11/04 05:48:26 gutteridge Exp $
+$NetBSD: patch-ab,v 1.4 2021/03/21 19:50:54 gutteridge Exp $
Add DragonFly support.
---- scapy/arch/unix.py.orig 2019-08-04 16:12:30.000000000 +0000
+--- scapy/arch/unix.py.orig 2020-09-02 11:26:21.000000000 +0000
+++ scapy/arch/unix.py
@@ -14,7 +14,7 @@ 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, LOOPBACK_NAME
-+from scapy.consts import FREEBSD, NETBSD, OPENBSD, SOLARIS, LOOPBACK_NAME, DRAGONFLY
+-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.pton_ntop import inet_pton
from scapy.utils6 import in6_getscope, construct_source_candidate_set
@@ -19,7 +19,7 @@ Add DragonFly support.
f = os.popen("netstat -rvn -f inet")
- elif FREEBSD:
+ elif FREEBSD or DRAGONFLY:
- f = os.popen("netstat -rnW") # -W to handle long interface names
+ 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():
Index: pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py
diff -u pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.1 pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.2
--- pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py:1.1 Mon Nov 4 05:48:26 2019
+++ pkgsrc/net/scapy/patches/patch-scapy_arch_bpf_supersocket.py Sun Mar 21 19:50:54 2021
@@ -1,10 +1,11 @@
-$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.1 2019/11/04 05:48:26 gutteridge Exp $
+$NetBSD: patch-scapy_arch_bpf_supersocket.py,v 1.2 2021/03/21 19:50:54 gutteridge Exp $
Add DragonFly support.
+Fix NetBSD 32-bit architecture alignment.
---- scapy/arch/bpf/supersocket.py.orig 2019-08-04 16:12:30.000000000 +0000
+--- scapy/arch/bpf/supersocket.py.orig 2020-09-02 11:26:21.000000000 +0000
+++ scapy/arch/bpf/supersocket.py
-@@ -16,14 +16,14 @@ from scapy.arch.bpf.consts import BIOCGB
+@@ -18,18 +18,16 @@ 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
@@ -16,17 +17,21 @@ Add DragonFly support.
from scapy.compat import raw
--if FREEBSD or NETBSD:
+-if FREEBSD:
+if FREEBSD or NETBSD or DRAGONFLY:
- BPF_ALIGNMENT = 8 # sizeof(long)
+ # On 32bit architectures long might be 32bit.
+ BPF_ALIGNMENT = sizeof(c_long)
+-elif NETBSD:
+- BPF_ALIGNMENT = 8 # sizeof(long)
else:
BPF_ALIGNMENT = 4 # sizeof(int32_t)
-@@ -260,7 +260,7 @@ class L2bpfListenSocket(_L2bpfSocket):
- return
- # Extract useful information from the BPF header
-- if FREEBSD or NETBSD:
-+ if FREEBSD or NETBSD or DRAGONFLY:
- # struct bpf_xhdr or struct bpf_hdr32
+@@ -281,7 +279,7 @@ class L2bpfListenSocket(_L2bpfSocket):
+ else:
+ # struct bpf_hdr (64bit time_t) or struct bpf_xhdr
+ bh_tstamp_offset = 16
+- elif NETBSD:
++ elif NETBSD or DRAGONFLY:
+ # struct bpf_hdr or struct bpf_hdr32
bh_tstamp_offset = 16
else:
Index: pkgsrc/net/scapy/patches/patch-scapy_consts.py
diff -u pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.1 pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.2
--- pkgsrc/net/scapy/patches/patch-scapy_consts.py:1.1 Mon Nov 4 05:48:26 2019
+++ pkgsrc/net/scapy/patches/patch-scapy_consts.py Sun Mar 21 19:50:54 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-scapy_consts.py,v 1.1 2019/11/04 05:48:26 gutteridge Exp $
+$NetBSD: patch-scapy_consts.py,v 1.2 2021/03/21 19:50:54 gutteridge Exp $
Add DragonFly support.
---- scapy/consts.py.orig 2019-10-22 16:33:00.860254151 +0000
+--- scapy/consts.py.orig 2020-09-02 11:26:21.000000000 +0000
+++ scapy/consts.py
-@@ -15,7 +15,8 @@ DARWIN = platform.startswith("darwin")
+@@ -14,7 +14,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
Home |
Main Index |
Thread Index |
Old Index