diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade index 78d134cfe52b..eea75c2951c4 100644 --- a/contrib/libpcap/FREEBSD-upgrade +++ b/contrib/libpcap/FREEBSD-upgrade @@ -9,28 +9,27 @@ To upgrade to a newer version of libpcap, when it is available: [Do not make ANY changes to the files.] 2. Use the command: - cvs import -m 'Virgin import of LBL libpcap v' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v + cvs import -m 'Import of libpcap v' \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v - For example, to do the import of version 0.2.1, I typed: - cvs import -m 'Virgin import of LBL libpcap v0.2.1' \ - -I SUNOS4 -I linux-include \ - src/contrib/libpcap LBL v0_2_1 + For example, to do the import of version 0.9.4, I typed: + cvs import -m 'Import of libpcap v0.9.4 \ + -I SUNOS4 -I msdos -I Win32 -I missing \ + -I ChmodBPF -I linux-include \ + src/contrib/libpcap TCPDUMP_ORG v0_9_4 3. Follow the instructions printed out in step 2 to resolve any conflicts between local FreeBSD changes and the newer version. - - 4. Update the shared library version number in - src/lib/libpcap/Makefile as described in the - handbook section 18. + 4. Bump __FreeBSD_version in sys/param.h as appropriate Do not, under any circumstances, deviate from this procedure. To make local changes to libpcap, simply patch and commit to the main -branch (aka HEAD). Never make local changes on the LBL branch. +branch (aka HEAD). Never make local changes on the TCPDUMP_ORG branch. All local changes should be submitted to "tcpdump-workers@tcpdump.org" for inclusion in the next vendor release of tcpdump and libpcap. -pst@freebsd.org - 19 Aug 1996 +sam@freebsd.org - 4 September 2006