head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.3.42.1.4.2
	RELENG_9_1:1.3.42.1.0.4
	RELENG_9_1_BP:1.3.42.1
	RELENG_8_3_0_RELEASE:1.3.36.1.8.1
	RELENG_8_3:1.3.36.1.0.8
	RELENG_8_3_BP:1.3.36.1
	RELENG_9_0_0_RELEASE:1.3.42.1.2.1
	RELENG_9_0:1.3.42.1.0.2
	RELENG_9_0_BP:1.3.42.1
	RELENG_9:1.3.0.42
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.3.40.1
	RELENG_8_2_0_RELEASE:1.3.36.1.6.1
	RELENG_7_4:1.3.0.40
	RELENG_7_4_BP:1.3
	RELENG_8_2:1.3.36.1.0.6
	RELENG_8_2_BP:1.3.36.1
	RELENG_8_1_0_RELEASE:1.3.36.1.4.1
	RELENG_8_1:1.3.36.1.0.4
	RELENG_8_1_BP:1.3.36.1
	RELENG_7_3_0_RELEASE:1.3.38.1
	RELENG_7_3:1.3.0.38
	RELENG_7_3_BP:1.3
	RELENG_8_0_0_RELEASE:1.3.36.1.2.1
	RELENG_8_0:1.3.36.1.0.2
	RELENG_8_0_BP:1.3.36.1
	RELENG_8:1.3.0.36
	RELENG_8_BP:1.3
	RELENG_7_2_0_RELEASE:1.3.34.1
	RELENG_7_2:1.3.0.34
	RELENG_7_2_BP:1.3
	RELENG_7_1_0_RELEASE:1.3.32.1
	RELENG_6_4_0_RELEASE:1.3.30.1
	RELENG_7_1:1.3.0.32
	RELENG_7_1_BP:1.3
	RELENG_6_4:1.3.0.30
	RELENG_6_4_BP:1.3
	RELENG_7_0_0_RELEASE:1.3
	RELENG_6_3_0_RELEASE:1.3
	RELENG_7_0:1.3.0.28
	RELENG_7_0_BP:1.3
	RELENG_6_3:1.3.0.26
	RELENG_6_3_BP:1.3
	RELENG_7:1.3.0.24
	RELENG_7_BP:1.3
	RELENG_6_2_0_RELEASE:1.3
	RELENG_6_2:1.3.0.22
	RELENG_6_2_BP:1.3
	RELENG_5_5_0_RELEASE:1.3
	RELENG_5_5:1.3.0.20
	RELENG_5_5_BP:1.3
	RELENG_6_1_0_RELEASE:1.3
	RELENG_6_1:1.3.0.18
	RELENG_6_1_BP:1.3
	RELENG_6_0_0_RELEASE:1.3
	RELENG_6_0:1.3.0.16
	RELENG_6_0_BP:1.3
	RELENG_6:1.3.0.14
	RELENG_6_BP:1.3
	RELENG_5_4_0_RELEASE:1.3
	RELENG_5_4:1.3.0.12
	RELENG_5_4_BP:1.3
	RELENG_4_11_0_RELEASE:1.2
	RELENG_4_11:1.2.0.20
	RELENG_4_11_BP:1.2
	RELENG_5_3_0_RELEASE:1.3
	RELENG_5_3:1.3.0.10
	RELENG_5_3_BP:1.3
	RELENG_5:1.3.0.8
	RELENG_5_BP:1.3
	RELENG_4_10_0_RELEASE:1.2
	RELENG_4_10:1.2.0.18
	RELENG_4_10_BP:1.2
	RELENG_5_2_1_RELEASE:1.3
	RELENG_5_2_0_RELEASE:1.3
	RELENG_5_2:1.3.0.6
	RELENG_5_2_BP:1.3
	RELENG_4_9_0_RELEASE:1.2
	RELENG_4_9:1.2.0.16
	RELENG_4_9_BP:1.2
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.4
	RELENG_5_1_BP:1.3
	RELENG_4_8_0_RELEASE:1.2
	RELENG_4_8:1.2.0.14
	RELENG_4_8_BP:1.2
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.2
	RELENG_5_0_BP:1.3
	RELENG_4_7_0_RELEASE:1.2
	RELENG_4_7:1.2.0.12
	RELENG_4_7_BP:1.2
	RELENG_4_6_2_RELEASE:1.2
	RELENG_4_6_1_RELEASE:1.2
	RELENG_4_6_0_RELEASE:1.2
	RELENG_4_6:1.2.0.10
	RELENG_4_6_BP:1.2
	RELENG_4_5_0_RELEASE:1.2
	RELENG_4_5:1.2.0.8
	RELENG_4_5_BP:1.2
	RELENG_4_4_0_RELEASE:1.2
	RELENG_4_4:1.2.0.6
	RELENG_4_4_BP:1.2
	RELENG_4_3_0_RELEASE:1.2
	RELENG_4_3:1.2.0.4
	RELENG_4_3_BP:1.2
	RELENG_4_2_0_RELEASE:1.2
	RELENG_4_1_1_RELEASE:1.2
	PRE_SMPNG:1.2
	RELENG_4_1_0_RELEASE:1.2
	RELENG_3_5_0_RELEASE:1.1.4.1
	RELENG_4_0_0_RELEASE:1.2
	RELENG_4:1.2.0.2
	RELENG_4_BP:1.2
	RELENG_3_4_0_RELEASE:1.1
	RELENG_3_3_0_RELEASE:1.1
	RELENG_3_2_PAO:1.1.0.6
	RELENG_3_2_PAO_BP:1.1
	RELENG_3_2_0_RELEASE:1.1
	RELENG_3_1_0_RELEASE:1.1
	RELENG_3:1.1.0.4
	RELENG_3_BP:1.1
	RELENG_2_2_8_RELEASE:1.1
	RELENG_3_0_0_RELEASE:1.1
	RELENG_2_2_7_RELEASE:1.1
	RELENG_2_2_6_RELEASE:1.1
	RELENG_2_2_5_RELEASE:1.1
	RELENG_2_2_2_RELEASE:1.1
	RELENG_2_2_1_RELEASE:1.1
	RELENG_2_2_0_RELEASE:1.1
	RELENG_2_2:1.1.0.2
	RELENG_2_2_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.48.58;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2002.07.28.02.26.31;	author fenner;	state Exp;
branches
	1.3.14.1
	1.3.24.1
	1.3.30.1
	1.3.32.1
	1.3.34.1
	1.3.36.1
	1.3.38.1
	1.3.40.1
	1.3.42.1;
next	1.2;

1.2
date	99.12.20.16.07.53;	author phantom;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	96.10.01.06.17.16;	author fenner;	state Exp;
branches
	1.1.4.1;
next	;

1.4.2.1
date	2012.11.17.01.48.58;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.02.09;	author svnexp;	state Exp;
branches;
next	;

1.3.14.1
date	2012.11.17.07.38.58;	author svnexp;	state Exp;
branches;
next	;

1.3.24.1
date	2012.11.17.08.01.12;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.3.36.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.3.36.1.2.1
	1.3.36.1.4.1
	1.3.36.1.6.1
	1.3.36.1.8.1;
next	1.3.36.2;

1.3.36.2
date	2012.11.17.10.35.55;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.3.36.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.36.1.8.2;

1.3.36.1.8.2
date	2012.11.17.08.24.37;	author svnexp;	state Exp;
branches;
next	;

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

1.3.40.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.3.40.2;

1.3.40.2
date	2012.11.17.08.16.36;	author svnexp;	state Exp;
branches;
next	;

1.3.42.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.42.1.2.1
	1.3.42.1.4.1;
next	1.3.42.2;

1.3.42.2
date	2012.11.17.11.36.10;	author svnexp;	state Exp;
branches;
next	;

1.3.42.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.42.1.2.2;

1.3.42.1.2.2
date	2012.11.17.08.36.10;	author svnexp;	state Exp;
branches;
next	;

1.3.42.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.42.1.4.2;

1.3.42.1.4.2
date	2012.11.17.08.46.59;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.11.17.07.22.29;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	99.12.20.16.10.53;	author phantom;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@$FreeBSD: head/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $

This directory contains virgin copies of the original distribution files
on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
the files in this directory via patches and a cvs commit.

To upgrade to a newer version of traceroute, when it is available:

	1. Unpack the new version into an empty directory.
	   [Do not make ANY changes to the files.]

	2. Use the command:
		cvs import -I linux-include \
			-m 'Virgin import of LBL traceroute v<version>' \
			src/contrib/traceroute LBL v<version>

	   For example, to do the import of version 1.3.2, I might have typed:
		cvs import -I linux-include \
			-m 'Virgin import of LBL traceroute v1.3.2' \
			src/contrib/traceroute LBL v1_3_2

	3. Follow the instructions printed out in step 2 to resolve any
	   conflicts between local FreeBSD changes and the newer version.

Do not, under any circumstances, deviate from this procedure.

To make local changes to traceroute, simply patch and commit to the main
branch (aka HEAD).  Never make local changes on the LBL branch.

All local changes should be submitted to "traceroute@@ee.lbl.gov" for
inclusion in the next vendor release of traceroute.

(The "SANE_PRECISION" patch has been submitted and rejected.)

(The extensive modifications for TCP and GRE probes have not been
submitted.)

fenner@@freebsd.org - 30 Sep 1996
@


1.4.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:02:09 +0000
@
text
@d1 38
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 38
$FreeBSD: releng/8.4/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $

This directory contains virgin copies of the original distribution files
on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
the files in this directory via patches and a cvs commit.

To upgrade to a newer version of traceroute, when it is available:

	1. Unpack the new version into an empty directory.
	   [Do not make ANY changes to the files.]

	2. Use the command:
		cvs import -I linux-include \
			-m 'Virgin import of LBL traceroute v<version>' \
			src/contrib/traceroute LBL v<version>

	   For example, to do the import of version 1.3.2, I might have typed:
		cvs import -I linux-include \
			-m 'Virgin import of LBL traceroute v1.3.2' \
			src/contrib/traceroute LBL v1_3_2

	3. Follow the instructions printed out in step 2 to resolve any
	   conflicts between local FreeBSD changes and the newer version.

Do not, under any circumstances, deviate from this procedure.

To make local changes to traceroute, simply patch and commit to the main
branch (aka HEAD).  Never make local changes on the LBL branch.

All local changes should be submitted to "traceroute@@ee.lbl.gov" for
inclusion in the next vendor release of traceroute.

(The "SANE_PRECISION" patch has been submitted and rejected.)

(The extensive modifications for TCP and GRE probes have not been
submitted.)

fenner@@freebsd.org - 30 Sep 1996
@


1.3
log
@Merge 1.4a12
@
text
@d1 1
a1 1
$FreeBSD$
@


1.3.24.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/7/contrib/traceroute/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.3.14.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/contrib/traceroute/FREEBSD-upgrade 147906 2005-07-11 04:14:43Z cvs2svn $
@


1.3.42.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.3.42.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/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
@


1.3.42.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.3.42.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.1/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
@


1.3.42.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.3.42.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.0/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
@


1.3.40.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.3.40.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/7.4/contrib/traceroute/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.3.38.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.3.36.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.3.36.2
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/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
@


1.3.36.1.8.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.3.36.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
@


1.3.36.1.6.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.3.36.1.4.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.3.36.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.3.34.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.3.32.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.3.30.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.2
log
@s/tcpdump/traceroute

PR:		docs/14523
Submitted by:	Adam Morrison <adam@@xpert.com>
@
text
@d13 2
a14 1
		cvs import -m 'Virgin import of LBL traceroute v<version>' \
d18 2
a19 1
		cvs import -m 'Virgin import of LBL traceroute v1.3.2' \
d34 3
@


1.2.2.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/4/contrib/traceroute/FREEBSD-upgrade 57955 2000-03-13 04:59:44Z cvs2svn $
@


1.1
log
@Instructions on upgrading traceroute
@
text
@d1 2
d25 1
a25 1
To make local changes to tcpdump, simply patch and commit to the main
@


1.1.4.1
log
@MFC: s/tcpdump/traceroute

PR:             docs/14523
@
text
@a0 2
$FreeBSD$

d23 1
a23 1
To make local changes to traceroute, simply patch and commit to the main
@


