dpkg-1.8:

        - fix a typo in vrrp.py
        - fix IPv4 and IPv6 packet to correctly handle zero payload length
        - store cipher_suite as int in TLSServerHello to allow app-specific messages
        - improve SSL parsing

dpkt-1.7:
        - handle dynamic imports from py2exe/freeze.py/zipped egg
          packages, from plotnikoff
        - decode Ethernet MPLS labels, Cisco ISL VLAN tags, 802.2 LLC fields
        - handle multiply-defined HTTP headers from simdream
        - add IPv6 extension header support (minus ESP)
        - add radiotap module
        - add IEEE80211 module
        - add RFB module
        - fix IP6 checksum to include options
        - rename 'as' to 'asn' field in BGP header
        - fix transport-layer checksum in IP6
        - handle improper TCP header offset
        - fix SSL typo
        - handle malformed ICMP headers
        - added RX module
        - fixed loopback module IP/IP6 decoding
        - set transport-layer (TCP, UDP) checksum in IP
        - MRT module fixes
        - fix pcap.Writer timestamp calculation

4 files changed, 29 insertions, 43 deletions

diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile
index e77f90e3810..4aa3f153f83 100644
--- a/net/py-dpkt/Makefile
+++ b/net/py-dpkt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 17:19:02 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/16 08:50:42 pettai Exp $
 #
 
-DISTNAME=	dpkt-1.6
-PKGNAME=	${PYPKGPREFIX}-dpkt-1.6
+DISTNAME=	dpkt-1.8
+PKGNAME=	${PYPKGPREFIX}-dpkt-1.8
 CATEGORIES=	net python
 MASTER_SITES=	http://dpkt.googlecode.com/files/
 
diff --git a/net/py-dpkt/PLIST b/net/py-dpkt/PLIST
index 8988a6ba31b..2d1cd0ef50b 100644
--- a/net/py-dpkt/PLIST
+++ b/net/py-dpkt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/11 11:31:19 pettai Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 08:50:42 pettai Exp $
 ${PYSITELIB}/dpkt/__init__.py
 ${PYSITELIB}/dpkt/__init__.pyc
 ${PYSITELIB}/dpkt/__init__.pyo
@@ -65,6 +65,9 @@ ${PYSITELIB}/dpkt/icmp.pyo
 ${PYSITELIB}/dpkt/icmp6.py
 ${PYSITELIB}/dpkt/icmp6.pyc
 ${PYSITELIB}/dpkt/icmp6.pyo
+${PYSITELIB}/dpkt/ieee80211.py
+${PYSITELIB}/dpkt/ieee80211.pyc
+${PYSITELIB}/dpkt/ieee80211.pyo
 ${PYSITELIB}/dpkt/igmp.py
 ${PYSITELIB}/dpkt/igmp.pyc
 ${PYSITELIB}/dpkt/igmp.pyo
@@ -77,6 +80,9 @@ ${PYSITELIB}/dpkt/ip6.pyo
 ${PYSITELIB}/dpkt/ipx.py
 ${PYSITELIB}/dpkt/ipx.pyc
 ${PYSITELIB}/dpkt/ipx.pyo
+${PYSITELIB}/dpkt/llc.py
+${PYSITELIB}/dpkt/llc.pyc
+${PYSITELIB}/dpkt/llc.pyo
 ${PYSITELIB}/dpkt/loopback.py
 ${PYSITELIB}/dpkt/loopback.pyc
 ${PYSITELIB}/dpkt/loopback.pyo
@@ -113,9 +119,15 @@ ${PYSITELIB}/dpkt/pppoe.pyo
 ${PYSITELIB}/dpkt/qq.py
 ${PYSITELIB}/dpkt/qq.pyc
 ${PYSITELIB}/dpkt/qq.pyo
+${PYSITELIB}/dpkt/radiotap.py
+${PYSITELIB}/dpkt/radiotap.pyc
+${PYSITELIB}/dpkt/radiotap.pyo
 ${PYSITELIB}/dpkt/radius.py
 ${PYSITELIB}/dpkt/radius.pyc
 ${PYSITELIB}/dpkt/radius.pyo
+${PYSITELIB}/dpkt/rfb.py
+${PYSITELIB}/dpkt/rfb.pyc
+${PYSITELIB}/dpkt/rfb.pyo
 ${PYSITELIB}/dpkt/rip.py
 ${PYSITELIB}/dpkt/rip.pyc
 ${PYSITELIB}/dpkt/rip.pyo
@@ -125,6 +137,9 @@ ${PYSITELIB}/dpkt/rpc.pyo
 ${PYSITELIB}/dpkt/rtp.py
 ${PYSITELIB}/dpkt/rtp.pyc
 ${PYSITELIB}/dpkt/rtp.pyo
+${PYSITELIB}/dpkt/rx.py
+${PYSITELIB}/dpkt/rx.pyc
+${PYSITELIB}/dpkt/rx.pyo
 ${PYSITELIB}/dpkt/sccp.py
 ${PYSITELIB}/dpkt/sccp.pyc
 ${PYSITELIB}/dpkt/sccp.pyo
@@ -140,9 +155,15 @@ ${PYSITELIB}/dpkt/sll.pyo
 ${PYSITELIB}/dpkt/smb.py
 ${PYSITELIB}/dpkt/smb.pyc
 ${PYSITELIB}/dpkt/smb.pyo
+${PYSITELIB}/dpkt/snoop.py
+${PYSITELIB}/dpkt/snoop.pyc
+${PYSITELIB}/dpkt/snoop.pyo
 ${PYSITELIB}/dpkt/ssl.py
 ${PYSITELIB}/dpkt/ssl.pyc
 ${PYSITELIB}/dpkt/ssl.pyo
+${PYSITELIB}/dpkt/ssl_ciphersuites.py
+${PYSITELIB}/dpkt/ssl_ciphersuites.pyc
+${PYSITELIB}/dpkt/ssl_ciphersuites.pyo
 ${PYSITELIB}/dpkt/stp.py
 ${PYSITELIB}/dpkt/stp.pyc
 ${PYSITELIB}/dpkt/stp.pyo
diff --git a/net/py-dpkt/distinfo b/net/py-dpkt/distinfo
index 70f949f96ce..72578f2abc9 100644
--- a/net/py-dpkt/distinfo
+++ b/net/py-dpkt/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/11 11:31:19 pettai Exp $
+$NetBSD: distinfo,v 1.2 2013/06/16 08:50:42 pettai Exp $
 
-SHA1 (dpkt-1.6.tar.gz) = 2a5ee8b44968b38ad4ee15112212ffc0ed2d8a5a
-RMD160 (dpkt-1.6.tar.gz) = e6e5f5a5d439d7c6eb165f5899903c167fd21551
-Size (dpkt-1.6.tar.gz) = 116518 bytes
-SHA1 (patch-aa) = 0e85ce2df69538e65a8a4ac933d63da9c27c14c2
+SHA1 (dpkt-1.8.tar.gz) = 4dd4d8b384177fcfbad3891798ff5779bb39ee2a
+RMD160 (dpkt-1.8.tar.gz) = 6c52dd753897ea10b15b9a67ef0303464bbfc7eb
+Size (dpkt-1.8.tar.gz) = 76311 bytes
diff --git a/net/py-dpkt/patches/patch-aa b/net/py-dpkt/patches/patch-aa
deleted file mode 100644
index 2d7a1f4a5b2..00000000000
--- a/net/py-dpkt/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/03/11 11:31:19 pettai Exp $
-
-# 'as' became a reserved keyword in newer python versions
-#
-
---- dpkt/bgp.py.orig	2010-02-13 21:32:43.000000000 +0100
-+++ dpkt/bgp.py	2010-02-13 21:33:17.000000000 +0100
-@@ -140,7 +140,7 @@
-     class Open(dpkt.Packet):
-         __hdr__ = (
-             ('v', 'B', 4),
--            ('as', 'H', 0),
-+            ('AS', 'H', 0),
-             ('holdtime', 'H', 0),
-             ('identifier', 'I', 0),
-             ('param_len', 'B', 0)
-@@ -675,7 +675,7 @@
-             self.failUnless(a.len == 12)
-             self.failUnless(len(a.communities.list) == 3)
-             c = a.communities.list[0]
--            self.failUnless(c.as == 65215)
-+            self.failUnless(c.AS == 65215)
-             self.failUnless(c.value == 1)
-             r = b2.update.announced[0]
-             self.failUnless(r.len == 22)
-@@ -712,7 +712,7 @@
-             b4 = BGP(self.bgp4)
-             self.failUnless(b4.len == 45)
-             self.failUnless(b4.type == OPEN)
--            self.failUnless(b4.open.as == 237)
-+            self.failUnless(b4.open.AS == 237)
-             self.failUnless(b4.open.param_len == 16)
-             self.failUnless(len(b4.open.parameters) == 3)
-             p = b4.open.parameters[0]