[pkgsrc/trunk]: pkgsrc/net/tcptrace Fix -O option to produce correct pcap fil...

[enami <enami%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60d29cd745d7
branches:  trunk
changeset: 644939:60d29cd745d7
user:      enami <enami%pkgsrc.org@localhost>
date:      Tue Jan 20 00:04:58 2015 +0000

description:
Fix -O option to produce correct pcap file when time_t is 64bit.
As described in pcap.h, pcap_pkthdr is not suitable for on-disk
format.

diffstat:

 net/tcptrace/distinfo                |   3 ++-
 net/tcptrace/patches/patch-tcpdump.c |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 5f981d553993 -r 60d29cd745d7 net/tcptrace/distinfo
--- a/net/tcptrace/distinfo     Mon Jan 19 23:39:35 2015 +0000
+++ b/net/tcptrace/distinfo     Tue Jan 20 00:04:58 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2011/12/07 15:18:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/01/20 00:04:58 enami Exp $
 
 SHA1 (tcptrace-6.6.7.tar.gz) = ae4d10a0829c57f2eda17e63f593e558f52b7f24
 RMD160 (tcptrace-6.6.7.tar.gz) = 1dd0f373f766322343ffad59d0655eba4c6682e0
@@ -7,3 +7,4 @@
 SHA1 (patch-filt__parser.y) = ac7c510d6bf231496e9c6b459c7a97d98531dbaf
 SHA1 (patch-filter.c) = 3058ee8b08ceca99b38ae772b51d26df91de6d9c
 SHA1 (patch-filter.h) = 6e8170f63938e4e3b2c8c97ea9361d707af2f8bb
+SHA1 (patch-tcpdump.c) = 4079d257814d966aca2c290fc131bef82ad15fe2
diff -r 5f981d553993 -r 60d29cd745d7 net/tcptrace/patches/patch-tcpdump.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tcptrace/patches/patch-tcpdump.c      Tue Jan 20 00:04:58 2015 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-tcpdump.c,v 1.1 2015/01/20 00:04:58 enami Exp $
+
+--- tcpdump.c.orig     2004-10-07 20:07:30.000000000 +0000
++++ tcpdump.c
+@@ -420,7 +420,14 @@ PcapSavePacket(
+     void *plast)
+ {
+     static MFILE *f_savefile = NULL;
+-    struct pcap_pkthdr phdr;
++    struct {
++      struct {
++          tt_int32 tv_sec;
++          tt_int32 tv_usec;
++      } ts;
++      tt_uint32 caplen;
++      tt_uint32 len;
++    } phdr;
+     int wlen;
+ 
+     if (f_savefile == NULL) {