src/lib/libz, branch release/7.0.0_cvs FreeBSD source tree This commit was manufactured by cvs2svn to create tag 2008-02-24T05:45:17+00:00 cvs2svn cvs2svn@FreeBSD.org 2008-02-24T05:45:17+00:00 a9c219fa3cec18ef9f30edec6fa106bf0e2d423d 'RELENG_7_0_0_RELEASE'. This commit was manufactured to restore the state of the 7.0-RELEASE image. 
'RELENG_7_0_0_RELEASE'.

This commit was manufactured to restore the state of the 7.0-RELEASE image.
Resolve conflicts. 2006-03-23T14:09:21+00:00 Dag-Erling Smørgrav des@FreeBSD.org 2006-03-23T14:09:21+00:00 ed440ef6e41316d133fb0e6c6b2500e7a4f34479 






This commit was generated by cvs2svn to compensate for changes in r157043,
2006-03-23T14:02:36+00:00

Dag-Erling Smørgrav
des@FreeBSD.org

2006-03-23T14:02:36+00:00

cb71c8b01e7f1707eadf2362c29889e583097270

which included commits to RCS files with non-trunk default branches.





which included commits to RCS files with non-trunk default branches.







Vendor import of ZLib 1.2.3.
2006-03-23T14:02:36+00:00

Dag-Erling Smørgrav
des@FreeBSD.org

2006-03-23T14:02:36+00:00

72b100abebeda50d93bbcff1768f5d06a9ee7e9f












Correct a buffer overflow which can occur when decompressing a
2005-07-27T08:41:17+00:00

Colin Percival
cperciva@FreeBSD.org

2005-07-27T08:41:17+00:00

1fcc990954dd1f3d84a0f6c2453bcb263a82506c

carefully crafted deflated data stream. [1]

Correct problems in the AES-XCBC-MAC IPsec authentication algorithm. [2]

Submitted by:	suz [2]
Security:	FreeBSD-SA-05:18.zlib [1], FreeBSD-SA-05:19.ipsec [2]





carefully crafted deflated data stream. [1]

Correct problems in the AES-XCBC-MAC IPsec authentication algorithm. [2]

Submitted by:	suz [2]
Security:	FreeBSD-SA-05:18.zlib [1], FreeBSD-SA-05:19.ipsec [2]







Correct a buffer overflow which occurred in the handling of some
2005-07-06T14:00:52+00:00

Colin Percival
cperciva@FreeBSD.org

2005-07-06T14:00:52+00:00

8d284299a9f34dc6adefe6ea2042fd5891b1a270

particularly corrupt deflated data streams.

Security:	FreeBSD-SA-05:16.zlib
Approved by:	re (security blanket)





particularly corrupt deflated data streams.

Security:	FreeBSD-SA-05:16.zlib
Approved by:	re (security blanket)







Remove libz and pppd redundancy
2005-06-03T15:25:13+00:00

Warner Losh
imp@FreeBSD.org

2005-06-03T15:25:13+00:00

474a2ca954ca6dbc654987b3747257c8218cb3ea












Document zlib update procedure and provide future maintainers a
2005-05-11T03:50:50+00:00

Tim Kientzle
kientzle@FreeBSD.org

2005-05-11T03:50:50+00:00

85e66aedb4e70ba2ec277a283dfd24389e833e47

snapshot of the current state of the import.

MFC after:	2 weeks





snapshot of the current state of the import.

MFC after:	2 weeks







Since the FreeBSD local modifications are mostly trivial (consisting
2005-05-11T03:47:48+00:00

Tim Kientzle
kientzle@FreeBSD.org

2005-05-11T03:47:48+00:00

42307a8f43e28c8a286aad36f21d647342ad9933

primarily of pointless $FreeBSD$ tags), sync most files in HEAD with
those in the ZLIB branch.  This minimizes the differences between
HEAD and ZLIB and should simplify future imports.

After this, there are only three files with local modifications
(gzio.c, minigzip.c, and zconf.h) and two non-vendor files
(Makefile, zopen.c).  The rest exactly match the vendor distribution.

PR:		i386/76294
MFC after:	2 weeks





primarily of pointless $FreeBSD$ tags), sync most files in HEAD with
those in the ZLIB branch.  This minimizes the differences between
HEAD and ZLIB and should simplify future imports.

After this, there are only three files with local modifications
(gzio.c, minigzip.c, and zconf.h) and two non-vendor files
(Makefile, zopen.c).  The rest exactly match the vendor distribution.

PR:		i386/76294
MFC after:	2 weeks







Update zconf.h and gzio.c with changes from ZLib 1.2.1 to ZLib 1.2.2.
2005-04-24T22:04:34+00:00

Tim Kientzle
kientzle@FreeBSD.org

2005-04-24T22:04:34+00:00

d2c5caadde884fad60d6fe5ced8253fb2d1a2747

These are two of the three files that have non-trivial differences from
the vendor branch.  minigzip.c is the third, but there were no changes
from ZLib 1.2.1 to ZLib 1.2.2 in that file.

The rest of the files I intend to get reverted back to the vendor
branch (with cooperation of cvsadmin@).

PR:		i386/76294





These are two of the three files that have non-trivial differences from
the vendor branch.  minigzip.c is the third, but there were no changes
from ZLib 1.2.1 to ZLib 1.2.2 in that file.

The rest of the files I intend to get reverted back to the vendor
branch (with cooperation of cvsadmin@).

PR:		i386/76294