Update to 0.10.3. This release fixes several critical vulnerabilities in

some packet dissectors, you're strongly advised to update.

Changes from 0.10.0:
 => New and updated features
        (in 0.10.3)
      o Display filters now support the bitwise and (&) operator.
      o Protocol hierarchy statistics now have bandwidth columns.
      o The capture dialog has a new layout.
        (in 0.10.2)
      o The user interface has received further updates.  The Statistics
        menu layout has been improved, as well as the capture options dialog
        layout.
        (in 0.10.1)
      o Several updates were made to Ethereal's user interface.  The "File"
        menu now has a "most recently used" list.  The help menu was greatly
        expanded.
      o The "matches" operator now handles more data types.  For example,
        you can now use
                 smtp matches joespammer@example.com
        as a display filter.
      o I/O statistics now support 1ms resolution.

 => Bugs fixed
        (in 0.10.3)
      o http://www.ethereal.com/appnotes/enpa-sa-00013.html

 => Other notes
      o A lot of packet dissectors were either added or updated, as well as
        some capture file formats handlers.

3 files changed, 48 insertions, 19 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 43de60a8f21..bed1a761364 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2004/03/26 02:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2004/03/31 07:03:30 cube Exp $
 #
 
-DISTNAME=		ethereal-0.10.0a
-PKGREVISION=		2
+DISTNAME=		ethereal-0.10.3
+PKGREVISION=		# defined
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.ethereal.com/pub/ethereal/ \
 			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \
@@ -18,7 +18,7 @@ MAINTAINER=		frueauf@NetBSD.org
 HOMEPAGE=		http://www.ethereal.com/
 COMMENT=		Network protocol analyzer
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 USE_PERL5=		build
 
@@ -31,18 +31,18 @@ CONFIGURE_ARGS+=        --enable-static=no
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk2}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
-CONFIGURE_ARGS+=	--with-net-snmp=${BUILDLINK_PREFIX.net-snmp}
+CONFIGURE_ARGS+=	--with-net-snmp
 CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ENV+=		ac_cv_func_pcap_compile_nopcap=no
 
 PTHREAD_OPTS=		require
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../net/libpcap/buildlink2.mk"
-.include "../../net/net-snmp/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../net/net-snmp/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index 81840831b79..1c37d250f3d 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2003/12/15 10:34:33 martti Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/03/31 07:03:30 cube Exp $
 bin/editcap
 bin/ethereal
 bin/idl2eth
@@ -7,20 +7,24 @@ bin/tethereal
 bin/text2pcap
 lib/ethereal/plugins/${PKGVERSION}/acn.la
 lib/ethereal/plugins/${PKGVERSION}/acn.so
-lib/ethereal/plugins/${PKGVERSION}/asn1.la
-lib/ethereal/plugins/${PKGVERSION}/asn1.so
 lib/ethereal/plugins/${PKGVERSION}/artnet.la
 lib/ethereal/plugins/${PKGVERSION}/artnet.so
+lib/ethereal/plugins/${PKGVERSION}/asn1.la
+lib/ethereal/plugins/${PKGVERSION}/asn1.so
 lib/ethereal/plugins/${PKGVERSION}/coseventcomm.la
 lib/ethereal/plugins/${PKGVERSION}/coseventcomm.so
+lib/ethereal/plugins/${PKGVERSION}/ciscosm.la
+lib/ethereal/plugins/${PKGVERSION}/ciscosm.so
 lib/ethereal/plugins/${PKGVERSION}/cosnaming.la
 lib/ethereal/plugins/${PKGVERSION}/cosnaming.so
 lib/ethereal/plugins/${PKGVERSION}/docsis.la
 lib/ethereal/plugins/${PKGVERSION}/docsis.so
-lib/ethereal/plugins/${PKGVERSION}/enttec.so
 lib/ethereal/plugins/${PKGVERSION}/enttec.la
+lib/ethereal/plugins/${PKGVERSION}/enttec.so
 lib/ethereal/plugins/${PKGVERSION}/gryphon.la
 lib/ethereal/plugins/${PKGVERSION}/gryphon.so
+lib/ethereal/plugins/${PKGVERSION}/irda.la
+lib/ethereal/plugins/${PKGVERSION}/irda.so
 lib/ethereal/plugins/${PKGVERSION}/lwres.la
 lib/ethereal/plugins/${PKGVERSION}/lwres.so
 lib/ethereal/plugins/${PKGVERSION}/megaco.la
@@ -29,10 +33,26 @@ lib/ethereal/plugins/${PKGVERSION}/mgcp.la
 lib/ethereal/plugins/${PKGVERSION}/mgcp.so
 lib/ethereal/plugins/${PKGVERSION}/pcli.la
 lib/ethereal/plugins/${PKGVERSION}/pcli.so
-lib/ethereal/plugins/${PKGVERSION}/rdm.so
 lib/ethereal/plugins/${PKGVERSION}/rdm.la
+lib/ethereal/plugins/${PKGVERSION}/rdm.so
+lib/ethereal/plugins/${PKGVERSION}/rlm.la
+lib/ethereal/plugins/${PKGVERSION}/rlm.so
 lib/ethereal/plugins/${PKGVERSION}/rtnet.la
 lib/ethereal/plugins/${PKGVERSION}/rtnet.so
+lib/ethereal/plugins/${PKGVERSION}/rudp.la
+lib/ethereal/plugins/${PKGVERSION}/rudp.so
+lib/ethereal/plugins/${PKGVERSION}/v5ua.la
+lib/ethereal/plugins/${PKGVERSION}/v5ua.so
+lib/libethereal.a
+lib/libethereal.la
+lib/libethereal.so
+lib/libethereal.so.0
+lib/libethereal.so.0.1
+lib/libwiretap.a
+lib/libwiretap.la
+lib/libwiretap.so
+lib/libwiretap.so.0
+lib/libwiretap.so.0.1
 man/man1/editcap.1
 man/man1/ethereal.1
 man/man1/idl2eth.1
@@ -45,8 +65,17 @@ share/ethereal/diameter/dictionary.xml
 share/ethereal/diameter/mobileipv4.xml
 share/ethereal/diameter/nasreq.xml
 share/ethereal/diameter/sunping.xml
+share/ethereal/help/capture_filters.txt
+share/ethereal/help/capturing.txt
+share/ethereal/help/display_filters.txt
+share/ethereal/help/faq.txt
+share/ethereal/help/getting_started.txt
+share/ethereal/help/overview.txt
+share/ethereal/help/toc
+share/ethereal/help/well_known.txt
 share/ethereal/manuf
 @dirrm share/ethereal/diameter
+@dirrm share/ethereal/help
 @dirrm share/ethereal
 @dirrm lib/ethereal/plugins/${PKGVERSION}
 @dirrm lib/ethereal/plugins
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 67eb7ca3599..89ee17c0dea 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2003/12/15 10:34:33 martti Exp $
+$NetBSD: distinfo,v 1.26 2004/03/31 07:03:30 cube Exp $
 
-SHA1 (ethereal-0.10.0a.tar.bz2) = 82c78b4e42aa6e38724b7cd2f4e0f65204ad3324
-Size (ethereal-0.10.0a.tar.bz2) = 4388176 bytes
+SHA1 (ethereal-0.10.3.tar.bz2) = f70def9be75d7232cf40635a6b455b583d54cb8f
+Size (ethereal-0.10.3.tar.bz2) = 4840005 bytes