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.

8 files changed, 73 insertions, 50 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 1f0b6c7d882..8638d9cdb69 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2011/02/25 09:47:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2011/02/25 15:43:51 drochner Exp $
 #
 
-DISTNAME=		scapy-2.0.1
-PKGREVISION=		1
+DISTNAME=		scapy-2.1.1
 CATEGORIES=		net
 MASTER_SITES=		http://www.secdev.org/projects/scapy/files/
 
@@ -34,6 +33,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/scapy
 	${INSTALL_DATA} ${WRKSRC}/ethertypes ${DESTDIR}${PREFIX}/share/examples/scapy/
 
+do-test:
+	cd ${WRKSRC}/test && ${SETENV} PYTHON=${PYTHONBIN} ./run_tests
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/scapy/PLIST b/net/scapy/PLIST
index 60e314b9d92..06702ab944e 100644
--- a/net/scapy/PLIST
+++ b/net/scapy/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:42 joerg Exp $
-bin/scapy
+@comment $NetBSD: PLIST,v 1.5 2011/02/25 15:43:51 drochner Exp $
 bin/UTscapy
+bin/scapy
 ${PYSITELIB}/scapy/__init__.py
 ${PYSITELIB}/scapy/__init__.pyc
 ${PYSITELIB}/scapy/__init__.pyo
@@ -28,6 +28,9 @@ ${PYSITELIB}/scapy/arch/solaris.pyo
 ${PYSITELIB}/scapy/arch/unix.py
 ${PYSITELIB}/scapy/arch/unix.pyc
 ${PYSITELIB}/scapy/arch/unix.pyo
+${PYSITELIB}/scapy/arch/windows/__init__.py
+${PYSITELIB}/scapy/arch/windows/__init__.pyc
+${PYSITELIB}/scapy/arch/windows/__init__.pyo
 ${PYSITELIB}/scapy/as_resolvers.py
 ${PYSITELIB}/scapy/as_resolvers.pyc
 ${PYSITELIB}/scapy/as_resolvers.pyo
@@ -61,6 +64,12 @@ ${PYSITELIB}/scapy/base_classes.pyo
 ${PYSITELIB}/scapy/config.py
 ${PYSITELIB}/scapy/config.pyc
 ${PYSITELIB}/scapy/config.pyo
+${PYSITELIB}/scapy/crypto/__init__.py
+${PYSITELIB}/scapy/crypto/__init__.pyc
+${PYSITELIB}/scapy/crypto/__init__.pyo
+${PYSITELIB}/scapy/crypto/cert.py
+${PYSITELIB}/scapy/crypto/cert.pyc
+${PYSITELIB}/scapy/crypto/cert.pyo
 ${PYSITELIB}/scapy/dadict.py
 ${PYSITELIB}/scapy/dadict.pyc
 ${PYSITELIB}/scapy/dadict.pyo
@@ -151,6 +160,9 @@ ${PYSITELIB}/scapy/layers/rip.pyo
 ${PYSITELIB}/scapy/layers/rtp.py
 ${PYSITELIB}/scapy/layers/rtp.pyc
 ${PYSITELIB}/scapy/layers/rtp.pyo
+${PYSITELIB}/scapy/layers/sctp.py
+${PYSITELIB}/scapy/layers/sctp.pyc
+${PYSITELIB}/scapy/layers/sctp.pyo
 ${PYSITELIB}/scapy/layers/sebek.py
 ${PYSITELIB}/scapy/layers/sebek.pyc
 ${PYSITELIB}/scapy/layers/sebek.pyo
@@ -166,6 +178,9 @@ ${PYSITELIB}/scapy/layers/snmp.pyo
 ${PYSITELIB}/scapy/layers/tftp.py
 ${PYSITELIB}/scapy/layers/tftp.pyc
 ${PYSITELIB}/scapy/layers/tftp.pyo
+${PYSITELIB}/scapy/layers/vrrp.py
+${PYSITELIB}/scapy/layers/vrrp.pyc
+${PYSITELIB}/scapy/layers/vrrp.pyo
 ${PYSITELIB}/scapy/layers/x509.py
 ${PYSITELIB}/scapy/layers/x509.pyc
 ${PYSITELIB}/scapy/layers/x509.pyo
@@ -196,6 +211,9 @@ ${PYSITELIB}/scapy/packet.pyo
 ${PYSITELIB}/scapy/plist.py
 ${PYSITELIB}/scapy/plist.pyc
 ${PYSITELIB}/scapy/plist.pyo
+${PYSITELIB}/scapy/pton_ntop.py
+${PYSITELIB}/scapy/pton_ntop.pyc
+${PYSITELIB}/scapy/pton_ntop.pyo
 ${PYSITELIB}/scapy/route.py
 ${PYSITELIB}/scapy/route.pyc
 ${PYSITELIB}/scapy/route.pyo
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index e08f49221d2..4f4ffb194f1 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: distinfo,v 1.4 2011/02/25 15:43:51 drochner Exp $
 
-SHA1 (scapy-2.0.1.tar.gz) = fceb4e60fbea0f2ce8ed258957a5eca1baa05ac5
-RMD160 (scapy-2.0.1.tar.gz) = a4af2137458ad4ffa573ed81303506fdceefbc95
-Size (scapy-2.0.1.tar.gz) = 864953 bytes
-SHA1 (patch-aa) = e907b1c766ba6a64f954233feec0fdeb769c94c1
+SHA1 (scapy-2.1.1.tar.gz) = c82236970bf93e00d0f5d4d165f410745e648d95
+RMD160 (scapy-2.1.1.tar.gz) = d368795789458344ad771834de7188974a4db252
+Size (scapy-2.1.1.tar.gz) = 1924541 bytes
+SHA1 (patch-aa) = 5a54f2878848cb66511282719d7f941fc4da6700
 SHA1 (patch-ab) = 3d32f4e010180ebe9f9309877c1822f53c247151
-SHA1 (patch-ac) = 1c0634074839c32caa1a58c5a36fcc0d53c3f29a
-SHA1 (patch-ad) = 58df904f26ea1af8b5c31892c267fe97394f809b
-SHA1 (patch-ae) = b680833e3925f7c076e12998cb051e6dac7e9375
-SHA1 (patch-af) = 030753df92458de9e51d690695527ebeb1e55fde
+SHA1 (patch-ac) = 8dd118db16e8c86803ac715475b5e962314d2034
+SHA1 (patch-ad) = e4e41ea79d90121c068e475fdd6fcd0968407071
+SHA1 (patch-ae) = c9e4728e158b02244c50f053fa2a6c64562b4c83
+SHA1 (patch-af) = 7dbdecbdfbc5348d0e0f2276113cac88ff766580
diff --git a/net/scapy/patches/patch-aa b/net/scapy/patches/patch-aa
index 4f4da6dc573..e0889e5dd2a 100644
--- a/net/scapy/patches/patch-aa
+++ b/net/scapy/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-aa,v 1.4 2011/02/25 15:43:51 drochner Exp $
 
---- 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")
+--- scapy/arch/__init__.py.orig	2009-09-23 14:27:36.000000000 +0000
++++ scapy/arch/__init__.py
+@@ -46,6 +46,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 = (os.uname()[4] == 'x86_64')
+ X86_64 = not WINDOWS and (os.uname()[4] == 'x86_64')
  
-@@ -66,7 +67,7 @@ if LINUX:
+@@ -67,7 +68,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-ac b/net/scapy/patches/patch-ac
index 015472c4fd9..fecc7e1410c 100644
--- a/net/scapy/patches/patch-ac
+++ b/net/scapy/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-ac,v 1.2 2011/02/25 15:43:51 drochner Exp $
 
---- scapy/sendrecv.py.orig	2009-06-09 13:06:15 +0300
-+++ scapy/sendrecv.py	2009-06-09 13:06:31 +0300
-@@ -116,7 +116,7 @@ def sndrcv(pks, pkt, timeout = 2, inter 
+--- scapy/sendrecv.py.orig	2009-12-30 22:21:13.000000000 +0000
++++ scapy/sendrecv.py
+@@ -117,7 +117,7 @@ def sndrcv(pks, pkt, timeout = None, int
                                  if remaintime <= 0:
                                      break
                              r = None
--                            if FREEBSD or DARWIN:
-+                            if FREEBSD or DARWIN or DRAGONFLY:
+-                            if arch.FREEBSD or arch.DARWIN:
++                            if arch.FREEBSD or arch.DARWIN or arch.DRAGONFLY:
                                  inp, out, err = select(inmask,[],[], 0.05)
                                  if len(inp) == 0 or pks in inp:
                                      r = pks.nonblock_recv()
diff --git a/net/scapy/patches/patch-ad b/net/scapy/patches/patch-ad
index b18a2f40608..7f71a699681 100644
--- a/net/scapy/patches/patch-ad
+++ b/net/scapy/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-ad,v 1.2 2011/02/25 15:43:51 drochner Exp $
 
---- scapy/data.py.orig	2009-06-09 13:13:15 +0300
-+++ scapy/data.py	2009-06-09 13:13:57 +0300
-@@ -97,7 +97,7 @@ def load_ethertypes(filename):
-         pass
-     return dct
+--- scapy/data.py.orig	2009-09-23 14:27:36.000000000 +0000
++++ scapy/data.py
+@@ -176,7 +176,7 @@ if WINDOWS:
+     MANUFDB = load_manuf(os.environ["ProgramFiles"] + "\\wireshark\\manuf")
+ else:
+     IP_PROTOS=load_protocols("/etc/protocols")
+-    ETHER_TYPES=load_ethertypes("/etc/ethertypes")
++    ETHER_TYPES=load_ethertypes("@PKG_SYSCONFDIR@/ethertypes")
+     TCP_SERVICES,UDP_SERVICES=load_services("/etc/services")
+     MANUFDB = load_manuf("/usr/share/wireshark/wireshark/manuf")
  
--ETHER_TYPES=load_ethertypes("/etc/ethertypes")
-+ETHER_TYPES=load_ethertypes("@PKG_SYSCONFDIR@/ethertypes")
- 
- def load_services(filename):
-     spaces = re.compile("[ \t]+|\n")
diff --git a/net/scapy/patches/patch-ae b/net/scapy/patches/patch-ae
index 419ab3b29ec..b5202b1b990 100644
--- a/net/scapy/patches/patch-ae
+++ b/net/scapy/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-ae,v 1.2 2011/02/25 15:43:51 drochner Exp $
 
---- setup.py.orig	2009-02-09 14:41:39 +0200
-+++ setup.py	2009-06-09 14:33:59 +0300
-@@ -40,7 +40,7 @@ setup(
-     version = '2.0.1', 
-     packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
-     scripts = ['bin/scapy','bin/UTscapy'],
+--- setup.py.orig	2010-04-09 22:42:04.000000000 +0000
++++ setup.py
+@@ -44,7 +44,7 @@ setup(
+     version = '2.1.1',
+     packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
+     scripts = SCRIPTS,
 -    data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
 +    data_files = [('man/man1', ["doc/scapy.1.gz"])],
  
diff --git a/net/scapy/patches/patch-af b/net/scapy/patches/patch-af
index 3333cce655d..09397a437dd 100644
--- a/net/scapy/patches/patch-af
+++ b/net/scapy/patches/patch-af
@@ -1,12 +1,16 @@
-$NetBSD: patch-af,v 1.1 2009/06/09 12:30:02 hasso Exp $
+$NetBSD: patch-af,v 1.2 2011/02/25 15:43:51 drochner Exp $
 
---- test/run_tests.orig	2009-06-09 14:35:51 +0300
-+++ test/run_tests	2009-06-09 14:36:08 +0300
-@@ -1,6 +1,6 @@
+--- test/run_tests.orig	2009-04-13 23:10:43.000000000 +0000
++++ test/run_tests
+@@ -1,8 +1,8 @@
  #! /bin/sh
  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 -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
  else
+-PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py "$@"
++PYTHONPATH=$DIR exec ${PYTHON} ${DIR}/scapy/tools/UTscapy.py "$@"
+ fi