Index: head/net/scapy/files/patch-i386 =================================================================== --- head/net/scapy/files/patch-i386 (revision 550634) +++ head/net/scapy/files/patch-i386 (nonexistent) @@ -1,50 +0,0 @@ ---- scapy/arch/bpf/supersocket.py.orig 2019-07-29 18:49:37 UTC -+++ scapy/arch/bpf/supersocket.py -@@ -4,9 +4,11 @@ - Scapy *BSD native support - BPF sockets - """ - -+from ctypes import c_long, sizeof - import errno - import fcntl - import os -+import platform - from select import select - import struct - import time -@@ -23,7 +25,10 @@ from scapy.supersocket import SuperSocket - from scapy.compat import raw - - --if FREEBSD or NETBSD: -+if FREEBSD: -+ # 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,8 +265,21 @@ class L2bpfListenSocket(_L2bpfSocket): - return - - # Extract useful information from the BPF header -- if FREEBSD or NETBSD: -- # struct bpf_xhdr or struct bpf_hdr32 -+ if FREEBSD: -+ # Unless we set BIOCSTSTAMP to something different than BPF_T_MICROTIME -+ # we will get bpf_hdr on FreeBSD, which means that we'll get a -+ # struct timeval, which is time_t, suseconds_t. -+ # On i386 time_t still is 32bit so the bh_tstamp will only be 8 bytes. -+ # We really want to set BIOCSTSTAMP to BPF_T_NANOTIME and be done with this -+ # and it always be 16? -+ if platform.machine() == "i386": -+ # struct bpf_hdr -+ bh_tstamp_offset = 8 -+ else: -+ # struct bpf_hdr (64bit time_t) or struct bpf_xhdr -+ bh_tstamp_offset = 16 -+ elif NETBSD: -+ # struct bpf_hdr or struct bpf_hdr32 - bh_tstamp_offset = 16 - else: - # struct bpf_hdr Property changes on: head/net/scapy/files/patch-i386 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/scapy/Makefile =================================================================== --- head/net/scapy/Makefile (revision 550634) +++ head/net/scapy/Makefile (revision 550635) @@ -1,75 +1,75 @@ # Created by: vanhu # $FreeBSD$ PORTNAME= scapy -PORTVERSION= 2.4.3 -PORTREVISION= 3 +PORTVERSION= 2.4.4 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bofh@FreeBSD.org COMMENT= Powerful interactive packet manipulation program in python LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libdnet>0:net/py-libdnet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes OPTIONS_DEFINE= GRAPH IPYTHON P0F_BASE MANUF MATPLOT NMAP PYCRYPTO PYX QUESO_BASE SOX GRAPH_DESC= graph generation and visualization IPYTHON_DESC= Use IPython (enhanced interactive shell) MANUF_DESC= wireshark's MANUF MAC database MATPLOT_DESC= Install python matplotlibs NMAP_DESC= nmap OS signatures database P0F_BASE_DESC= p0f OS signatures database PYCRYPTO_DESC= Use py-crypto for WEP decoding PYX_DESC= PostScript and PDF graphs drawing QUESO_BASE_DESC=queso OS signatures database SOX_DESC= Support for VoIP GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick6 \ ${LOCALBASE}/bin/dot:graphics/graphviz NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:security/nmap MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} PYX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyx>0:graphics/py-pyx@${PY_FLAVOR} QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:net/queso SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:audio/sox .include .if ${PORT_OPTIONS:MPYX} USES+= python:3.4+ .else USES+= python .endif .include .if ${PORT_OPTIONS:MIPYTHON} .if ${FLAVOR:Mpy27} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipython5>0:devel/ipython5@${PY_FLAVOR} .else RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} .endif .endif post-patch: @${REINPLACE_CMD} "s,share/man/man1,man/man1," ${WRKSRC}/setup.py @${REINPLACE_CMD} "s,pdflatex,pdftex," ${WRKSRC}/scapy/extlib.py @${REINPLACE_CMD} "s,/usr/share/,${LOCALBASE}/share/," \ ${WRKSRC}/scapy/modules/nmap.py @${REINPLACE_CMD} "s,/etc/,${LOCALBASE}/etc/," \ ${WRKSRC}/scapy/modules/p0f.py @${REINPLACE_CMD} 's|"use" in line|"use" in line or "nhop" in line|' \ ${WRKSRC}/scapy/arch/unix.py .include Index: head/net/scapy/distinfo =================================================================== --- head/net/scapy/distinfo (revision 550634) +++ head/net/scapy/distinfo (revision 550635) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568196750 -SHA256 (scapy-2.4.3.tar.gz) = e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 -SIZE (scapy-2.4.3.tar.gz) = 905334 +TIMESTAMP = 1599950267 +SHA256 (scapy-2.4.4.tar.gz) = ecfd7a14cd9c3ef0eb08d28d5bb71d97219edff1454ccbdff229f676b27900ee +SIZE (scapy-2.4.4.tar.gz) = 1039342