1996-08-19 21:55:18 +00:00
|
|
|
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 tcpdump, 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 -m 'Virgin import of LBL tcpdump v<version>' \
|
1997-05-27 02:17:42 +00:00
|
|
|
-I linux-include src/contrib/tcpdump LBL v<version>
|
1996-08-19 21:55:18 +00:00
|
|
|
|
|
|
|
|
For example, to do the import of version 3.2.1, I typed:
|
|
|
|
|
cvs import -m 'Virgin import of LBL tcpdump v3.2.1' \
|
1997-05-27 02:17:42 +00:00
|
|
|
-I linux-include src/contrib/tcpdump LBL v3_2_1
|
1996-08-19 21:55:18 +00:00
|
|
|
|
|
|
|
|
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 tcpdump, 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 "tcpdump@ee.lbl.gov" for
|
|
|
|
|
inclusion in the next vendor release.
|
|
|
|
|
|
|
|
|
|
pst@freebsd.org - 19 Aug 1996
|
