Update libtrace to 3.0.4

libtrace 3.0.4 (2008-01-02)
Deprecate wtf:/wag: format. These traces no longer exist.
Cleanup bpf: capture format
add LINUX_SLL header support to get_source_mac()
deprecate trace_get_link() and replace it with the newer
 trace_get_packet_buffer()/trace_get_layer2()
Bug: Don't crash when destroying an output trace that failed to
 initialise
Use Linux's in kernel BPF filter if available
Add support for Cisco HDLC over PoS
Allow BPF bytecode to be used to construct a filter
Code cleanups
Fix libtrace_ip's bitfields
Fix pcapfile output bug
Documentation cleanups
Discard RT packets when writing pcapfile: files
Add a new "stats" example program
Build system cleanups
Avoid using assert() to report errors
RT packet issues
Properly deal with the packet parsing/length cache when using the
 event system
Add a new loss counter framework
Bug: Event framework not generating sleep events when reading traces
 from disk
Be more strict about returning NULL from trace_get_payload_from_X()
 functions

libtrace 3.0.3 (2007-09-05)
Code cleanups w.r.t warnings
tracesplit_dir now provides a warning of the number of packets that had
 an unknown direction at the end of the trace
Fix a segfault in tracereport with rxerrors, non ip
Add support for decoding 802.2 LLC/SNAP and Ethernet II in 802.11 frames
Documentation fixes and clarifications
Fix bug with trace_get_payload_from_80211() and 3 vs 4 frame formats
Deal correctly with uri's with parse errors causing segfaults on cleanup
Minor tidyups to protocol decoders
Add more information to libtracepktdump
Correctly deal with PPP captures
Cache trace_get_capture_length() and trace_get_l3() which are both
 heavily used internally
Build system cleanups
Add a GRE tracepktdump decoder
Add a preliminary PPPoE tracepktdump decoder
Add more information to tracereport
Fix bug in legacy decoder with wire lengths
Fix bug in trace_ether_ntoa
Add legacynzix: trace format
Don't assert() on bad packets (instead return BADPACKET) for erf traces
Add TRACE_OPTION_EVENT_REALTIME to allow the event framework to playback
 traces in realtime
Rename TRACE_META_FREQ to TRACE_OPTION_META_FREQ to follow naming
 convention
Correctly deal with errors when using trace_set_option
Deal better with signals when writing packets to files
Add support for dag 3.x
Improved dag 2.5+ support
dag2.5+ supports setting the snaplen from libtrace
Add support for setting direction on linux int: formats
Consider loopback packets outgoing, not incoming
Fix trace_get_source_mac() for wireless frames
Add support for interfaces_per_input to tracemerge
Fix tracereport direction report
Deprecated wag: and wtf formats

libtrace 3.0.2 (2007-04-27)
Fixed make install for libpacketdump
Add support for tsh: and rf+ tracefiles.
Update support for radiotap
Add a new tool traceflow(1)
More correctly deal with pcap LINKTYPE's vs DLT's
Major cleanups of tracereport
libpacketdump Decoder cleanups
trace_event() memory leak fixes
Fix segfaults with bad arguments in tracesplit(1)
Don't suffix a number if we are only generating one file
Support snapping packets
Minor bugs in libtrace error handling
Misc cleanups and bug fixes

libtrace 3.0.1 (2007-03-26)
Added missing manpages to release tarball
Update manpages
Fixed TCP option length calculation in libpacketdump
tracereport has had a massive tidy up
getopt support for disabling/enabling reports.
Documentation cleanups
Fix 0 byte gzwrite(3)'s were causing the compressed file checksum to fail
RT closing issues
Metadata available
tracedump renamed tracepktdump due to naming conflict in debian
Implement better PoS decoding in libtrace for erf, legacypos.
Build fixes for MacOS

3 files changed, 21 insertions, 11 deletions

diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile
index 621b288f258..8735df187bc 100644
--- a/net/libtrace/Makefile
+++ b/net/libtrace/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/12/27 17:06:11 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/10 10:21:41 markd Exp $
 #
 
-DISTNAME=	libtrace-3.0.0
+DISTNAME=	libtrace-3.0.4
 CATEGORIES=	net
 MASTER_SITES=	http://research.wand.net.nz/software/libtrace/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://research.wand.net.nz/software/libtrace.php
 COMMENT=	Library for trace processing
 
+PKG_DESTDIR_SUPPORT=    user-destdir
+
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
diff --git a/net/libtrace/PLIST b/net/libtrace/PLIST
index 24af3147298..cccdb822ee7 100644
--- a/net/libtrace/PLIST
+++ b/net/libtrace/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/24 14:10:31 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/06/10 10:21:41 markd Exp $
 bin/traceanon
 bin/traceconvert
-bin/tracedump
 bin/tracefilter
+bin/traceflow
 bin/tracemerge
+bin/tracepktdump
 bin/tracereport
 bin/tracertstats
 bin/tracesplit
@@ -17,35 +18,42 @@ include/libtrace.h
 include/libtraceio.h
 include/lt_inttypes.h
 include/rt_protocol.h
-include/wag.h
 lib/libpacketdump.la
 lib/libpacketdump/eth_2048.la
 lib/libpacketdump/eth_2054.la
 lib/libpacketdump/eth_33024.protocol
+lib/libpacketdump/eth_34525.protocol
 lib/libpacketdump/eth_34887.la
+lib/libpacketdump/eth_34916.la
 lib/libpacketdump/eth_34958.la
 lib/libpacketdump/ip_1.la
 lib/libpacketdump/ip_132.la
 lib/libpacketdump/ip_17.la
 lib/libpacketdump/ip_33.la
 lib/libpacketdump/ip_41.protocol
+lib/libpacketdump/ip_47.la
 lib/libpacketdump/ip_58.protocol
 lib/libpacketdump/ip_6.la
 lib/libpacketdump/link_0.la
 lib/libpacketdump/link_10.la
 lib/libpacketdump/link_11.la
 lib/libpacketdump/link_15.la
+lib/libpacketdump/link_17.protocol
 lib/libpacketdump/link_2.la
 lib/libpacketdump/link_3.protocol
 lib/libpacketdump/link_4.la
+lib/libpacketdump/link_5.so
 lib/libpacketdump/link_6.la
-lib/libpacketdump/link_9.la
+lib/libpacketdump/ppp_33.so
 lib/libtrace.la
 man/man1/traceanon.1
 man/man1/traceconvert.1
-man/man1/tracedump.1
 man/man1/tracefilter.1
+man/man1/traceflow.1
 man/man1/tracemerge.1
+man/man1/tracepktdump.1
+man/man1/tracereport.1
+man/man1/tracertstats.1
 man/man1/tracesplit.1
 man/man1/tracesplit_dir.1
 man/man1/tracestats.1
diff --git a/net/libtrace/distinfo b/net/libtrace/distinfo
index 34e702c75e3..54e3a9fd217 100644
--- a/net/libtrace/distinfo
+++ b/net/libtrace/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/24 14:10:31 markd Exp $
+$NetBSD: distinfo,v 1.2 2008/06/10 10:21:41 markd Exp $
 
-SHA1 (libtrace-3.0.0.tar.bz2) = d6aeab482761f5b90bdd891ff74e2415431f0fd4
-RMD160 (libtrace-3.0.0.tar.bz2) = 2f34466e9eaaac0f9e7d8269de643bc3a20374d9
-Size (libtrace-3.0.0.tar.bz2) = 511516 bytes
+SHA1 (libtrace-3.0.4.tar.bz2) = 6f1999c2431c8b41e00caeb74e6c1fe29e81623c
+RMD160 (libtrace-3.0.4.tar.bz2) = b190b5814971d813b98ae7595211fde98f27e2c4
+Size (libtrace-3.0.4.tar.bz2) = 537000 bytes