head	1.28;
access;
symbols
	RELENG_8_4:1.28.0.2
	RELENG_9_1_0_RELEASE:1.27.2.1.4.2
	RELENG_9_1:1.27.2.1.0.4
	RELENG_9_1_BP:1.27.2.1
	RELENG_8_3_0_RELEASE:1.23.2.2.6.1
	RELENG_8_3:1.23.2.2.0.6
	RELENG_8_3_BP:1.23.2.2
	RELENG_9_0_0_RELEASE:1.27.2.1.2.1
	RELENG_9_0:1.27.2.1.0.2
	RELENG_9_0_BP:1.27.2.1
	RELENG_9:1.27.0.2
	RELENG_9_BP:1.27
	RELENG_7_4_0_RELEASE:1.22.2.2.4.1
	RELENG_8_2_0_RELEASE:1.23.2.2.4.1
	RELENG_7_4:1.22.2.2.0.4
	RELENG_7_4_BP:1.22.2.2
	RELENG_8_2:1.23.2.2.0.4
	RELENG_8_2_BP:1.23.2.2
	RELENG_8_1_0_RELEASE:1.23.2.2.2.1
	RELENG_8_1:1.23.2.2.0.2
	RELENG_8_1_BP:1.23.2.2
	RELENG_7_3_0_RELEASE:1.22.2.2.2.1
	RELENG_7_3:1.22.2.2.0.2
	RELENG_7_3_BP:1.22.2.2
	RELENG_8_0_0_RELEASE:1.23.2.1.2.1
	RELENG_8_0:1.23.2.1.0.2
	RELENG_8_0_BP:1.23.2.1
	RELENG_8:1.23.0.2
	RELENG_8_BP:1.23
	RELENG_7_2_0_RELEASE:1.22.2.1.4.1
	RELENG_7_2:1.22.2.1.0.4
	RELENG_7_2_BP:1.22.2.1
	RELENG_7_1_0_RELEASE:1.22.2.1.2.1
	RELENG_6_4_0_RELEASE:1.21.12.1
	RELENG_7_1:1.22.2.1.0.2
	RELENG_7_1_BP:1.22.2.1
	RELENG_6_4:1.21.0.12
	RELENG_6_4_BP:1.21
	RELENG_7_0_0_RELEASE:1.22
	RELENG_6_3_0_RELEASE:1.21
	RELENG_7_0:1.22.0.4
	RELENG_7_0_BP:1.22
	RELENG_6_3:1.21.0.10
	RELENG_6_3_BP:1.21
	RELENG_7:1.22.0.2
	RELENG_7_BP:1.22
	RELENG_6_2_0_RELEASE:1.21
	RELENG_6_2:1.21.0.8
	RELENG_6_2_BP:1.21
	RELENG_5_5_0_RELEASE:1.20
	RELENG_5_5:1.20.0.14
	RELENG_5_5_BP:1.20
	RELENG_6_1_0_RELEASE:1.21
	RELENG_6_1:1.21.0.6
	RELENG_6_1_BP:1.21
	RELENG_6_0_0_RELEASE:1.21
	RELENG_6_0:1.21.0.4
	RELENG_6_0_BP:1.21
	RELENG_6:1.21.0.2
	RELENG_6_BP:1.21
	RELENG_5_4_0_RELEASE:1.20
	RELENG_5_4:1.20.0.12
	RELENG_5_4_BP:1.20
	RELENG_4_11_0_RELEASE:1.11.2.3
	RELENG_4_11:1.11.2.3.0.16
	RELENG_4_11_BP:1.11.2.3
	RELENG_5_3_0_RELEASE:1.20
	RELENG_5_3:1.20.0.10
	RELENG_5_3_BP:1.20
	RELENG_5:1.20.0.8
	RELENG_5_BP:1.20
	RELENG_4_10_0_RELEASE:1.11.2.3
	RELENG_4_10:1.11.2.3.0.14
	RELENG_4_10_BP:1.11.2.3
	RELENG_5_2_1_RELEASE:1.20
	RELENG_5_2_0_RELEASE:1.20
	RELENG_5_2:1.20.0.6
	RELENG_5_2_BP:1.20
	RELENG_4_9_0_RELEASE:1.11.2.3
	RELENG_4_9:1.11.2.3.0.12
	RELENG_4_9_BP:1.11.2.3
	RELENG_5_1_0_RELEASE:1.20
	RELENG_5_1:1.20.0.4
	RELENG_5_1_BP:1.20
	RELENG_4_8_0_RELEASE:1.11.2.3
	RELENG_4_8:1.11.2.3.0.10
	RELENG_4_8_BP:1.11.2.3
	RELENG_5_0_0_RELEASE:1.20
	RELENG_5_0:1.20.0.2
	RELENG_5_0_BP:1.20
	RELENG_4_7_0_RELEASE:1.11.2.3
	RELENG_4_7:1.11.2.3.0.8
	RELENG_4_7_BP:1.11.2.3
	RELENG_4_6_2_RELEASE:1.11.2.3
	RELENG_4_6_1_RELEASE:1.11.2.3
	RELENG_4_6_0_RELEASE:1.11.2.3
	RELENG_4_6:1.11.2.3.0.6
	RELENG_4_6_BP:1.11.2.3
	RELENG_4_5_0_RELEASE:1.11.2.3
	RELENG_4_5:1.11.2.3.0.4
	RELENG_4_5_BP:1.11.2.3
	RELENG_4_4_0_RELEASE:1.11.2.3
	RELENG_4_4:1.11.2.3.0.2
	RELENG_4_4_BP:1.11.2.3
	RELENG_4_3_0_RELEASE:1.11.2.1
	RELENG_4_3:1.11.2.1.0.2
	RELENG_4_3_BP:1.11.2.1
	RELENG_4_2_0_RELEASE:1.11.2.1
	RELENG_4_1_1_RELEASE:1.11.2.1
	PRE_SMPNG:1.13
	RELENG_4_1_0_RELEASE:1.11.2.1
	RELENG_3_5_0_RELEASE:1.10.2.1
	RELENG_4_0_0_RELEASE:1.11
	RELENG_4:1.11.0.2
	RELENG_4_BP:1.11
	RELENG_3_4_0_RELEASE:1.10.2.1
	RELENG_3_3_0_RELEASE:1.10.2.1
	RELENG_3_2_PAO:1.10.0.4
	RELENG_3_2_PAO_BP:1.10
	RELENG_3_2_0_RELEASE:1.10
	RELENG_3_1_0_RELEASE:1.10
	RELENG_3:1.10.0.2
	RELENG_3_BP:1.10
	RELENG_2_2_8_RELEASE:1.5
	RELENG_3_0_0_RELEASE:1.9
	RELENG_2_2_7_RELEASE:1.5
	RELENG_2_2_6_RELEASE:1.5
	RELENG_2_2_5_RELEASE:1.5
	bsd_44_lite_2:1.1.1.1
	RELENG_2_2_2_RELEASE:1.5
	RELENG_2_2_1_RELEASE:1.5
	RELENG_2_2_0_RELEASE:1.5
	RELENG_2_1_7_RELEASE:1.2
	RELENG_2_1_6_1_RELEASE:1.2
	RELENG_2_1_6_RELEASE:1.2
	RELENG_2_2:1.5.0.2
	RELENG_2_2_BP:1.5
	RELENG_2_1_5_RELEASE:1.2
	RELENG_2_1_0_RELEASE:1.2
	RELENG_2_1_0:1.2.0.6
	RELENG_2_1_0_BP:1.2
	RELENG_2_0_5_RELEASE:1.2
	RELENG_2_0_5:1.2.0.4
	RELENG_2_0_5_BP:1.2
	RELENG_2_0_5_ALPHA:1.2
	RELEASE_2_0:1.2
	BETA_2_0:1.2
	ALPHA_2_0:1.2.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.28
date	2012.11.17.01.54.59;	author svnexp;	state Exp;
branches
	1.28.2.1;
next	1.27;

1.27
date	2010.12.04.14.19.27;	author uqs;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2010.11.27.09.26.46;	author uqs;	state Exp;
branches;
next	1.25;

1.25
date	2010.01.08.16.59.28;	author bz;	state Exp;
branches;
next	1.24;

1.24
date	2010.01.02.11.07.44;	author ed;	state Exp;
branches;
next	1.23;

1.23
date	2008.02.20.23.29.53;	author rpaulo;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	2006.08.22.07.51.10;	author ru;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2004.12.21.12.44.20;	author ru;	state Exp;
branches
	1.21.2.1
	1.21.12.1;
next	1.20;

1.20
date	2002.07.28.02.27.07;	author fenner;	state Exp;
branches;
next	1.19;

1.19
date	2002.07.23.00.56.52;	author fenner;	state Exp;
branches;
next	1.18;

1.18
date	2001.09.13.06.48.16;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2001.07.20.06.20.23;	author obrien;	state Exp;
branches;
next	1.16;

1.16
date	2001.06.06.16.12.58;	author ru;	state Exp;
branches;
next	1.15;

1.15
date	2001.03.26.14.42.06;	author ru;	state Exp;
branches;
next	1.14;

1.14
date	2001.03.20.18.17.20;	author ru;	state Exp;
branches;
next	1.13;

1.13
date	2000.04.01.21.48.07;	author shin;	state Exp;
branches;
next	1.12;

1.12
date	2000.03.30.01.33.39;	author shin;	state Exp;
branches;
next	1.11;

1.11
date	99.08.28.01.20.22;	author peter;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	99.01.13.10.27.00;	author simokawa;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	98.09.19.22.42.13;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	98.06.09.05.36.48;	author imp;	state Exp;
branches;
next	1.7;

1.7
date	97.02.22.16.14.03;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	97.01.14.07.19.16;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	96.09.30.19.49.14;	author fenner;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	96.08.17.10.37.27;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	96.03.13.08.04.25;	author pst;	state Exp;
branches;
next	1.2;

1.2
date	94.08.05.16.31.00;	author wollman;	state Exp;
branches;
next	1.1;

1.1
date	94.05.26.05.23.25;	author rgrimes;	state Exp;
branches
	1.1.1.1;
next	;

1.28.2.1
date	2012.11.17.01.54.59;	author svnexp;	state dead;
branches;
next	1.28.2.2;

1.28.2.2
date	2013.03.28.13.06.27;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.27.2.1.2.1
	1.27.2.1.4.1;
next	1.27.2.2;

1.27.2.2
date	2012.11.17.11.37.48;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.27.2.1.2.2;

1.27.2.1.2.2
date	2012.11.17.08.37.45;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.27.2.1.4.2;

1.27.2.1.4.2
date	2012.11.17.08.48.36;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.23.2.1.2.1;
next	1.23.2.2;

1.23.2.2
date	2010.01.17.15.20.34;	author bz;	state Exp;
branches
	1.23.2.2.2.1
	1.23.2.2.4.1
	1.23.2.2.6.1;
next	1.23.2.3;

1.23.2.3
date	2012.05.08.08.19.07;	author uqs;	state Exp;
branches;
next	1.23.2.4;

1.23.2.4
date	2012.11.17.10.37.27;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.23.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.23.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.23.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.23.2.2.6.2;

1.23.2.2.6.2
date	2012.11.17.08.25.58;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1
date	2008.11.13.15.27.48;	author rpaulo;	state Exp;
branches
	1.22.2.1.2.1
	1.22.2.1.4.1;
next	1.22.2.2;

1.22.2.2
date	2010.01.17.15.21.24;	author bz;	state Exp;
branches
	1.22.2.2.2.1
	1.22.2.2.4.1;
next	1.22.2.3;

1.22.2.3
date	2012.11.17.08.09.06;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.22.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.22.2.2.2.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.22.2.2.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.22.2.2.4.2;

1.22.2.2.4.2
date	2012.11.17.08.17.51;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1
date	2012.11.17.07.46.46;	author svnexp;	state Exp;
branches;
next	;

1.21.12.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.11.2.1
date	2000.07.03.06.41.38;	author ps;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2001.04.25.12.11.06;	author ru;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2001.06.23.10.07.29;	author ru;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2012.11.17.07.28.46;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1
date	99.08.29.15.48.47;	author peter;	state Exp;
branches;
next	;

1.5.2.1
date	99.09.05.11.41.26;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	94.05.26.05.23.26;	author rgrimes;	state Exp;
branches;
next	;


desc
@@


1.28
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/traceroute/Makefile 216184 2010-12-04 14:19:27Z uqs $

TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
.PATH: ${TRACEROUTE_DISTDIR}

PROG=	traceroute
MAN=	traceroute.8
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
BINOWN=	root
BINMODE=4555
CLEANFILES=	version.c

CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \
	 -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \
	 -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \
	 -DHAVE_SYS_SYSCTL_H=1 \
	 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
	 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1
.if !defined(TRACEROUTE_NO_IPSEC)
CFLAGS+= -DIPSEC
.endif
# RTT Jitter on the internet these days means printing 3 decimal places on
# > 1000ms times is plain useless.  Uncomment this to enable variable precision
# reporting, ie: print a variable precision from 0.001ms through 1000ms
# CFLAGS+= -DSANE_PRECISION

.if !defined(TRACEROUTE_NO_IPSEC)
DPADD=	${LIBIPSEC}
LDADD=	-lipsec
.endif

CFLAGS+= -I${TRACEROUTE_DISTDIR}

WARNS?=	3

version.c: ${TRACEROUTE_DISTDIR}/VERSION
	@@rm -f ${.TARGET}
	head -1 ${TRACEROUTE_DISTDIR}/VERSION | \
	    sed -e 's/.*/char version[] = "&";/' \
	    > ${.TARGET}

.include <bsd.prog.mk>
@


1.28.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:27 +0000
@
text
@d1 42
@


1.28.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 42
# $FreeBSD: releng/8.4/usr.sbin/traceroute/Makefile 235137 2012-05-08 08:19:07Z uqs $

TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
.PATH: ${TRACEROUTE_DISTDIR}

PROG=	traceroute
MAN=	traceroute.8
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
BINOWN=	root
BINMODE=4555
CLEANFILES=	version.c

CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \
	 -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \
	 -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \
	 -DHAVE_SYS_SYSCTL_H=1 \
	 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
	 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1
.if !defined(TRACEROUTE_NO_IPSEC)
CFLAGS+= -DIPSEC
.endif
# RTT Jitter on the internet these days means printing 3 decimal places on
# > 1000ms times is plain useless.  Uncomment this to enable variable precision
# reporting, ie: print a variable precision from 0.001ms through 1000ms
# CFLAGS+= -DSANE_PRECISION

.if !defined(TRACEROUTE_NO_IPSEC)
DPADD=	${LIBIPSEC}
LDADD=	-lipsec
.endif

CFLAGS+= -I${TRACEROUTE_DISTDIR}

WARNS?=	3

version.c: ${TRACEROUTE_DISTDIR}/VERSION
	@@rm -f ${.TARGET}
	head -1 ${TRACEROUTE_DISTDIR}/VERSION | \
	    sed -e 's/.*/char version[] = "&";/' \
	    > ${.TARGET}

.include <bsd.prog.mk>
@


1.27
log
@SVN rev 216184 on 2010-12-04 14:19:27Z by uqs

traceroute(8): make WARNS=3 clean

Also fixes an operator precedence bug for TCP tracerouting
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.27.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/traceroute/Makefile 216184 2010-12-04 14:19:27Z uqs $
@


1.27.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/traceroute/Makefile 216184 2010-12-04 14:19:27Z uqs $
@


1.27.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/traceroute/Makefile 216184 2010-12-04 14:19:27Z uqs $
@


1.26
log
@SVN rev 215937 on 2010-11-27 09:26:46Z by uqs

Remove unused traceroute(8) contrib code from head

It still lives on under vendor/traceroute.
@
text
@d34 1
a34 1
WARNS?=	0
@


1.25
log
@SVN rev 201806 on 2010-01-08 16:59:28Z by bz

Switch traceroute over to make use of proper in-kernel source
address selection.

Reviewed by:	rwatson, fenner
MFC after:	1 week
X-MFCable to:	stable/8, stable/7 (after r183571).
PR:		kern/139454
Tested by:	Frank Steinborn (steinex nognu.de)
@
text
@d32 1
a32 1
CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -I${TRACEROUTE_DISTDIR}
@


1.24
log
@SVN rev 201390 on 2010-01-02 11:07:44Z by ed

The last big commit: let usr.sbin/ use WARNS=6 by default.
@
text
@d8 1
a8 1
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-socket.c
d32 1
a32 1
CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl
@


1.23
log
@Add AS lookup functionality. On each hop we query a whois server to
find the corresponding AS for that IP (-a switch).
We can also choose a different whois server with the -A switch. The
default is whois.radb.net.

Obtained from:	       NetBSD
Reviewed by:	       bms, njl (mentor)
Approved by:	       njl (mentor)
@
text
@d34 2
@


1.23.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.23.2.2
log
@SVN rev 202485 on 2010-01-17 15:20:34Z by bz

MFC r201806:
  Switch traceroute over to make use of proper in-kernel source
  address selection.

  Reviewed by:  rwatson, fenner
  PR:           kern/139454
  Tested by:    Frank Steinborn (steinex nognu.de)

MFC r201897:
  Correct spelling.

  Submitted by: (pluknet gmail.com)
@
text
@d8 1
a8 1
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
d32 1
a32 1
CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -I${TRACEROUTE_DISTDIR}
@


1.23.2.3
log
@SVN rev 235137 on 2012-05-08 08:19:07Z by uqs

Sync traceroute(8) with head.

Merges r215937,216184 and r211062,215880,220968:

- Remove unused traceroute(8) contrib code from head
- make WARNS=3 clean
- fix an operator precedence bug for TCP tracerouting
- Remove unneeded struct timezone passed to gettimeofday().
- Remove clause 3 and 4 from TNF licenses.
- Check return code of setuid() in traceroute.

Requested by:	tuexen
@
text
@d32 1
a32 3
CFLAGS+= -I${TRACEROUTE_DISTDIR}

WARNS?=	3
@


1.23.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/traceroute/Makefile 235137 2012-05-08 08:19:07Z uqs $
@


1.23.2.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.23.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/traceroute/Makefile 202485 2010-01-17 15:20:34Z bz $
@


1.23.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.23.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.23.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.22
log
@Remove alpha left-overs.
@
text
@d8 1
a8 1
SRCS=	version.c traceroute.c ifaddrlist.c findsaddr-socket.c
@


1.22.2.1
log
@SVN rev 184928 on 2008-11-13 15:27:48Z by rpaulo

MFC r176428:

	Add AS lookup functionality. On each hop we query a whois server to
	find the corresponding AS for that IP (-a switch).
	We can also choose a different whois server with the -A switch. The
	default is whois.radb.net.

	Obtained from:	       NetBSD

Approved by:	       re
@
text
@d8 1
a8 1
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-socket.c
@


1.22.2.2
log
@SVN rev 202486 on 2010-01-17 15:21:24Z by bz

MFC r201806:
  Switch traceroute over to make use of proper in-kernel source
  address selection.

  Reviewed by:  rwatson, fenner
  PR:           kern/139454
  Tested by:    Frank Steinborn (steinex nognu.de)

MFC r201897:
  Correct spelling.

  Submitted by: (pluknet gmail.com)
@
text
@d8 1
a8 1
SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
d32 1
a32 1
CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -I${TRACEROUTE_DISTDIR}
@


1.22.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/traceroute/Makefile 202486 2010-01-17 15:21:24Z bz $
@


1.22.2.2.4.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.22.2.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/traceroute/Makefile 202486 2010-01-17 15:21:24Z bz $
@


1.22.2.2.2.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.21
log
@NOIPSEC -> TRACEROUTE_NO_IPSEC
@
text
@a31 5
.if ${MACHINE_ARCH} == "alpha"
# gcc builtin memcpy causes unaligned access
CFLAGS+= -fno-builtin
.endif

@


1.21.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/traceroute/Makefile 139125 2004-12-21 12:44:20Z ru $
@


1.21.12.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.20
log
@Update for traceroute 1.4a12
@
text
@d19 1
a19 1
.ifndef (NOIPSEC)
d27 1
a27 1
.ifndef (NOIPSEC)
@


1.19
log
@Add '+FreeBSD' to the version string, to reflect that this program
 bears little relationship to the one from LBL with the same
 name and version number.
@
text
@d8 1
a8 1
SRCS=	version.c traceroute.c
d13 4
a16 1
CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \
d18 1
a18 1
	 -DSTDC_HEADERS=1
@


1.18
log
@Set BINOWN=root explicitly for setuid root binaries.

This is not "useless", as one may have non-default
setting for BINOWN in make.conf, and we still want
these to be installed setuid root in this case.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.17 2001/07/20 06:20:23 obrien Exp $
d38 2
a39 1
	sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION \
@


1.17
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.16 2001/06/06 16:12:58 ru Exp $
d9 1
@


1.16
log
@Fetch the default maximum TTL value from the net.inet.ip.ttl MIB.

PR:		bin/19598
MFC after:	1 week
@
text
@d1 4
a4 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.15 2001/03/26 14:42:06 ru Exp $
d8 1
d10 5
a14 3
CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \
	-DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
	-DSTDC_HEADERS=1
d16 1
a16 1
CFLAGS+=-DIPSEC
d21 1
a21 1
# CFLAGS+=-DSANE_PRECISION
a22 2
SRCS=	version.c traceroute.c
CLEANFILES+=	version.c
a27 2
TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute

d30 1
a30 1
CFLAGS+=	-fno-builtin
d33 1
a33 2
CFLAGS+=	-I${TRACEROUTE_DISTDIR}/lbl
.PATH:	${TRACEROUTE_DISTDIR}
d37 2
a38 1
	sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION > ${.TARGET}
@


1.15
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.14 2001/03/20 18:17:20 ru Exp $
d6 2
a7 1
CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
@


1.14
log
@Set the default manual section for usr.sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.13 2000/04/01 21:48:07 shin Exp $
d4 1
@


1.13
log
@Don't compile in IPsec support when NOIPSEC is defined.

PR: bin/17739
Submitted by: Omachonu Ogali <oogali@@intranova.net>
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.12 2000/03/30 01:33:39 shin Exp $
a3 1
MAN8=	traceroute.8
@


1.12
log
@Bypass IPsec for traceroute invoked by root.

PR: bin/17606
Submitted by: Louis Mamakos <louie@@TransSys.COM
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.11 1999/08/28 01:20:22 peter Exp $
d7 4
a10 1
	-DSTDC_HEADERS=1 -DIPSEC
d18 1
d21 1
@


1.11
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d7 1
a7 1
	-DSTDC_HEADERS=1 
d15 2
@


1.11.2.1
log
@MFC:
traceroute.c
[rev 1.12] Bypass IPsec for traceroute invoked by root.
[rev 1.13] Correct FreeBSD id place. Also correct vendor rcsid.

Makefile
[rev 1.12] Bypass IPsec for traceroute invoked by root.
[rev 1.13] Don't compile in IPsec support when NOIPSEC is defined.
@
text
@d7 1
a7 4
	-DSTDC_HEADERS=1
.ifndef (NOIPSEC)
CFLAGS+=-DIPSEC
.endif
a14 4
.ifndef (NOIPSEC)
DPADD=	${LIBIPSEC}
LDADD=	-lipsec
.endif
@


1.11.2.2
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.11.2.1 2000/07/03 06:41:38 ps Exp $
d4 1
a4 1
MAN=	traceroute.8
@


1.11.2.3
log
@MFC: Fetch the default maximum TTL value from the net.inet.ip.ttl MIB.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.11.2.2 2001/04/25 12:11:06 ru Exp $
d6 1
a6 2
CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \
	-DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
@


1.11.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/usr.sbin/traceroute/Makefile 78661 2001-06-23 10:07:30Z ru $
@


1.10
log
@Add '-fno-builtin' to CFLAGS for alpha.
Builtin memcpy is not align-aware.

Approved by: jkh
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.9 1998/09/19 22:42:13 obrien Exp $
@


1.10.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.9
log
@Remove useless `BINOWN=root' now that it is the default.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.8 1998/06/09 05:36:48 imp Exp $
d17 6
@


1.8
log
@$@@ is deprecated, use longer forms of single char macros
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.7 1997/02/22 16:14:03 peter Exp $
a4 1
BINOWN=	root
@


1.7
log
@Revert $FreeBSD$ to $Id$
@
text
@d1 1
a1 1
#	$Id$
d22 2
a23 2
	@@rm -f $@@
	sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION > $@@
@


1.6
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.5
log
@Grab traceroute out of src/contrib/traceroute
@
text
@d1 1
a1 1
#	$Id: $
@


1.5.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.4
log
@Fixes from NetBSD:
 - inet_ntoa() returns a pointer to a static buffer, dont use it twice
   in the same printf().
 - prevent the possibility of never timing out
 - Report two more ICMP error types (prohibited nets etc)
And some (commented out) enhancements that I use, but some don't like.
@
text
@d1 1
a1 1
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
d7 2
a8 2
CFLAGS+=-DHAVE_BZERO=1 -DHAVE_SETLINEBUF=1

d13 11
@


1.3
log
@Bring in LBL traceroute, which has the '-g' option.  This is a bugfixed and
modified version of Leres' latest work.  No FreeBSD changes have been
spammed.
@
text
@d9 5
@


1.2
log
@Get rid of update.  Make man page installation work with our scheme
(and rename a few in the process).
@
text
@d7 1
@


1.1
log
@Initial revision
@
text
@d4 1
a4 1
MAN8=	traceroute.0
@


1.1.1.1
log
@BSD 4.4 Lite usr.sbin Sources
@
text
@@
