Hi,
Here is an update to the latest version of tcptrace 6.6.7.
Tested on amd64.
--
Benoit Lecocq
diff -Nru tcptrace.ori/Makefile tcptrace/Makefile
--- tcptrace.ori/Makefile Sun Sep 16 00:36:59 2007
+++ tcptrace/Makefile Wed Jan 7 15:29:51 2009
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.20 2007/09/15 22:36:59 merdely Exp $
-COMMENT= TCP dump file analysis tool
+COMMENT= TCP dump file analysis tool
-DISTNAME= tcptrace-6.2.0
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= net
-HOMEPAGE= http://masaka.cs.ohiou.edu/software/tcptrace/
-MASTER_SITES= ${HOMEPAGE}download/ \
- ${HOMEPAGE}download/old/6.2.0/
+DISTNAME= tcptrace-6.6.7
+PKGNAME= ${DISTNAME}
+CATEGORIES= net
+HOMEPAGE= http://masaka.cs.ohiou.edu/software/tcptrace/
+MASTER_SITES= ${HOMEPAGE}download/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -16,14 +15,16 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pcap
-BUILD_DEPENDS= :bison-*:devel/bison
+BUILD_DEPENDS= :bison-*:devel/bison
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= YACC=bison
+RUN_DEPENDS+= ::archivers/bzip2
-ALL_TARGET= tcptrace
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV= YACC=bison
-NO_REGRESS= Tes
+ALL_TARGET= tcptrace
+
+NO_REGRESS= Yes
DOCFILES= ARGS COPYRIGHT FAQ README README.mailing_list README.modules \
README.tput_graphs WWW dot_tcptracerc
diff -Nru tcptrace.ori/distinfo tcptrace/distinfo
--- tcptrace.ori/distinfo Thu Apr 5 18:20:16 2007
+++ tcptrace/distinfo Wed Jan 7 14:59:43 2009
@@ -1,5 +1,5 @@
-MD5 (tcptrace-6.2.0.tar.gz) = Vlw3BiDl8Fi8mjYHuGNKPQ==
-RMD160 (tcptrace-6.2.0.tar.gz) = Z/NqECgu11sZh1XW9jqrwF+PirY=
-SHA1 (tcptrace-6.2.0.tar.gz) = JRmxg4j7uKsAkLdCFLQNNyzyrLI=
-SHA256 (tcptrace-6.2.0.tar.gz) = dn2XOvHVMU2dvMLMms3uHsLyE2ndjoSAo0iIUk1TgL8=
-SIZE (tcptrace-6.2.0.tar.gz) = 3051463
+MD5 (tcptrace-6.6.7.tar.gz) = aBKNwYF7hmR14vBI4Vj1uQ==
+RMD160 (tcptrace-6.6.7.tar.gz) = HdDzc/dmMiND/61Z0GVeukxmguA=
+SHA1 (tcptrace-6.6.7.tar.gz) = rk0QoIKcV/LtoX5j9ZPlWPUrfyQ=
+SHA256 (tcptrace-6.6.7.tar.gz) = YzgKQFGTPKCJeUdqnfxvlZMIvJ9g1FJVIC44jrVpEL0=
+SIZE (tcptrace-6.6.7.tar.gz) = 3773308
diff -Nru tcptrace.ori/patches/patch-Makefile_in
tcptrace/patches/patch-Makefile_in
--- tcptrace.ori/patches/patch-Makefile_in Thu Oct 17 20:21:29 2002
+++ tcptrace/patches/patch-Makefile_in Wed Jan 7 15:08:28 2009
@@ -1,7 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2002/10/17 18:21:29 naddy Exp $
---- Makefile.in.orig Fri Jun 21 06:47:03 2002
-+++ Makefile.in Wed Oct 16 21:39:46 2002
-@@ -12,7 +12,7 @@ DEFINES += -DGUNZIP="\"gunzip\""
+--- Makefile.in.orig Thu Mar 4 21:33:56 2004
++++ Makefile.in Wed Jan 7 15:04:50 2009
+@@ -14,7 +14,7 @@
# 2) Otherwise, if your system supports standard Unix "uncompress",
# then uncomment the following line to support on-the-fly
# decompression of ".Z" files...
@@ -10,7 +9,7 @@
# 3) Also, we assume most systems have the "bunzip2" utility installed,
# if yours doesn't, you'll want to comment out the next line.
DEFINES += -DBUNZIP2="\"bunzip2\""
-@@ -32,8 +32,8 @@ DEFINES += -DBUNZIP2="\"bunzip2\""
+@@ -34,8 +34,8 @@
#
##################################################################
PCAP_LDLIBS = @V_PCAP_LDLIBS@
@@ -21,7 +20,7 @@
-@@ -138,7 +138,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS}
+@@ -151,7 +151,7 @@
# Probably want full optimization
# FreeBSD needs -Ae
# HP needs -Ae
@@ -30,35 +29,21 @@
# Standard LIBS
LDLIBS = @LIBS@ ${PCAP_LDLIBS}
-@@ -198,26 +198,13 @@ lex_v...@lex@
+@@ -211,7 +211,7 @@
filt_parser.c: filt_parser.y filter.h
- # bison -vd -p filtyy filt_parser.y -o filt_parser.c
-- if test "${YACC_VAL}" = "bison -y" ; then \
-- @YACC@ -vd -p filtyy -o filt_parser.c filt_parser.y ;\
-- cp filt_parser.c flex_bison ;\
-- cp filt_parser.h flex_bison ;\
-- else \
-- echo "Could not find BISON on this system";\
-- echo "Copying the BISON output files generated at our place" ;\
-- cp flex_bison/filt_parser.c . ;\
-- cp flex_bison/filt_parser.h . ;\
-- fi
-+ @YACC@ -vd -p filtyy -o filt_parser.c filt_parser.y ;\
-+ cp filt_parser.c flex_bison ;\
-+ cp filt_parser.h flex_bison ;\
+ if test "${YACC_VAL}" = "bison -y" ; then \
+- @YACC@ -vd -p filtyy -o filt_parser.c $(srcdir)/filt_parser.y ;\
++ @YACC@ -vd -p filtyy -o filt_parser.c filt_parser.y ;\
+ cp filt_parser.c flex_bison ;\
+ cp filt_parser.h flex_bison ;\
+ else \
+@@ -223,7 +223,7 @@
filt_scanner.c: filt_scanner.l filter.h filt_parser.h
-- if test ${LEX_VAL} = "flex" ; then \
-- @LEX@ -t -Pfiltyy filt_scanner.l > filt_scanner.c ;\
-- cp filt_scanner.c flex_bison ;\
-- else \
-- echo "Could not find FLEX on this system" ;\
-- echo "Copying the FLEX output files generated at our place" ;\
-- cp flex_bison/filt_scanner.c . ;\
-- fi
-+ @LEX@ -t -Pfiltyy filt_scanner.l > filt_scanner.c ;\
-+ cp filt_scanner.c flex_bison ;\
-
- # filt_parser.h created as a side effect of running yacc...
- filt_parser.h: filt_parser.c
+ if test ${LEX_VAL} = "flex" ; then \
+- @LEX@ -t -Pfiltyy $(srcdir)/filt_scanner.l > filt_scanner.c ;\
++ @LEX@ -t -Pfiltyy filt_scanner.l > filt_scanner.c ;\
+ cp filt_scanner.c flex_bison ;\
+ else \
+ echo "Could not find FLEX on this system" ;\
diff -Nru tcptrace.ori/patches/patch-print_c tcptrace/patches/patch-print_c
--- tcptrace.ori/patches/patch-print_c Thu Oct 17 20:21:29 2002
+++ tcptrace/patches/patch-print_c Wed Jan 7 15:14:23 2009
@@ -1,7 +1,6 @@
-$OpenBSD: patch-print_c,v 1.1 2002/10/17 18:21:29 naddy Exp $
---- print.c.orig Mon Dec 3 10:58:49 2001
-+++ print.c Wed Oct 16 21:53:19 2002
-@@ -137,8 +137,8 @@ static void
+--- print.c.orig Wed Nov 19 15:38:05 2003
++++ print.c Wed Jan 7 15:08:41 2009
+@@ -137,8 +137,8 @@
printeth_packet(
struct ether_header *pep)
{
@@ -12,7 +11,7 @@
printf(
hex?"\t Type: 0x%x %s\n":"\t Type: %d %s\n",
-@@ -751,6 +751,7 @@ ipv6addr2str(
+@@ -751,6 +751,7 @@
/* Lots of machines HAVE this, but they give slightly different formats */
/* and it messes up my cross-platform testing. I'll just do it the */
/* "one true" way! :-) */
@@ -20,7 +19,7 @@
char *
Ether_Ntoa (struct ether_addr *e)
{
-@@ -762,8 +763,7 @@ Ether_Ntoa (struct ether_addr *e)
+@@ -762,8 +763,7 @@
pe[0], pe[1], pe[2], pe[3], pe[4], pe[5]);
return(buf);
}
@@ -30,17 +29,3 @@
/* represent the sequence numbers absolute or relative to 0 */
/* N.B.: will fail will sequence space wraps around more than once */
-@@ -776,11 +776,11 @@ PrintSeqRep(
-
- if (ptcb && print_seq_zero && (ptcb->syn_count>0)) {
- /* Relative form */
-- sprintf(buf,hex?"0x%08x(R)":"%d(R)",
-+ snprintf(buf, sizeof(buf), hex?"0x%08x(R)":"%d(R)",
- seq - ptcb->syn);
- } else {
- /* Absolute form */
-- sprintf(buf,hex?"0x%08x":"%d",seq);
-+ snprintf(buf, sizeof(buf), hex?"0x%08x":"%d", seq);
- }
- return(buf);
- }
diff -Nru tcptrace.ori/pkg/PLIST tcptrace/pkg/PLIST
--- tcptrace.ori/pkg/PLIST Wed Sep 15 20:17:46 2004
+++ tcptrace/pkg/PLIST Wed Jan 7 15:15:10 2009
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:46 espie Exp $
-bin/tcptrace
+...@bin bin/tcptrace
@man man/man1/tcptrace.1
share/doc/tcptrace/
share/doc/tcptrace/ARGS
