Changes 2.3.2:

Bug-fix release.

5 files changed, 139 insertions, 21 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index aa37a2e893d..bf149754221 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2016/04/21 12:08:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2016/05/09 11:07:51 adam Exp $
 
-DISTNAME=	scapy-2.2.0
+DISTNAME=	scapy-2.3.2
 CATEGORIES=	net
-MASTER_SITES=	http://www.secdev.org/projects/scapy/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=secdev/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.secdev.org/projects/scapy/
diff --git a/net/scapy/PLIST b/net/scapy/PLIST
index 326936d28bf..00cf8dfeca5 100644
--- a/net/scapy/PLIST
+++ b/net/scapy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/08 20:21:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/05/09 11:07:51 adam Exp $
 bin/UTscapy
 bin/scapy
 ${PYSITELIB}/${EGG_FILE}
@@ -65,6 +65,111 @@ ${PYSITELIB}/scapy/base_classes.pyo
 ${PYSITELIB}/scapy/config.py
 ${PYSITELIB}/scapy/config.pyc
 ${PYSITELIB}/scapy/config.pyo
+${PYSITELIB}/scapy/contrib/HomePlugAV.py
+${PYSITELIB}/scapy/contrib/HomePlugAV.pyc
+${PYSITELIB}/scapy/contrib/HomePlugAV.pyo
+${PYSITELIB}/scapy/contrib/__init__.py
+${PYSITELIB}/scapy/contrib/__init__.pyc
+${PYSITELIB}/scapy/contrib/__init__.pyo
+${PYSITELIB}/scapy/contrib/avs.py
+${PYSITELIB}/scapy/contrib/avs.pyc
+${PYSITELIB}/scapy/contrib/avs.pyo
+${PYSITELIB}/scapy/contrib/bgp.py
+${PYSITELIB}/scapy/contrib/bgp.pyc
+${PYSITELIB}/scapy/contrib/bgp.pyo
+${PYSITELIB}/scapy/contrib/carp.py
+${PYSITELIB}/scapy/contrib/carp.pyc
+${PYSITELIB}/scapy/contrib/carp.pyo
+${PYSITELIB}/scapy/contrib/cdp.py
+${PYSITELIB}/scapy/contrib/cdp.pyc
+${PYSITELIB}/scapy/contrib/cdp.pyo
+${PYSITELIB}/scapy/contrib/chdlc.py
+${PYSITELIB}/scapy/contrib/chdlc.pyc
+${PYSITELIB}/scapy/contrib/chdlc.pyo
+${PYSITELIB}/scapy/contrib/dtp.py
+${PYSITELIB}/scapy/contrib/dtp.pyc
+${PYSITELIB}/scapy/contrib/dtp.pyo
+${PYSITELIB}/scapy/contrib/eigrp.py
+${PYSITELIB}/scapy/contrib/eigrp.pyc
+${PYSITELIB}/scapy/contrib/eigrp.pyo
+${PYSITELIB}/scapy/contrib/etherip.py
+${PYSITELIB}/scapy/contrib/etherip.pyc
+${PYSITELIB}/scapy/contrib/etherip.pyo
+${PYSITELIB}/scapy/contrib/gsm_um.py
+${PYSITELIB}/scapy/contrib/gsm_um.pyc
+${PYSITELIB}/scapy/contrib/gsm_um.pyo
+${PYSITELIB}/scapy/contrib/gtp.py
+${PYSITELIB}/scapy/contrib/gtp.pyc
+${PYSITELIB}/scapy/contrib/gtp.pyo
+${PYSITELIB}/scapy/contrib/icmp_extensions.py
+${PYSITELIB}/scapy/contrib/icmp_extensions.pyc
+${PYSITELIB}/scapy/contrib/icmp_extensions.pyo
+${PYSITELIB}/scapy/contrib/igmp.py
+${PYSITELIB}/scapy/contrib/igmp.pyc
+${PYSITELIB}/scapy/contrib/igmp.pyo
+${PYSITELIB}/scapy/contrib/igmpv3.py
+${PYSITELIB}/scapy/contrib/igmpv3.pyc
+${PYSITELIB}/scapy/contrib/igmpv3.pyo
+${PYSITELIB}/scapy/contrib/ikev2.py
+${PYSITELIB}/scapy/contrib/ikev2.pyc
+${PYSITELIB}/scapy/contrib/ikev2.pyo
+${PYSITELIB}/scapy/contrib/isis.py
+${PYSITELIB}/scapy/contrib/isis.pyc
+${PYSITELIB}/scapy/contrib/isis.pyo
+${PYSITELIB}/scapy/contrib/ldp.py
+${PYSITELIB}/scapy/contrib/ldp.pyc
+${PYSITELIB}/scapy/contrib/ldp.pyo
+${PYSITELIB}/scapy/contrib/mpls.py
+${PYSITELIB}/scapy/contrib/mpls.pyc
+${PYSITELIB}/scapy/contrib/mpls.pyo
+${PYSITELIB}/scapy/contrib/openflow.py
+${PYSITELIB}/scapy/contrib/openflow.pyc
+${PYSITELIB}/scapy/contrib/openflow.pyo
+${PYSITELIB}/scapy/contrib/openflow3.py
+${PYSITELIB}/scapy/contrib/openflow3.pyc
+${PYSITELIB}/scapy/contrib/openflow3.pyo
+${PYSITELIB}/scapy/contrib/ospf.py
+${PYSITELIB}/scapy/contrib/ospf.pyc
+${PYSITELIB}/scapy/contrib/ospf.pyo
+${PYSITELIB}/scapy/contrib/ppi.py
+${PYSITELIB}/scapy/contrib/ppi.pyc
+${PYSITELIB}/scapy/contrib/ppi.pyo
+${PYSITELIB}/scapy/contrib/ppi_cace.py
+${PYSITELIB}/scapy/contrib/ppi_cace.pyc
+${PYSITELIB}/scapy/contrib/ppi_cace.pyo
+${PYSITELIB}/scapy/contrib/ppi_geotag.py
+${PYSITELIB}/scapy/contrib/ppi_geotag.pyc
+${PYSITELIB}/scapy/contrib/ppi_geotag.pyo
+${PYSITELIB}/scapy/contrib/ripng.py
+${PYSITELIB}/scapy/contrib/ripng.pyc
+${PYSITELIB}/scapy/contrib/ripng.pyo
+${PYSITELIB}/scapy/contrib/rsvp.py
+${PYSITELIB}/scapy/contrib/rsvp.pyc
+${PYSITELIB}/scapy/contrib/rsvp.pyo
+${PYSITELIB}/scapy/contrib/send.py
+${PYSITELIB}/scapy/contrib/send.pyc
+${PYSITELIB}/scapy/contrib/send.pyo
+${PYSITELIB}/scapy/contrib/skinny.py
+${PYSITELIB}/scapy/contrib/skinny.pyc
+${PYSITELIB}/scapy/contrib/skinny.pyo
+${PYSITELIB}/scapy/contrib/spbm.py
+${PYSITELIB}/scapy/contrib/spbm.pyc
+${PYSITELIB}/scapy/contrib/spbm.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
+${PYSITELIB}/scapy/contrib/vtp.py
+${PYSITELIB}/scapy/contrib/vtp.pyc
+${PYSITELIB}/scapy/contrib/vtp.pyo
+${PYSITELIB}/scapy/contrib/vxlan.py
+${PYSITELIB}/scapy/contrib/vxlan.pyc
+${PYSITELIB}/scapy/contrib/vxlan.pyo
+${PYSITELIB}/scapy/contrib/wpa_eapol.py
+${PYSITELIB}/scapy/contrib/wpa_eapol.pyc
+${PYSITELIB}/scapy/contrib/wpa_eapol.pyo
 ${PYSITELIB}/scapy/crypto/__init__.py
 ${PYSITELIB}/scapy/crypto/__init__.pyc
 ${PYSITELIB}/scapy/crypto/__init__.pyo
@@ -92,6 +197,9 @@ ${PYSITELIB}/scapy/layers/all.pyo
 ${PYSITELIB}/scapy/layers/bluetooth.py
 ${PYSITELIB}/scapy/layers/bluetooth.pyc
 ${PYSITELIB}/scapy/layers/bluetooth.pyo
+${PYSITELIB}/scapy/layers/clns.py
+${PYSITELIB}/scapy/layers/clns.pyc
+${PYSITELIB}/scapy/layers/clns.pyo
 ${PYSITELIB}/scapy/layers/dhcp.py
 ${PYSITELIB}/scapy/layers/dhcp.pyc
 ${PYSITELIB}/scapy/layers/dhcp.pyo
@@ -116,6 +224,9 @@ ${PYSITELIB}/scapy/layers/inet.pyo
 ${PYSITELIB}/scapy/layers/inet6.py
 ${PYSITELIB}/scapy/layers/inet6.pyc
 ${PYSITELIB}/scapy/layers/inet6.pyo
+${PYSITELIB}/scapy/layers/ipsec.py
+${PYSITELIB}/scapy/layers/ipsec.pyc
+${PYSITELIB}/scapy/layers/ipsec.pyo
 ${PYSITELIB}/scapy/layers/ir.py
 ${PYSITELIB}/scapy/layers/ir.pyc
 ${PYSITELIB}/scapy/layers/ir.pyo
@@ -209,6 +320,9 @@ ${PYSITELIB}/scapy/modules/voip.pyo
 ${PYSITELIB}/scapy/packet.py
 ${PYSITELIB}/scapy/packet.pyc
 ${PYSITELIB}/scapy/packet.pyo
+${PYSITELIB}/scapy/pipetool.py
+${PYSITELIB}/scapy/pipetool.pyc
+${PYSITELIB}/scapy/pipetool.pyo
 ${PYSITELIB}/scapy/plist.py
 ${PYSITELIB}/scapy/plist.pyc
 ${PYSITELIB}/scapy/plist.pyo
@@ -221,6 +335,9 @@ ${PYSITELIB}/scapy/route.pyo
 ${PYSITELIB}/scapy/route6.py
 ${PYSITELIB}/scapy/route6.pyc
 ${PYSITELIB}/scapy/route6.pyo
+${PYSITELIB}/scapy/scapypipes.py
+${PYSITELIB}/scapy/scapypipes.pyc
+${PYSITELIB}/scapy/scapypipes.pyo
 ${PYSITELIB}/scapy/sendrecv.py
 ${PYSITELIB}/scapy/sendrecv.pyc
 ${PYSITELIB}/scapy/sendrecv.pyo
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index c5159370ac3..c4e08b5da7c 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2016/04/21 12:08:29 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2016/05/09 11:07:51 adam Exp $
 
-SHA1 (scapy-2.2.0.tar.gz) = ae0a9947a08a01a84abde9db12fed074ac888e47
-RMD160 (scapy-2.2.0.tar.gz) = 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e
-SHA512 (scapy-2.2.0.tar.gz) = da05deb5dd3bfbd0222659a98e5f01c891e948b9104965e14ca975022b180cd7699ec852357baf229c73321dbe73d9a48c2a14008b7d7a3f0e151914536f7d3a
-Size (scapy-2.2.0.tar.gz) = 972996 bytes
-SHA1 (patch-aa) = 37bb1d60a04604c26a518dc0d13d5df601fd295c
+SHA1 (scapy-2.3.2.tar.gz) = 30ee94f6490371dc60544206d286ae4881987151
+RMD160 (scapy-2.3.2.tar.gz) = f217e70d0806dfcc1ed1961a74f9de437c2b8bdd
+SHA512 (scapy-2.3.2.tar.gz) = 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
+Size (scapy-2.3.2.tar.gz) = 1166056 bytes
+SHA1 (patch-aa) = 28357773231c1a55fffbe2ebf18ec2e5f63a2ae2
 SHA1 (patch-ab) = 12f7c4d0ae505d357692c05de658e393a0526ba1
 SHA1 (patch-ac) = d8ad1882d9b31e65dc3f7636e4caac9377805daf
 SHA1 (patch-ad) = f3647e471ba1168e054a5160d47fb0870243fb4b
-SHA1 (patch-af) = 7dbdecbdfbc5348d0e0f2276113cac88ff766580
+SHA1 (patch-af) = a5bec775992df06d89c296bd6d889ea13d586ead
diff --git a/net/scapy/patches/patch-aa b/net/scapy/patches/patch-aa
index 84f8268bc44..00d412a5d68 100644
--- a/net/scapy/patches/patch-aa
+++ b/net/scapy/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2013/06/15 20:24:19 adam Exp $
+$NetBSD: patch-aa,v 1.6 2016/05/09 11:07:51 adam Exp $
 
---- scapy/arch/__init__.py.orig	2010-08-10 23:09:39.000000000 +0000
+--- 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
+@@ -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')
- 
-@@ -71,7 +72,7 @@ if LINUX:
+ 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 *
diff --git a/net/scapy/patches/patch-af b/net/scapy/patches/patch-af
index 09397a437dd..dfde95e36e4 100644
--- a/net/scapy/patches/patch-af
+++ b/net/scapy/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.2 2011/02/25 15:43:51 drochner Exp $
+$NetBSD: patch-af,v 1.3 2016/05/09 11:07:51 adam Exp $
 
---- test/run_tests.orig	2009-04-13 23:10:43.000000000 +0000
+--- test/run_tests.orig	2016-01-15 13:10:59.000000000 +0000
 +++ test/run_tests
 @@ -1,8 +1,8 @@
- #! /bin/sh
+ #! /bin/bash
  DIR=$(dirname $0)/..
 -if [ "$*" == "" ]
 +if [ "$*" = "" ]
  then
--PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
-+PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
+-PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -l -o /tmp/scapy_regression_test_$(date +%Y%m%d-%H%M%S).html
++PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -l -o /tmp/scapy_regression_test_$(date +%Y%m%d-%H%M%S).html
  else
 -PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py "$@"
 +PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py "$@"