head 1.7; access; symbols pkgsrc-2019Q3:1.6.0.30 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.28 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.26 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.24 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.22 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.20 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.18 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.16 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.14 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.10 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.8 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.6 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.4 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.2 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.5.0.24 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.22 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.20 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.18 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.16 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.14 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.12 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.10 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.8 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.6 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.4 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.2 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.4.0.18 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.16 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.14 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.12 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.10 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.8 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.6 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.2 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.3.0.14 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.12 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.10 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.8 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.6 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.4 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.2 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.2.0.22 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.20 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.12 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.1.1.0.12 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.10 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.8 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.6 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.4 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.2 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2019.11.04.05.48.26; author gutteridge; state dead; branches; next 1.6; commitid JY6GuKX7WaS4MuJB; 1.6 date 2016.05.09.11.07.51; author adam; state Exp; branches; next 1.5; commitid nOp5vmWm6OHgvN5z; 1.5 date 2013.06.15.20.24.19; author adam; state Exp; branches; next 1.4; commitid T6tGLuXO8jwECKTw; 1.4 date 2011.02.25.15.43.51; author drochner; state Exp; branches; next 1.3; 1.3 date 2009.06.09.12.30.02; author hasso; state Exp; branches; next 1.2; 1.2 date 2007.01.03.15.02.51; author adrianp; state Exp; branches; next 1.1; 1.1 date 2005.08.10.13.54.58; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.08.10.13.54.58; author drochner; state Exp; branches; next ; desc @@ 1.7 log @scapy: update to 2.4.3 This latest version of scapy has improved BSD and SunOS support, among other changes. I've continued our DragonFly support, since we were already carrying patches for it. (These should be submitted upstream.) (This also addresses PR pkg/54550, submitted by Gabriel Potter of scapy. Thanks for the reminder, and for all your work on your project!) I have tested a pkgsrc build and scapy regression suite in the following environments: NetBSD 8.1_STABLE with Python 3.6.9 NetBSD 9.99.17 with Python 3.7.5 DragonFly BSD 5.6.2 with Python 3.6.9 OpenIndiana Hipster 2019.04 with Python 3.7.5 Fedora Linux 30 with Python 3.7.5 Significant details from the upstream change summaries: 2.4.3 Main Changes Core 364 commits since v2.4.2 better native support for FreeBSD, NetBSD, OpenBSD Windows: native RAW sockets support, load interfaces/routes using C calls, ... Solaris: fixed support latency improvements sniff() can be used to test BPF fiters on pcap files more unit tests and Python3 compatibility asynchronous sniffing UTScapy vim syntax highlighting drop distutils for setuptools Console / IPython integration improvements Layers Major changes New HTTP (from the deprecated scapy-http module), TLS 1.3, ATA over Ethernet, OVD, IEC 60870-5-104, enip, ... Improved NetflowV9, ISOTP, Zigbee, RTR, BLE, PPI, DNS, LLDP, ... Bluetooth/BTLE rework PPI / 802.11 improvements 2.4.2 Main changes Gabriel Potter is officially part of the Scapy maintainers team PEP08 compliance (see #1277) Speed improvements (see #642) Core 253 merged pull requests since v2.4.0 Python 3.7 support Enhanced Windows support unit testing is now 100% tox based Layers Major changes Many automotive related layers added (ISO-TP...) New EtherCat OPCDA SOCKS USBpcap RPKI Improved MACsec, MQTT, MPLS, DNS, ARP, Dot15d4, Zigbee, Bluetooth4LE, RadioTap ... Enhanced monitor mode support Other addresses a v2.4.0 vulnerability 2.4.0 Main changes Python3 support 85% code coverage Core Pcap/PcapNg improvements enhanced Windows support OpenBSD improvements OSX 802.11 monitor mode Krack AP module iPython support automatically tested on Linux, OSX & Windows ... Layers Major changes TLS (including TLS1.3), X.509 ... New HTTP/2, EAP-TTLS, TACACS, MQTT ... Improved IPv6, SCTP, NTP, PPTP, CDP, BGP, ISIS ... @ text @$NetBSD: patch-aa,v 1.6 2016/05/09 11:07:51 adam Exp $ --- scapy/arch/__init__.py.orig 2016-01-15 13:10:59.000000000 +0000 +++ scapy/arch/__init__.py @@@@ -50,6 +50,7 @@@@ NETBSD=sys.platform.startswith("netbsd") DARWIN=sys.platform.startswith("darwin") SOLARIS=sys.platform.startswith("sunos") WINDOWS=sys.platform.startswith("win32") +DRAGONFLY=sys.platform.startswith("dragonfly") X86_64 = not WINDOWS and (os.uname()[4] == 'x86_64') ARM_64 = not WINDOWS and (os.uname()[4] == 'aarch64') @@@@ -72,7 +73,7 @@@@ if LINUX: from linux import * if scapy.config.conf.use_pcap or scapy.config.conf.use_dnet: from pcapdnet import * -elif OPENBSD or FREEBSD or NETBSD or DARWIN: +elif OPENBSD or FREEBSD or NETBSD or DARWIN or DRAGONFLY: from bsd import * elif SOLARIS: from solaris import * @ 1.6 log @Changes 2.3.2: Bug-fix release. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Changes 2.2.0: This release adds a contrib section filled with old contributions that were not distributed with Scapy yet: CDP, IGMP, MPLS, CHDLC, SLARP, WPA EAPOL, DTP, EIGRP, VQP, BGP, OSPF, VTP RSVP, EtherIP, RIPng, and IKEv2. It fixes some bugs. @ text @d3 1 a3 1 --- scapy/arch/__init__.py.orig 2010-08-10 23:09:39.000000000 +0000 d5 1 a5 1 @@@@ -50,6 +50,7 @@@@ NETBSD = sys.platform.startswith("netbsd d12 2 a13 2 @@@@ -71,7 +72,7 @@@@ if LINUX: @ 1.4 log @update to 2.1.1 This release include many bugfixes, most of them for Windows platforms, thanks mainly to Dirk Loss. There is also VRRP and SCTP protocols suppor thanks to zer0, IPython support. @ text @d3 1 a3 1 --- scapy/arch/__init__.py.orig 2009-09-23 14:27:36.000000000 +0000 d5 1 a5 1 @@@@ -46,6 +46,7 @@@@ NETBSD = sys.platform.startswith("netbsd d13 1 a13 1 @@@@ -67,7 +68,7 @@@@ if LINUX: @ 1.3 log @Update to 2.0.1. Changes are too numerous since 1.0.5 and there is no normal changelog except log in upstream repository. Most notably (at least for me) it adds an IPv6 support. @ text @d3 3 a5 4 --- scapy/arch/__init__.py.orig 2009-06-09 13:03:00 +0300 +++ scapy/arch/__init__.py 2009-06-09 13:03:50 +0300 @@@@ -45,6 +45,7 @@@@ FREEBSD=sys.platform.startswith("freebsd NETBSD = sys.platform.startswith("netbsd") d8 1 d11 1 a11 1 X86_64 = (os.uname()[4] == 'x86_64') d13 1 a13 1 @@@@ -66,7 +67,7 @@@@ if LINUX: @ 1.2 log @Update to 1.0.5 _lots_ of changes In brief: # Revision 1.0.0.7 2005/08/10 20:01:56 pbi # - changed Ether.mysummary() (P. Lalet) # - Update of Sebek protocols (P. Lalet) # Revision 1.0.0.21 2005/09/06 17:05:19 pbi # - new logging/warning facility using the logging module # Revision 1.0.0.24 2005/09/08 14:13:36 pbi # - added RandIP() # Revision 1.0.0.33 2005/09/24 14:29:30 pbi # - completed PrismHeader layer # Revision 1.0.4.98 2006/10/06 16:31:41 pbi # - added additionnal DHCP Options (ticket #11) # Revision 1.0.4.84 2006/09/23 06:52:46 pbi # - improved import_hexcap() to handle more hexdump outputs @ text @d3 4 a6 7 --- scapy.py.orig 2006-10-19 16:58:09.000000000 +0100 +++ scapy.py @@@@ -1829,6 +1829,7 @@@@ except ImportError: LINUX=sys.platform.startswith("linux") OPENBSD=sys.platform.startswith("openbsd") FREEBSD=sys.platform.startswith("freebsd") +NETBSD=sys.platform.startswith("netbsd") d8 3 a10 1 BIG_ENDIAN= struct.pack("H",1) == "\x00\x01" a11 17 @@@@ -2006,7 +2007,7 @@@@ except IOError: ETHER_TYPES={} try: - f=open("/etc/ethertypes") + f=open("@@PKG_SYSCONFDIR@@/ethertypes") for l in f: try: if l[0] in ["#","\n"]: @@@@ -2446,8 +2447,8 @@@@ if PCAP: def get_working_if(): try: return pcap.lookupdev() - except pcap.pcapc.EXCEPTION: - return 'lo' + except: + return 'lo0' d13 9 a21 2 def attach_filter(s, filter): warning("attach_filter() should not be called in PCAP mode") @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- scapy.py.orig 2005-08-09 20:30:34.000000000 +0200 d5 1 a5 9 @@@@ -1,4 +1,4 @@@@ -#! /usr/bin/env python +#!/usr/pkg/bin/python2.3 ############################################################################# ## ## @@@@ -888,7 +888,7 @@@@ except ImportError: d7 16 a22 6 -OPENBSD=sys.platform.startswith("openbsd") +OPENBSD=sys.platform.startswith("openbsd") or sys.platform.startswith("netbsd") if LINUX: DNET=PCAP=0 @@@@ -1357,8 +1357,8 @@@@ if PCAP: a32 44 @@@@ -6298,9 +6298,10 @@@@ class L3dnetSocket(SuperSocket): warning("Unable to guess datalink type (interface=%s linktype=%i). Using Ethernet" % (self.iface, ll)) cls = Ether - pkt = None - while pkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout - pkt = self.ins.next()[1] + trypkt = None + while trypkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout + trypkt = self.ins.next() + pkt = trypkt[1] try: pkt = cls(pkt) @@@@ -6342,9 +6343,11 @@@@ class L2dnetSocket(SuperSocket): warning("Unable to guess datalink type (interface=%s linktype=%i). Using Ethernet" % (self.iface, ll)) cls = Ether - pkt = None - while pkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout - pkt = self.ins.next()[1] + trypkt = None + while trypkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout + trypkt = self.ins.next() + pkt = trypkt[1] + try: pkt = cls(pkt) except: @@@@ -6399,9 +6402,11 @@@@ class L2pcapListenSocket(SuperSocket): warning("Unable to guess datalink type (interface=%s linktype=%i). Using Ethernet" % (self.iface, ll)) cls = Ether - pkt = None - while pkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout - pkt = self.ins.next()[1] + trypkt = None + while trypkt is None: ## This fix a probable bug in libpcap/wrapper, that returns None while there is no read timeout + trypkt = self.ins.next() + pkt = trypkt[1] + try: pkt = cls(pkt) except: @ 1.1.1.1 log @add scapy-1.0.0, a Python shell for network packet construction, injection and capture @ text @@