Ethereal 0.9.16:

  This release fixes potential security issues with the GTP, ISAKMP,
  MEGACO, and SOCKS dissectors.

New and updated features
  Ethereal has leapt forward into the 90's and added a toolbar.

  Ethereal and Tethereal can now force the data link type of captured
  frames.

  RTP analysis has been enhanced.

  Individual frames can now be marked as time references

  Service response time and general I/O statistics have been enhanced.  I/O
  statistics can now calculate client load (experimental).

New protocol support
  ACN, ALCAP, ANSI MAP, ASN.1 BER, BSSAP, DCE/RPC DRSUAPI, DCE/RPC
  INITSHUTDOWN, DCE/RPC RS_BIND, FC-SP, FICON, GSM BSSMAP, GSM DTAP, GSM
  SMS TPDU, GSM SMS, GSM SS, H.450, IOS 4.0.1 IS-637-A (SMS), IS-683-A
  (OTA), T.38, TCAP, TPCP

Updated protocol support
  AODV, ASN.1 PER, BSSGP, CDP, Cisco HDLC, COPS, DCE/RPC BROWSER, DCE/RPC
  DNSSERVER, DCE/RPC EPM, DCE/RPC LSA, DCE/RPC Messenger, DCE/RPC REG,
  DCE/RPC SVCCTL, DCE/RPC, DFS, DHCPv6, DOCSIS, EAPOL, ENIP, Frame Relay,
  FTP, GPRS, Gryphon, GTP, H.225, H.245, HTTP, ICMP, IEEE 802.11, IPX,
  ISAKMP, ISUP, LAPB, Laplink, LWAPP, MAPI, MDSHDR, MEGACO, MPLS, NCP,
  NDPS, NETLOGON, NFS, NTLMSSP, OSPF, OXID, PPP, Q.931, Q.933, RANAP, RIP,
  RTP, SAMR, SCCP, SCSI, SCTP, SDP, SIP, SMB, SMPP, SNMP, SOCKS, SONMP,
  SPOOLSS SRVLOC, SRVSVC, T.35, TACACS+, TAPI, TCP, TZSP, WKSSVC, WSP,
  X.25, Yahoo! Messenger

Updated capture file support
  Linux Bluez Bluetooth hcidump support has been added.

  Endace ERF and Network Instruments Observer, and NetXRay support has
  been enhanced.

4 files changed, 25 insertions, 6 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index e1d5579cd0e..cdc7678467b 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2003/09/16 21:01:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.85 2003/11/04 12:49:25 adam Exp $
 #
 
-DISTNAME=		ethereal-0.9.15
+DISTNAME=		ethereal-0.9.16
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.ethereal.com/pub/ethereal/ \
 			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index af00c12e6ce..2c24a1a83c7 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2003/09/16 21:01:08 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/11/04 12:49:25 adam Exp $
 bin/editcap
 bin/ethereal
 bin/idl2eth
 bin/mergecap
 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}/coseventcomm.la
@@ -31,6 +35,7 @@ man/man1/idl2eth.1
 man/man1/mergecap.1
 man/man1/tethereal.1
 man/man1/text2pcap.1
+man/man4/ethereal-filter.4
 share/ethereal/diameter/dictionary.dtd
 share/ethereal/diameter/dictionary.xml
 share/ethereal/diameter/mobileipv4.xml
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index deaa523a861..ed838ddc673 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.22 2003/09/16 21:01:09 xtraeme Exp $
+$NetBSD: distinfo,v 1.23 2003/11/04 12:49:25 adam Exp $
 
-SHA1 (ethereal-0.9.15.tar.bz2) = fc828a105dae1a8693bc7a6b2780504626aa05c7
-Size (ethereal-0.9.15.tar.bz2) = 4019718 bytes
+SHA1 (ethereal-0.9.16.tar.bz2) = 65c9d7b6a9a677592e0420e607e9a0d7e7928d79
+Size (ethereal-0.9.16.tar.bz2) = 4288070 bytes
+SHA1 (patch-aa) = 411fa4498f4564db37ff890625ead2a8a2d1b259
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
new file mode 100644
index 00000000000..06ae29a134b
--- /dev/null
+++ b/net/ethereal/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.9 2003/11/04 12:49:25 adam Exp $
+
+--- tethereal.c.orig	2003-11-04 13:30:48.000000000 +0100
++++ tethereal.c
+@@ -1394,7 +1394,7 @@ main(int argc, char *argv[])
+       fprintf(stderr, "tethereal: %s\n", dfilter_error_msg);
+       epan_cleanup();
+ #ifdef HAVE_PCAP_COMPILE_NOPCAP
+-      if (pcap_compile_nopcap(DLT_EN10MB, 0, &fcode, rfilter, 0, 0) != -1) {
++      if (pcap_compile_nopcap(DLT_EN10MB, 0, &fcode, rfilter, 0, 0, err_str) != -1) {
+         fprintf(stderr,
+           "  Note: This display filter code looks like a valid capture filter;\n"
+           "        maybe you mixed them up?\n");