head	1.2;
access;
symbols
	RELENG_8_4:1.2.0.2
	RELENG_9_1_0_RELEASE:1.1.28.2.2.1
	RELENG_9_1:1.1.28.2.0.2
	RELENG_9_1_BP:1.1.28.2
	RELENG_8_3_0_RELEASE:1.1.22.1.8.1
	RELENG_8_3:1.1.22.1.0.8
	RELENG_8_3_BP:1.1.22.1
	RELENG_9_0_0_RELEASE:1.1.28.1.2.1
	RELENG_9_0:1.1.28.1.0.2
	RELENG_9_0_BP:1.1.28.1
	RELENG_9:1.1.0.28
	RELENG_9_BP:1.1
	RELENG_7_4_0_RELEASE:1.1.26.1
	RELENG_8_2_0_RELEASE:1.1.22.1.6.1
	RELENG_7_4:1.1.0.26
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.1.22.1.0.6
	RELENG_8_2_BP:1.1.22.1
	RELENG_8_1_0_RELEASE:1.1.22.1.4.1
	RELENG_8_1:1.1.22.1.0.4
	RELENG_8_1_BP:1.1.22.1
	RELENG_7_3_0_RELEASE:1.1.24.1
	RELENG_7_3:1.1.0.24
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.1.22.1.2.1
	RELENG_8_0:1.1.22.1.0.2
	RELENG_8_0_BP:1.1.22.1
	RELENG_8:1.1.0.22
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.20.1
	RELENG_7_2:1.1.0.20
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.18.1
	RELENG_6_4_0_RELEASE:1.1.16.1
	RELENG_7_1:1.1.0.18
	RELENG_7_1_BP:1.1
	RELENG_6_4:1.1.0.16
	RELENG_6_4_BP:1.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_6_3_0_RELEASE:1.1
	RELENG_7_0:1.1.0.14
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.0.12
	RELENG_6_3_BP:1.1
	RELENG_7:1.1.0.10
	RELENG_7_BP:1.1
	RELENG_6_2_0_RELEASE:1.1
	RELENG_6_2:1.1.0.8
	RELENG_6_2_BP:1.1
	RELENG_6_1_0_RELEASE:1.1
	RELENG_6_1:1.1.0.6
	RELENG_6_1_BP:1.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.4
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.2
	RELENG_6_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.06.21.21.47.08;	author delphij;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.05.11.03.50.50;	author kientzle;	state Exp;
branches
	1.1.2.1
	1.1.10.1
	1.1.16.1
	1.1.18.1
	1.1.20.1
	1.1.22.1
	1.1.24.1
	1.1.26.1
	1.1.28.1;
next	;

1.2.2.1
date	2012.06.21.21.47.08;	author svnexp;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2013.03.28.13.03.23;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2012.11.17.07.40.44;	author svnexp;	state Exp;
branches;
next	;

1.1.10.1
date	2012.11.17.08.03.06;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.1.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.22.1.2.1
	1.1.22.1.4.1
	1.1.22.1.6.1
	1.1.22.1.8.1;
next	1.1.22.2;

1.1.22.2
date	2012.11.17.10.36.11;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.1.22.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.22.1.8.2;

1.1.22.1.8.2
date	2012.11.17.08.24.52;	author svnexp;	state Exp;
branches;
next	;

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

1.1.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.26.2;

1.1.26.2
date	2012.11.17.08.16.51;	author svnexp;	state Exp;
branches;
next	;

1.1.28.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.1.28.1.2.1;
next	1.1.28.2;

1.1.28.2
date	2012.06.28.07.08.48;	author delphij;	state Exp;
branches
	1.1.28.2.2.1;
next	;

1.1.28.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.1.28.1.2.2;

1.1.28.1.2.2
date	2012.11.17.08.36.27;	author svnexp;	state Exp;
branches;
next	;

1.1.28.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 237410 on 2012-06-21 21:47:08Z by delphij

MFV: Update zlib to 1.2.7.

(x86 assembler optimization disabled for now because it
requires the new .cfi_* directives that is not supported
by base system binutils).

MFC after:	1 week
@
text
@$FreeBSD: head/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $

ZLib 1.2.2

Original distribution from http://www.gzip.org/zlib/

Vendor files removed from distribution before import:
	 INDEX		 configure	 qnx/
	 Makefile	 contrib/	 win32/
	 Makefile.in	 msdos/		 zconf.in.h
	 amiga/		 old/
	 as400/		 projects/

Vendor files imported:
	 ChangeLog	 example.c	 minigzip.c
	 FAQ		 gzio.c		 trees.c
	 README		 infback.c	 trees.h
	 adler32.c	 inffast.c	 uncompr.c
	 algorithm.txt	 inffast.h	 zconf.h
	 compress.c	 inffixed.h	 zlib.3
	 crc32.c	 inflate.c	 zlib.h
	 crc32.h	 inflate.h	 zutil.c
	 deflate.c	 inftrees.c	 zutil.h
	 deflate.h	 inftrees.h

As of April, 2005, only the following three vendor files
had non-trivial local changes:
	 gzio.c   minigzip.c  zconf.h

Added files (not from vendor):
	 Makefile	 zopen.c	 FREEBSD-upgrade

To Update:
  1) Unpack vendor sources into a clean directory.
  2) Delete unnecessary files.
  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
  4) In a clean directory, check out a fresh copy of HEAD,
	 merging in vendor changes since the last import.
   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
  5) Resolve any conflicts and commit them.
  6) Update this file with any changes to the file list or update procedure.

kientzle@@FreeBSD.org
@


1.2.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:03:23 +0000
@
text
@d1 44
@


1.2.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 44
$FreeBSD: releng/8.4/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $

ZLib 1.2.2

Original distribution from http://www.gzip.org/zlib/

Vendor files removed from distribution before import:
	 INDEX		 configure	 qnx/
	 Makefile	 contrib/	 win32/
	 Makefile.in	 msdos/		 zconf.in.h
	 amiga/		 old/
	 as400/		 projects/

Vendor files imported:
	 ChangeLog	 example.c	 minigzip.c
	 FAQ		 gzio.c		 trees.c
	 README		 infback.c	 trees.h
	 adler32.c	 inffast.c	 uncompr.c
	 algorithm.txt	 inffast.h	 zconf.h
	 compress.c	 inffixed.h	 zlib.3
	 crc32.c	 inflate.c	 zlib.h
	 crc32.h	 inflate.h	 zutil.c
	 deflate.c	 inftrees.c	 zutil.h
	 deflate.h	 inftrees.h

As of April, 2005, only the following three vendor files
had non-trivial local changes:
	 gzio.c   minigzip.c  zconf.h

Added files (not from vendor):
	 Makefile	 zopen.c	 FREEBSD-upgrade

To Update:
  1) Unpack vendor sources into a clean directory.
  2) Delete unnecessary files.
  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
  4) In a clean directory, check out a fresh copy of HEAD,
	 merging in vendor changes since the last import.
   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
  5) Resolve any conflicts and commit them.
  6) Update this file with any changes to the file list or update procedure.

kientzle@@FreeBSD.org
@


1.1
log
@Document zlib update procedure and provide future maintainers a
snapshot of the current state of the import.

MFC after:	2 weeks
@
text
@d1 1
a1 1
$FreeBSD$
@


1.1.10.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/7/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.2.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.28.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.1.28.2
log
@SVN rev 237691 on 2012-06-28 07:08:48Z by delphij

MFC r237410: zlib 1.2.7.
@
text
@d1 1
a1 1
$FreeBSD: stable/9/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.28.2.2.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.1.28.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.1.28.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.0/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.26.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.1.26.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/7.4/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.24.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.1.22.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.1.22.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/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.22.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.1.22.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
@


1.1.22.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.1.22.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.1.22.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.1.20.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.1.18.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.1.16.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
@@

