update to 0.99.6

changes:
-security fixes for the HTTP, DCP ETSI, SSL, DHCP, and MMS dissectors
 (crashes, resource exhaustion, off-by-one)
-GUI/display filter improvements

4 files changed, 12 insertions, 34 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 27fe8799ce3..44a9662e858 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2007/06/05 05:37:32 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/07/06 17:58:09 drochner Exp $
 
-DISTNAME=		wireshark-0.99.5
-PKGREVISION=		1
+DISTNAME=		wireshark-0.99.6
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 35943955bb4..218776b32c5 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/03 18:06:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/07/06 17:58:09 drochner Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -23,9 +23,10 @@ lib/wireshark/plugins/${PKGVERSION}/gryphon.la
 lib/wireshark/plugins/${PKGVERSION}/h223.la
 lib/wireshark/plugins/${PKGVERSION}/irda.la
 lib/wireshark/plugins/${PKGVERSION}/lwres.la
+lib/wireshark/plugins/${PKGVERSION}/m2m.la
 lib/wireshark/plugins/${PKGVERSION}/mate.la
-lib/wireshark/plugins/${PKGVERSION}/megaco.la
 lib/wireshark/plugins/${PKGVERSION}/mgcp.la
+lib/wireshark/plugins/${PKGVERSION}/opcua.la
 lib/wireshark/plugins/${PKGVERSION}/opsi.la
 lib/wireshark/plugins/${PKGVERSION}/parlay.la
 lib/wireshark/plugins/${PKGVERSION}/pcli.la
@@ -37,6 +38,7 @@ lib/wireshark/plugins/${PKGVERSION}/sbus.la
 lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
 lib/wireshark/plugins/${PKGVERSION}/tango.la
 lib/wireshark/plugins/${PKGVERSION}/v5ua.la
+lib/wireshark/plugins/${PKGVERSION}/wimax.la
 man/man1/capinfos.1
 man/man1/dumpcap.1
 man/man1/editcap.1
@@ -56,6 +58,7 @@ share/wireshark/diameter/TGPPSh.xml
 share/wireshark/diameter/chargecontrol.xml
 share/wireshark/diameter/dictionary.dtd
 share/wireshark/diameter/dictionary.xml
+share/wireshark/diameter/gqpolicy.xml
 share/wireshark/diameter/imscxdx.xml
 share/wireshark/diameter/mobileipv4.xml
 share/wireshark/diameter/nasreq.xml
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 20233760e59..baeb9f24b7b 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/02/07 17:15:24 tron Exp $
+$NetBSD: distinfo,v 1.8 2007/07/06 17:58:09 drochner Exp $
 
-SHA1 (wireshark-0.99.5.tar.bz2) = ec9a07f13d5cda3d310d8c8900362f7cb96f4042
-RMD160 (wireshark-0.99.5.tar.bz2) = 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809
-Size (wireshark-0.99.5.tar.bz2) = 11007039 bytes
-SHA1 (patch-aa) = 605db7ae5682acbee96a7a8b9c39dbc1dc8366f2
+SHA1 (wireshark-0.99.6.tar.bz2) = 91f57158a75adca36c79c35525eb3cf57b927075
+RMD160 (wireshark-0.99.6.tar.bz2) = 7c69e71e54d521d942bcbad9894547d9785f0948
+Size (wireshark-0.99.6.tar.bz2) = 11826043 bytes
+SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa
deleted file mode 100644
index 3d1ade0ad48..00000000000
--- a/net/wireshark/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2007/02/07 17:15:24 tron Exp $
-
-Fix for GCC 3.3.x build problem taken from the SVN repository:
-
-http://anonsvn.wireshark.org/viewvc/viewvc.py/trunk/tools/lemon/lemon.c?r1=20452&r2=20737&pathrev=20737&view=patch
-
-Details of the problem are document here:
-
-http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1357
-
---- tools/lemon/lemon.c	2007/01/16 16:41:12	20452
-+++ tools/lemon/lemon.c	2007/02/07 16:08:19	20737
-@@ -3247,7 +3247,10 @@
-   for(i=0; i<rp->nrhs; i++) used[i] = 0;
-   lhsused = 0;
- 
--  if (!rp->code) rp->code = "\n";
-+  if (!rp->code) {
-+	  rp->code = "\n";
-+	  rp->line = rp->ruleline;
-+  }
-   
-   append_str(0,0,0,0);
-   for(cp=rp->code; *cp; cp++){