Date: Thu, 24 Jul 2003 22:50:12 -0700 (PDT) From: Scott M Likens <damm@fpsn.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/51694: net/lft update to 2.1 Message-ID: <200307250550.h6P5oCM1070819@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/51694; it has been noted by GNATS. From: Scott M Likens <damm@fpsn.net> To: Tilman Linneweh <tilman@arved.de> Cc: <freebsd-gnats-submit@FreeBSD.org>, <drkangel@drkangel.org> Subject: Re: ports/51694: net/lft update to 2.1 Date: Thu, 24 Jul 2003 23:41:21 -0600 (MDT) BTW, I would diff this but I made a later diff and tried to submit it to the maintainer. you can get the full directory tarball at http://www.fpsn.net/~damm/lft.tgz and the diff is here, diff -urN lft.old/Makefile lft/Makefile --- lft.old/Makefile Thu Jul 24 22:28:53 2003 +++ lft/Makefile Thu Jul 24 22:34:35 2003 @@ -1,26 +1,20 @@ -# New ports collection makefile for: lft -# Date created: 19 Feb 2003 -# Whom: Marco P. Rodrigues <drkangel@drkangel.org> -# -# $FreeBSD: ports/net/lft/Makefile,v 1.2 2003/03/05 16:49:40 nectar Exp $ +# New ports collection makefile for: lft +# Date created: April 25th, 2003 +# Whom: Scott M. Likens <damm@fpsn.net> # PORTNAME= lft -PORTVERSION= 2.0 +PORTVERSION= 2.1 +PORTREVISION= 2 CATEGORIES= net -MASTER_SITES= http://www.mainnerve.com/lft/ \ - http://www.drkangel.org/sw/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +MASTER_SITES= http://www.mainnerve.com/lft/ +DISTNAME= lft-${PORTVERSION} -MAINTAINER= drkangel@drkangel.org -COMMENT= Layer 4 Traceroute program +MAINTAINER= damm@fpsn.net +COMMENT= the alternative traceroute tool for network (reverse) engineers -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKEFILE= Makefile.bsd +GNU_CONFIGURE= yes +USE_GMAKE= yes MAN8= lft.8 - -do-install: - ${INSTALL} -c -s -m 0555 -o root -g wheel ${WRKSRC}/lft ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/lft.8 ${PREFIX}/man/man8 .include <bsd.port.mk> diff -urN lft.old/distinfo lft/distinfo --- lft.old/distinfo Thu Jul 24 22:28:53 2003 +++ lft/distinfo Fri Apr 25 18:39:39 2003 @@ -1 +1 @@ -MD5 (lft-2.0-src.tar.gz) = d7ae3bd202257f961bc24c2415d9a8bc +MD5 (lft-2.1.tar.gz) = 8f58f9159c72b4190a3f0ae6e48f08e8 diff -urN lft.old/files/patch-aa lft/files/patch-aa --- lft.old/files/patch-aa Wed Dec 31 16:00:00 1969 +++ lft/files/patch-aa Sat Apr 26 13:56:36 2003 @@ -0,0 +1,34 @@ +--- lft-2.1/lft.c Thu Mar 13 11:15:44 2003 ++++ ../lft-2.1/lft.c Fri Apr 25 20:07:12 2003 +@@ -25,6 +25,7 @@ + #include "acconfig.h" + #include <assert.h> + ++#define INT_MAX ((int)(~0U>>1)) + #ifdef __CYGWIN__ + #define INT_MAX __INT_MAX__ + #define __USE_W32_SOCKETS +@@ -92,9 +93,7 @@ + /* Standard include on FreeBSD in system file "queue.h" but */ + /* not on other systems */ + +-/* #ifndef BSD */ + #include "lft_queue.h" +-/* #endif */ + + static char *hostname = NULL; + static char *hostname_lsrr[9]; +@@ -1141,11 +1140,9 @@ + dport = atoi (optarg); + break; + case 'q': +-#if defined(BSD) || defined(__CYGWIN__) ++/* This is ugly here atoll is C99 and 4.x is not C99 of course */ ++/* so we just use atol because we're lame if you get a better patch, submit */ + seq_start = atol (optarg); +-#else +- seq_start = atoll (optarg); +-#endif + break; + case 'w': + win_len = atoi(optarg); diff -urN lft.old/files/patch-lft.c lft/files/patch-lft.c --- lft.old/files/patch-lft.c Thu Jul 24 22:28:53 2003 +++ lft/files/patch-lft.c Wed Dec 31 16:00:00 1969 @@ -1,20 +0,0 @@ ---- lft.c.orig Wed Mar 5 16:16:09 2003 -+++ lft.c Wed Mar 5 16:16:21 2003 -@@ -928,7 +928,7 @@ - // return; /* not for us */ - - -- if (noisy) printf ("ICMP %u\n", ntohl (tcp->th_seq)); -+ if (noisy) printf ("ICMP %lu\n", ntohl (tcp->th_seq)); - recv_packet (ntohl (tcp->th_seq) , orig_ip->ip_src, - (icmp->icmp_type == ICMP_TIMXCEED) ? -2 : icmp->icmp_code); - break; -@@ -949,7 +949,7 @@ - if (noisy) printf (" ACK "); - if (tcp->th_flags & TH_SYN) - if (noisy) printf (" SYN "); -- if (noisy) printf (" seq %u ack %u ", ntohl (tcp->th_seq), ntohl (tcp->th_ack)); -+ if (noisy) printf (" seq %lu ack %lu ", ntohl (tcp->th_seq), ntohl (tcp->th_ack)); - if (noisy) printf ("from %s\n", inet_ntoa (ip->ip_src)); - - //if (ntohl(tcp->th_ack) < seq_start || ntohl(tcp->th_ack) > seq_start + trace_packet_info_length + 1) diff -urN lft.old/files/patch-lft_ifname.c lft/files/patch-lft_ifname.c --- lft.old/files/patch-lft_ifname.c Thu Jul 24 22:28:53 2003 +++ lft/files/patch-lft_ifname.c Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ ---- lft_ifname.c.orig Wed Mar 5 16:16:49 2003 -+++ lft_ifname.c Wed Mar 5 16:17:05 2003 -@@ -19,6 +19,7 @@ - #ifndef linux - #include <sys/sockio.h> - #endif -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <netinet/in.h> - #include <net/if.h> diff -urN lft.old/pkg-plist lft/pkg-plist --- lft.old/pkg-plist Thu Jul 24 22:28:53 2003 +++ lft/pkg-plist Fri Apr 25 18:47:16 2003 @@ -1 +1,2 @@ -sbin/lft +bin/lft +man/man8/lft.8 -- "I think we ought to be out there doing what we do best - making large holes in other people's countries." - George Carlin On Thu, 24 Jul 2003, Tilman Linneweh wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Does the maintainer approve this change? > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.2.2 (FreeBSD) > > iD8DBQE/IEAJfCLDn4B6xToRAgj0AJ9nB+vHZsNW65u+2f8znvbi2TnTwQCcDSmu > 30iDlJBZHdqfXz68rb1eyfw= > =Xk60 > -----END PGP SIGNATURE----- >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307250550.h6P5oCM1070819>