- Update to 1.5beta7

PR:		118738
Submitted by:	Josh Carroll <josh.carroll@gmail.com>
This commit is contained in:
Martin Wilke 2007-12-27 22:08:27 +00:00
parent 87f4d28717
commit f3a0dc9136
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=204632
7 changed files with 88 additions and 81 deletions

View file

@ -1,31 +1,48 @@
# New ports collection makefile for: tcptraceroute # New ports collection makefile for: tcptraceroute-devel
# Date created: 21 March 2002 # Date created: 12 December 2007
# Whom: jeff@cetlink.net # Whom: josh.carroll@gmail.com
# #
# $FreeBSD$ # $FreeBSD$
# #
PORTNAME= tcptraceroute PORTNAME= tcptraceroute
PORTVERSION= 1.4 DISTVERSION= 1.5beta7
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \ MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \
http://sunpoet.net/distfiles/ http://pflog.net/tcptraceroute/
PKGNAMESUFFIX= -devel
MAINTAINER= sunpoet@sunpoet.net MAINTAINER= josh.carroll@gmail.com
COMMENT= A traceroute implementation using TCP packets COMMENT= A traceroute implementation using TCP packets
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
MAN8= tcptraceroute.8 CONFLICTS= tcptraceroute-1.4*
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config USE_GMAKE= yes
GNU_CONFIGURE= yes
post-patch: MAN1= tcptraceroute.1
@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
${WRKSRC}/${MAKEFILE} LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CONFIGURE_ARGS= --with-libpcap=/usr --bindir=${PREFIX}/sbin
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALL_TARGET= install-exec-am install-man
post-install: post-install:
@${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute @${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/tcptraceroute.1.html ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/tcptraceroute.lsm ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/examples.txt ${DOCSDIR}
.endif
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
MD5 (tcptraceroute-1.4.tar.gz) = 35c5e7d960f2b073db0109e0004e134e MD5 (tcptraceroute-1.5beta7.tar.gz) = 65d1001509f971ea986fcbc2dd009643
SHA256 (tcptraceroute-1.4.tar.gz) = 1ef6c4736b55f47d3a2bb26b999cbb409953a112f637bcbec4106da2a0937bde SHA256 (tcptraceroute-1.5beta7.tar.gz) = aed5b163ed4886f04242b46005a6cb4876ef38ad72001a94facb62a99dc99c57
SIZE (tcptraceroute-1.4.tar.gz) = 31918 SIZE (tcptraceroute-1.5beta7.tar.gz) = 119119

View file

@ -1,36 +0,0 @@
--- Makefile.orig Mon May 20 03:11:38 2002
+++ Makefile Tue Aug 20 01:49:27 2002
@@ -3,20 +3,27 @@
# tcptraceroute -- A traceroute implementation using TCP packets
# Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net>
-CC = gcc
-CFLAGS = -O2 -Wall
-DESTDIR=/usr/local/bin
+CC?= cc
+CFLAGS?= -O -pipe -Wall
+LNETINC= `libnet-config --cflags`
+LNETLIB= `libnet-config --libs`
+
+BINDIR= ${PREFIX}/sbin
+MANDIR= ${PREFIX}/man
+
+all: tcptraceroute
tcptraceroute: tcptraceroute.c
- $(CC) $(CFLAGS) `libnet-config --defines` \
+ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \
-o tcptraceroute tcptraceroute.c \
- `libnet-config --libs` -lpcap
+ $(LNETLIB) -lpcap
static:
$(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static"
install: tcptraceroute
- install -D tcptraceroute $(DESTDIR)/tcptraceroute
+ install -c -s tcptraceroute $(BINDIR)/tcptraceroute
+ install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8
distrib: clean changelog man

View file

@ -0,0 +1,46 @@
--- configure.old 2006-03-28 20:49:55.000000000 -0500
+++ configure 2007-12-13 13:57:42.000000000 -0500
@@ -3713,38 +3713,11 @@
fi;
-LIBNET_CONFIG="libnet-config" # relative, using $PATH
-
-# Check whether --with-libnet or --without-libnet was given.
-if test "${with_libnet+set}" = set; then
- withval="$with_libnet"
-
- LIBNETCC=""
- LIBNETLD=""
-
- test -x "$withval/bin/libnet-config" && LIBNET_CONFIG="$withval/bin/libnet-config"
- test -x "$withval/libnet-config" && LIBNET_CONFIG="$withval/libnet-config"
-
- test -f "$withval/libnet.h" && LIBNETCC="$LIBNETCC -I$withval"
- test -f "$withval/include/libnet.h" && LIBNETCC="$LIBNETCC -I$withval/include"
-
- test -f "$withval/libnet.a" && LIBNETLD="$LIBNETLD -L$withval"
- test -f "$withval/lib/libnet.a" && LIBNETLD="$LIBNETLD -L$withval/lib"
-
- if test -z "$LIBNETCC" -o -z "$LIBNETLD"
- then
- { { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5
-echo "$as_me: error: No valid libnet library found in $withval" >&2;}
- { (exit 1); exit 1; }; }
- else
- CPPFLAGS="$CPPFLAGS $LIBNETCC"
- LDFLAGS="$LDFLAGS $LIBNETLD"
- { echo "$as_me:$LINENO: using libnet in $withval" >&5
-echo "$as_me: using libnet in $withval" >&6;}
- fi
-
-fi;
-
+LIBNET_CONFIG="libnet11-config" # relative, using $PATH
+LIBNETCC=`$LIBNET_CONFIG --cflags`
+LIBNETLD=`$LIBNET_CONFIG --libs`
+CPPFLAGS="$CPPFLAGS $LIBNETCC"
+LDFLAGS="$LDFLAGS $LIBNETLD"
echo "$as_me:$LINENO: checking for pcap_open_live in -lpcap" >&5
echo $ECHO_N "checking for pcap_open_live in -lpcap... $ECHO_C" >&6

View file

@ -1,26 +0,0 @@
--- tcptraceroute.c.orig Tue Oct 7 16:04:50 2003
+++ tcptraceroute.c Tue Oct 7 16:05:22 2003
@@ -391,9 +391,9 @@
void usage(void)
{
printf("\n%s\n%s\n", VERSION, BANNER);
- fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
- [-l <packet length>] [-q <number of queries>] [-t <tos>]
- [-m <max ttl>] [-pP] <source port>] [-s <source address>]
+ fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>] \
+ [-l <packet length>] [-q <number of queries>] [-t <tos>] \
+ [-m <max ttl>] [-pP] <source port>] [-s <source address>] \
[-w <wait time>] <host> [destination port] [packet length]\n\n", name);
}
@@ -1182,8 +1182,8 @@
if (! (pcap = pcap_open_live(device, offset + SNAPLEN, 0, 10, errbuf)))
fatal("pcap_open_live failed: %s", errbuf);
- safe_snprintf(filter, TEXTSIZE, "
- (tcp and src host %s and src port %d and dst host %s)
+ safe_snprintf(filter, TEXTSIZE, " \
+ (tcp and src host %s and src port %d and dst host %s) \
or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
iptos(dst_ip), dst_prt, iptos(src_ip), iptos(src_ip));

View file

@ -16,5 +16,3 @@ UDP or ICMP ECHO packets, tcptraceroute is able to bypass the most
common firewall filters. common firewall filters.
WWW: http://michael.toren.net/code/tcptraceroute/ WWW: http://michael.toren.net/code/tcptraceroute/
- Simon 'corecode' Schubert

View file

@ -1,2 +1,10 @@
@comment $FreeBSD$
sbin/tcptraceroute sbin/tcptraceroute
%%PORTDOCS%%%%DOCSDIR%%/tcptraceroute.1.html
%%PORTDOCS%%%%DOCSDIR%%/tcptraceroute.lsm
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/examples.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%