diff options
author | fenner <fenner@FreeBSD.org> | 1997-05-27 02:17:42 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 1997-05-27 02:17:42 +0000 |
commit | a45d5a033f69ab70d6de3ead1e8c6fd59f87352b (patch) | |
tree | be1f1538067d8b764f3c8883470f914b73adcec2 /contrib/tcpdump/FREEBSD-upgrade | |
parent | 3ff0e744409afb9167d172e5c627942dd28ad80f (diff) | |
download | FreeBSD-src-a45d5a033f69ab70d6de3ead1e8c6fd59f87352b.zip FreeBSD-src-a45d5a033f69ab70d6de3ead1e8c6fd59f87352b.tar.gz |
Merge tcpdump 3.3.
The print_nfs.c changes are pretty extensive; this is partially because
LBL did a lot of cleanup and partially because I removed lots of
pointless changes away from the LBL style.
PR: 3371
mostly-Submitted by: Chris Timmons <skynyrd@opus.cts.cwu.edu>
Diffstat (limited to 'contrib/tcpdump/FREEBSD-upgrade')
-rw-r--r-- | contrib/tcpdump/FREEBSD-upgrade | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/FREEBSD-upgrade b/contrib/tcpdump/FREEBSD-upgrade index 061fa50..02c2e36 100644 --- a/contrib/tcpdump/FREEBSD-upgrade +++ b/contrib/tcpdump/FREEBSD-upgrade @@ -8,11 +8,11 @@ To upgrade to a newer version of tcpdump, when it is available: 2. Use the command: cvs import -m 'Virgin import of LBL tcpdump v<version>' \ - src/contrib/tcpdump LBL v<version> + -I linux-include src/contrib/tcpdump LBL v<version> For example, to do the import of version 3.2.1, I typed: cvs import -m 'Virgin import of LBL tcpdump v3.2.1' \ - src/contrib/tcpdump LBL v3_2_1 + -I linux-include src/contrib/tcpdump LBL v3_2_1 3. Follow the instructions printed out in step 2 to resolve any conflicts between local FreeBSD changes and the newer version. |