From 34ab5ff1f3812cc195e736a315413b024942be10 Mon Sep 17 00:00:00 2001 From: giovanni Date: Thu, 8 Jan 2009 09:03:15 +0000 Subject: [PATCH] Update to 6.6.7, from Benoit Lecocq on ports@. ok kili@ --- net/tcptrace/Makefile | 29 +++++++------- net/tcptrace/distinfo | 10 ++--- net/tcptrace/patches/patch-Makefile_in | 53 +++++++++----------------- net/tcptrace/patches/patch-print_c | 19 +-------- net/tcptrace/patches/patch-tcptrace_c | 8 ++-- net/tcptrace/patches/patch-tcptrace_h | 8 ++-- net/tcptrace/pkg/PLIST | 4 +- 7 files changed, 51 insertions(+), 80 deletions(-) diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index f3465ff77d5..97ede23a58a 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,29 +1,30 @@ -# $OpenBSD: Makefile,v 1.20 2007/09/15 22:36:59 merdely Exp $ +# $OpenBSD: Makefile,v 1.21 2009/01/08 09:03:15 giovanni 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 +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes 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 --git a/net/tcptrace/distinfo b/net/tcptrace/distinfo index c09e5d08814..c6ea8f27e75 100644 --- a/net/tcptrace/distinfo +++ b/net/tcptrace/distinfo @@ -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 --git a/net/tcptrace/patches/patch-Makefile_in b/net/tcptrace/patches/patch-Makefile_in index 05538099a31..db20381b191 100644 --- a/net/tcptrace/patches/patch-Makefile_in +++ b/net/tcptrace/patches/patch-Makefile_in @@ -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 18:30:33 2009 +@@ -14,7 +14,7 @@ DEFINES += -DGUNZIP="\"gunzip\"" # 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 @@ $OpenBSD: patch-Makefile_in,v 1.2 2002/10/17 18:21:29 naddy Exp $ # 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 @@ DEFINES += -DBUNZIP2="\"bunzip2\"" # ################################################################## PCAP_LDLIBS = @V_PCAP_LDLIBS@ @@ -21,7 +20,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2002/10/17 18:21:29 naddy Exp $ -@@ -138,7 +138,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS} +@@ -151,7 +151,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS} # Probably want full optimization # FreeBSD needs -Ae # HP needs -Ae @@ -30,35 +29,21 @@ $OpenBSD: patch-Makefile_in,v 1.2 2002/10/17 18:21:29 naddy Exp $ # Standard LIBS LDLIBS = @LIBS@ ${PCAP_LDLIBS} -@@ -198,26 +198,13 @@ LEX_VAL=@LEX@ +@@ -211,7 +211,7 @@ LEX_VAL=@LEX@ 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_parser.c: filt_parser.y filter.h 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 --git a/net/tcptrace/patches/patch-print_c b/net/tcptrace/patches/patch-print_c index 975961e9ff6..520a3949da7 100644 --- a/net/tcptrace/patches/patch-print_c +++ b/net/tcptrace/patches/patch-print_c @@ -1,6 +1,5 @@ -$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 +--- print.c.orig Wed Nov 19 15:38:05 2003 ++++ print.c Wed Jan 7 18:30:33 2009 @@ -137,8 +137,8 @@ static void printeth_packet( struct ether_header *pep) @@ -30,17 +29,3 @@ $OpenBSD: patch-print_c,v 1.1 2002/10/17 18:21:29 naddy Exp $ /* 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 --git a/net/tcptrace/patches/patch-tcptrace_c b/net/tcptrace/patches/patch-tcptrace_c index 79c7f12db8f..9e0d84f043f 100644 --- a/net/tcptrace/patches/patch-tcptrace_c +++ b/net/tcptrace/patches/patch-tcptrace_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-tcptrace_c,v 1.1 2002/10/17 18:21:29 naddy Exp $ ---- tcptrace.c.orig Wed Jul 24 00:33:18 2002 -+++ tcptrace.c Wed Oct 16 22:12:48 2002 -@@ -594,7 +594,7 @@ Dump File Names\n\ +$OpenBSD: patch-tcptrace_c,v 1.2 2009/01/08 09:03:15 giovanni Exp $ +--- tcptrace.c.orig Fri Oct 1 23:42:34 2004 ++++ tcptrace.c Wed Jan 7 18:30:33 2009 +@@ -639,7 +639,7 @@ Dump File Names\n\ char buf[256]; /* plenty large, but checked below with strncpy */ struct ext_var_op *pvop = &extended_vars[i]; strncpy(buf,pvop->var_optname,sizeof(buf)-10); diff --git a/net/tcptrace/patches/patch-tcptrace_h b/net/tcptrace/patches/patch-tcptrace_h index 982e47ee94a..97c90444904 100644 --- a/net/tcptrace/patches/patch-tcptrace_h +++ b/net/tcptrace/patches/patch-tcptrace_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-tcptrace_h,v 1.1 2002/10/17 18:21:29 naddy Exp $ ---- tcptrace.h.orig Wed Oct 16 21:21:39 2002 -+++ tcptrace.h Wed Oct 16 21:23:12 2002 -@@ -711,7 +711,7 @@ int finite(double); +$OpenBSD: patch-tcptrace_h,v 1.2 2009/01/08 09:03:15 giovanni Exp $ +--- tcptrace.h.orig Thu Nov 4 22:55:38 2004 ++++ tcptrace.h Wed Jan 7 18:30:33 2009 +@@ -773,7 +773,7 @@ int finite(double); /* note that many machines have an ether_ntoa, but the output differs, as does the prototype, so we'll include our own and change the name to avoid conflicts with local prototypes if they exist and differ */ diff --git a/net/tcptrace/pkg/PLIST b/net/tcptrace/pkg/PLIST index f927cf7480c..d5c2673f917 100644 --- a/net/tcptrace/pkg/PLIST +++ b/net/tcptrace/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:46 espie Exp $ -bin/tcptrace +@comment $OpenBSD: PLIST,v 1.5 2009/01/08 09:03:16 giovanni Exp $ +@bin bin/tcptrace @man man/man1/tcptrace.1 share/doc/tcptrace/ share/doc/tcptrace/ARGS