Pullup ticket 1459 - requested by tron

security update for ethereal

Revisions pulled up:
- pkgsrc/net/ethereal/Makefile			1.129
- pkgsrc/net/ethereal/PLIST			1.25
- pkgsrc/net/ethereal/distinfo			1.50
- pkgsrc/net/ethereal/patches/patch-aa		removed

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Tue Apr 25 10:04:20 UTC 2006

   Modified Files:
   	pkgsrc/net/ethereal: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/net/ethereal/patches: patch-aa

   Log Message:
   Update "ethereal" package to version 0.99.0.
   Changes since version 0.10.14 include:
   - security fixes for problems discovered by a Coverity scan
   - new utility "dumpcap" for capturing packets from a live network and
     writing them to a file has been added.
   - support for ACP133, E.212, Nortel LGE Monitor and OICQ protocols

4 files changed, 11 insertions, 36 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index b9c697bcc85..0a42d4b0607 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.127 2006/03/08 04:39:20 minskim Exp $
+# $NetBSD: Makefile,v 1.127.2.1 2006/04/25 12:28:11 salo Exp $
 
-DISTNAME=		ethereal-0.10.14
-PKGREVISION=		3
+DISTNAME=		ethereal-0.99.0
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index a66fa0e4635..ab1268db779 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.24 2006/01/02 22:34:34 salo Exp $
+@comment $NetBSD: PLIST,v 1.24.2.1 2006/04/25 12:28:11 salo Exp $
 bin/capinfos
 bin/dftest
+bin/dumpcap
 bin/editcap
 bin/ethereal
 bin/idl2eth
@@ -38,6 +39,7 @@ lib/ethereal/plugins/${PKGVERSION}/v5ua.la
 lib/libethereal.la
 lib/libwiretap.la
 man/man1/capinfos.1
+man/man1/dumpcap.1
 man/man1/editcap.1
 man/man1/ethereal.1
 man/man1/idl2eth.1
@@ -62,6 +64,7 @@ share/ethereal/dtds/dc.dtd
 share/ethereal/dtds/itunes.dtd
 share/ethereal/dtds/rss.dtd
 share/ethereal/dtds/smil.dtd
+share/ethereal/dumpcap.html
 share/ethereal/editcap.html
 share/ethereal/ethereal-filter.html
 share/ethereal/ethereal.html
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index cf9b7dd8b93..726828e1c43 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.49 2006/01/02 22:34:34 salo Exp $
+$NetBSD: distinfo,v 1.49.2.1 2006/04/25 12:28:11 salo Exp $
+
+SHA1 (ethereal-0.99.0.tar.bz2) = 466299ac49f21904ed91b93e81667f226637e868
+RMD160 (ethereal-0.99.0.tar.bz2) = f86e21ae60d53e1ed60b61e58c2941ecfd4d8696
+Size (ethereal-0.99.0.tar.bz2) = 8884587 bytes
 
-SHA1 (ethereal-0.10.14.tar.bz2) = 95f63a8ebb93056f7e107ad1343754c43fae643c
-RMD160 (ethereal-0.10.14.tar.bz2) = 1c11c43a1ceebb5a82dc920ca30b370ec73a1d23
-Size (ethereal-0.10.14.tar.bz2) = 8583324 bytes
-SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
deleted file mode 100644
index 5ce45042d08..00000000000
--- a/net/ethereal/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2005/07/13 10:01:53 drochner Exp $
-
---- epan/dissectors/packet-radiotap.c.orig	2005-07-12 17:36:14.000000000 +0200
-+++ epan/dissectors/packet-radiotap.c
-@@ -397,6 +397,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	    offset++;
- 	    break;
- 	case IEEE80211_RADIOTAP_CHANNEL:
-+	    offset = (offset + 1) & ~1;
- 	    if (tree) {
- 		freq = tvb_get_letohs(tvb, offset);
- 		flags = tvb_get_letohs(tvb, offset+2);
-@@ -412,12 +413,14 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	case IEEE80211_RADIOTAP_LOCK_QUALITY:
- 	case IEEE80211_RADIOTAP_TX_ATTENUATION:
- 	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-+	    offset = (offset + 1) & ~1;
- #if 0
- 	    tvb_get_letohs(tvb, offset);
- #endif
- 	    offset+=2;
- 	    break;
- 	case IEEE80211_RADIOTAP_TSFT:
-+	    offset = (offset + 7) & ~7;
- 	    if (tree) {
- 		proto_tree_add_item(radiotap_tree, hf_radiotap_mactime,
- 				    tvb, offset, 8, FALSE);