diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile index 0524b29063d..eb8a99e1b36 100644 --- a/net/tcpslice/Makefile +++ b/net/tcpslice/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2008/02/14 21:36:27 rui Exp $ +# $OpenBSD: Makefile,v 1.9 2008/06/05 19:43:57 rui Exp $ COMMENT= tool for extracting and gluing pcap (tcpdump) files -DISTNAME= tcpslice-2007.07.09 -PKGNAME= ${DISTNAME:S/.//g}p0 +DISTNAME= tcpslice-2008.05.19 +PKGNAME= ${DISTNAME:S/.//g} CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/weekly/ diff --git a/net/tcpslice/distinfo b/net/tcpslice/distinfo index 0514f07efa3..f517933aae7 100644 --- a/net/tcpslice/distinfo +++ b/net/tcpslice/distinfo @@ -1,5 +1,5 @@ -MD5 (tcpslice-2007.07.09.tar.gz) = E2vQfTWGnwyU0vYTDwmq+w== -RMD160 (tcpslice-2007.07.09.tar.gz) = uYtHlMpxxA8Ao6+YZUEtjYm6lgk= -SHA1 (tcpslice-2007.07.09.tar.gz) = oS4+6RMnHNy1vk2H7etCo0Rc5/I= -SHA256 (tcpslice-2007.07.09.tar.gz) = vhXXKDB/5/okwAwsqFoA1oBkmNoVa+ni38F+dQ6yKVs= -SIZE (tcpslice-2007.07.09.tar.gz) = 113468 +MD5 (tcpslice-2008.05.19.tar.gz) = QfWIg1DUmjxKm7Fyss7v4Q== +RMD160 (tcpslice-2008.05.19.tar.gz) = DWBpd5GiDyu8cjyXfmQj0ofbDNQ= +SHA1 (tcpslice-2008.05.19.tar.gz) = ATNzBEVx3q88U1rg7ukCP+3Pd6w= +SHA256 (tcpslice-2008.05.19.tar.gz) = skvsj/RTivcMhzM7Oc9GW2mSxCqBohCre6Ds2VKDq6w= +SIZE (tcpslice-2008.05.19.tar.gz) = 113477 diff --git a/net/tcpslice/patches/patch-search_c b/net/tcpslice/patches/patch-search_c index b000951b5bc..2d3a8eeaf57 100644 --- a/net/tcpslice/patches/patch-search_c +++ b/net/tcpslice/patches/patch-search_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ ---- search.c.orig Sun Sep 10 10:52:40 2000 -+++ search.c Sun Apr 2 13:24:33 2006 -@@ -279,8 +279,8 @@ find_header( pcap_t *p, u_char *buf, int +$OpenBSD: patch-search_c,v 1.3 2008/06/05 19:43:57 rui Exp $ +--- search.c.orig Sat Aug 19 09:42:43 2006 ++++ search.c Wed Jun 4 12:14:33 2008 +@@ -306,8 +306,8 @@ find_header( pcap_t *p, u_char *buf, int buf_len, * present in the dump file. */ int @@ -12,7 +12,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ { time_t first_time = first_timestamp->tv_sec; off_t len_file; -@@ -383,7 +383,7 @@ sf_find_end( pcap_t *p, struct timeval * +@@ -410,7 +410,7 @@ sf_find_end( pcap_t *p, struct timeval *first_timestam /* Takes two timeval's and returns the difference, tv2 - tv1, as a double. */ static double @@ -21,7 +21,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ { double result = (tv2->tv_sec - tv1->tv_sec); result += (tv2->tv_usec - tv1->tv_usec) / 1000000.0; -@@ -395,7 +395,7 @@ timeval_diff( struct timeval *tv1, struc +@@ -422,7 +422,7 @@ timeval_diff( struct timeval *tv1, struct timeval *tv2 /* Returns true if timestamp t1 is chronologically less than timestamp t2. */ int @@ -30,7 +30,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ { return t1->tv_sec < t2->tv_sec || (t1->tv_sec == t2->tv_sec && -@@ -409,9 +409,9 @@ sf_timestamp_less_than( struct timeval * +@@ -436,9 +436,9 @@ sf_timestamp_less_than( struct timeval *t1, struct tim */ static off_t @@ -43,7 +43,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ { double full_span = timeval_diff( max_time, min_time ); double desired_span = timeval_diff( desired_time, min_time ); -@@ -432,7 +432,7 @@ interpolated_position( struct timeval *m +@@ -459,7 +459,7 @@ interpolated_position( struct timeval *min_time, off_t */ static int @@ -52,7 +52,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ { struct pcap_pkthdr hdr; const u_char *buf; -@@ -441,7 +441,7 @@ read_up_to( pcap_t *p, struct timeval *d +@@ -468,7 +468,7 @@ read_up_to( pcap_t *p, struct timeval *desired_time ) for ( ; ; ) { @@ -61,7 +61,7 @@ $OpenBSD: patch-search_c,v 1.2 2006/04/02 14:45:10 sturm Exp $ pos = FTELL( pcap_file( p ) ); buf = pcap_next( p, &hdr ); -@@ -490,12 +490,12 @@ read_up_to( pcap_t *p, struct timeval *d +@@ -516,12 +516,12 @@ read_up_to( pcap_t *p, struct timeval *desired_time ) int sf_find_packet( pcap_t *p,