head	1.7;
access;
symbols
	RELENG_8_4:1.7.0.2
	RELENG_8_3_0_RELEASE:1.6.10.1.8.1
	RELENG_8_3:1.6.10.1.0.8
	RELENG_8_3_BP:1.6.10.1
	RELENG_7_4_0_RELEASE:1.6.14.1
	RELENG_8_2_0_RELEASE:1.6.10.1.6.1
	RELENG_7_4:1.6.0.14
	RELENG_7_4_BP:1.6
	RELENG_8_2:1.6.10.1.0.6
	RELENG_8_2_BP:1.6.10.1
	RELENG_8_1_0_RELEASE:1.6.10.1.4.1
	RELENG_8_1:1.6.10.1.0.4
	RELENG_8_1_BP:1.6.10.1
	RELENG_7_3_0_RELEASE:1.6.12.1
	RELENG_7_3:1.6.0.12
	RELENG_7_3_BP:1.6
	RELENG_8_0_0_RELEASE:1.6.10.1.2.1
	RELENG_8_0:1.6.10.1.0.2
	RELENG_8_0_BP:1.6.10.1
	RELENG_8:1.6.0.10
	RELENG_8_BP:1.6
	RELENG_7_2_0_RELEASE:1.6.8.1
	RELENG_7_2:1.6.0.8
	RELENG_7_2_BP:1.6
	RELENG_7_1_0_RELEASE:1.6.6.1
	RELENG_6_4_0_RELEASE:1.5.14.1.6.1
	RELENG_7_1:1.6.0.6
	RELENG_7_1_BP:1.6
	RELENG_6_4:1.5.14.1.0.6
	RELENG_6_4_BP:1.5.14.1
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.5.14.1
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.5.14.1.0.4
	RELENG_6_3_BP:1.5.14.1
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.5.14.1
	RELENG_6_2:1.5.14.1.0.2
	RELENG_6_2_BP:1.5.14.1
	RELENG_5_5_0_RELEASE:1.5
	RELENG_5_5:1.5.0.20
	RELENG_5_5_BP:1.5
	RELENG_6_1_0_RELEASE:1.5
	RELENG_6_1:1.5.0.18
	RELENG_6_1_BP:1.5
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.16
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.14
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.12
	RELENG_5_4_BP:1.5
	RELENG_4_11_0_RELEASE:1.4
	RELENG_4_11:1.4.0.24
	RELENG_4_11_BP:1.4
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.10
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.8
	RELENG_5_BP:1.5
	RELENG_4_10_0_RELEASE:1.4
	RELENG_4_10:1.4.0.22
	RELENG_4_10_BP:1.4
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.6
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.4
	RELENG_4_9:1.4.0.20
	RELENG_4_9_BP:1.4
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.4
	RELENG_5_1_BP:1.5
	RELENG_4_8_0_RELEASE:1.4
	RELENG_4_8:1.4.0.18
	RELENG_4_8_BP:1.4
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.2
	RELENG_5_0_BP:1.5
	RELENG_4_7_0_RELEASE:1.4
	RELENG_4_7:1.4.0.16
	RELENG_4_7_BP:1.4
	RELENG_4_6_2_RELEASE:1.4
	RELENG_4_6_1_RELEASE:1.4
	RELENG_4_6_0_RELEASE:1.4
	RELENG_4_6:1.4.0.14
	RELENG_4_6_BP:1.4
	RELENG_4_5_0_RELEASE:1.4
	RELENG_4_5:1.4.0.12
	RELENG_4_5_BP:1.4
	RELENG_4_4_0_RELEASE:1.4
	RELENG_4_4:1.4.0.10
	RELENG_4_4_BP:1.4
	RELENG_4_3_0_RELEASE:1.4
	RELENG_4_3:1.4.0.8
	RELENG_4_3_BP:1.4
	RELENG_4_2_0_RELEASE:1.4
	RELENG_4_1_1_RELEASE:1.4
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.4
	RELENG_3_5_0_RELEASE:1.4
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.6
	RELENG_4_BP:1.4
	RELENG_3_4_0_RELEASE:1.4
	RELENG_3_3_0_RELEASE:1.4
	RELENG_3_2_PAO:1.4.0.4
	RELENG_3_2_PAO_BP:1.4
	RELENG_3_2_0_RELEASE:1.4
	RELENG_3_1_0_RELEASE:1.4
	RELENG_3:1.4.0.2
	RELENG_3_BP:1.4
	RELENG_2_2_8_RELEASE:1.3
	RELENG_3_0_0_RELEASE:1.4
	RELENG_2_2_7_RELEASE:1.3
	RELENG_2_2_6_RELEASE:1.3
	RELENG_2_2_5_RELEASE:1.3
	RELENG_2_2_2_RELEASE:1.3
	RELENG_2_2_1_RELEASE:1.3
	RELENG_2_2_0_RELEASE:1.3
	RELENG_2_2:1.3.0.2
	RELENG_2_2_BP:1.3;
locks; strict;
comment	@# @;


1.7
date	2010.10.29.18.50.38;	author rpaulo;	state dead;
branches
	1.7.2.1;
next	1.6;

1.6
date	2006.09.04.19.54.49;	author sam;	state Exp;
branches
	1.6.2.1
	1.6.6.1
	1.6.8.1
	1.6.10.1
	1.6.12.1
	1.6.14.1;
next	1.5;

1.5
date	2002.02.08.19.45.58;	author obrien;	state Exp;
branches
	1.5.14.1;
next	1.4;

1.4
date	97.05.27.00.05.19;	author fenner;	state Exp;
branches;
next	1.3;

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

1.2
date	96.08.19.22.27.25;	author pst;	state Exp;
branches;
next	1.1;

1.1
date	96.08.19.21.55.18;	author pst;	state Exp;
branches;
next	;

1.7.2.1
date	2010.10.29.18.50.38;	author svnexp;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2013.03.28.13.01.28;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.08.01.04;	author svnexp;	state Exp;
branches;
next	;

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

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

1.6.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.6.10.1.2.1
	1.6.10.1.4.1
	1.6.10.1.6.1
	1.6.10.1.8.1;
next	1.6.10.2;

1.6.10.2
date	2012.11.17.10.35.53;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.6.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.10.1.8.2;

1.6.10.1.8.2
date	2012.11.17.08.24.35;	author svnexp;	state Exp;
branches;
next	;

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

1.6.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.14.2;

1.6.14.2
date	2012.11.17.08.16.34;	author svnexp;	state Exp;
branches;
next	;

1.5.14.1
date	2006.10.16.00.47.36;	author sam;	state Exp;
branches
	1.5.14.1.6.1;
next	1.5.14.2;

1.5.14.2
date	2012.11.17.07.38.51;	author svnexp;	state Exp;
branches;
next	;

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


desc
@@


1.7
log
@SVN rev 214520 on 2010-10-29 18:50:38Z by rpaulo

Remove unused files.
@
text
@$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $

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 libpcap, 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 'Import of libpcap v<version>' \
			-I SUNOS4 -I msdos -I Win32 -I missing \
			-I ChmodBPF -I linux-include \
			src/contrib/libpcap TCPDUMP_ORG v<version>

	   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. 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 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.

sam@@freebsd.org - 4 September 2006
@


1.7.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:01:28 +0000
@
text
@d1 35
@


1.7.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 35
$FreeBSD: releng/8.4/contrib/libpcap/FREEBSD-upgrade 162016 2006-09-04 19:54:49Z sam $

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 libpcap, 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 'Import of libpcap v<version>' \
			-I SUNOS4 -I msdos -I Win32 -I missing \
			-I ChmodBPF -I linux-include \
			src/contrib/libpcap TCPDUMP_ORG v<version>

	   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. 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 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.

sam@@freebsd.org - 4 September 2006
@


1.6
log
@update instructions
@
text
@d1 1
a1 1
$FreeBSD$
@


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


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


1.6.12.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.6.10.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.6.10.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/libpcap/FREEBSD-upgrade 162016 2006-09-04 19:54:49Z sam $
@


1.6.10.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.6.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/contrib/libpcap/FREEBSD-upgrade 162016 2006-09-04 19:54:49Z sam $
@


1.6.10.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.6.10.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.6.10.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.6.8.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.6.6.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.5
log
@Correct email address for bug reports and patch submissions.

Submitted by:	Marco Molteni <molter@@tin.it>
@
text
@d12 10
a21 8
		cvs import -m 'Virgin import of LBL libpcap v<version>' \
			-I SUNOS4 -I linux-include \
			src/contrib/libpcap LBL v<version>

	   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
d25 1
a25 4

	4. Update the shared library version number in
	   src/lib/libpcap/Makefile as described in the
	   handbook section 18.
d30 1
a30 1
branch (aka HEAD).  Never make local changes on the LBL branch.
d35 1
a35 1
pst@@freebsd.org - 19 Aug 1996
@


1.5.14.1
log
@MFC: libpcap v0.9.4 and tcpdump v3.9.4

Approved by:	re (kensmith)
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $
d12 8
a19 10
		cvs import -m 'Import of libpcap v<version>' \
			-I SUNOS4 -I msdos -I Win32 -I missing \
			-I ChmodBPF -I linux-include \
			src/contrib/libpcap TCPDUMP_ORG v<version>

	   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
d23 4
a26 1
	4. Bump __FreeBSD_version in sys/param.h as appropriate
d31 1
a31 1
branch (aka HEAD).  Never make local changes on the TCPDUMP_ORG branch.
d36 1
a36 1
sam@@freebsd.org - 4 September 2006
@


1.5.14.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/contrib/libpcap/FREEBSD-upgrade 163394 2006-10-16 00:47:41Z sam $
@


1.5.14.1.6.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
@d1 1
a1 1
$FreeBSD$
@


1.4
log
@Merge libpcap 0.3
Update FREEBSD-upgrade to mention bumping library version number.

Suggested-by:	Chris Timmons <skynyrd@@opus.cts.cwu.edu>
@
text
@d1 2
d33 1
a33 1
All local changes should be submitted to "libpcap@@ee.lbl.gov" for
@


1.3
log
@Fix some typos
@
text
@d11 2
a12 1
			-I SUNOS4 src/contrib/libpcap LBL v<version>
d16 2
a17 1
			-I SUNOS4 src/contrib/libpcap LBL v0_2_1
d22 4
d31 1
a31 1
All local changes should be submitted to "tcpdump@@ee.lbl.gov" [sic] for
@


1.2
log
@Add ignore of SUNOS4 subdirectory to commit instructions
@
text
@d5 1
a5 1
To upgrade to a newer version of tcpdump, when it is available:
d11 1
a11 1
			-I SUNOS4 /usr/src/contrib/libpcap LBL v<version>
d15 1
a15 1
			-I SUNOS4 /usr/src/contrib/libpcap LBL v0_2_1
d22 1
a22 1
To make local changes to tcpdump, simply patch and commit to the main
d25 1
a25 1
All local changes should be submitted to "tcpdump@@ee.lbl.gov" for
@


1.1
log
@Upgrade instructions
@
text
@d11 1
a11 1
			/usr/src/contrib/libpcap LBL v<version>
d15 1
a15 1
			/usr/src/contrib/libpcap LBL v0_2_1
@
