15 Commits

Author SHA1 Message Date
delphij
e4b26ec67a MFV: zlib 1.2.5. 2010-04-20 21:14:30 +00:00
delphij
60d1ae7ed9 MFV: libz 1.2.4.3. 2010-04-16 20:04:45 +00:00
delphij
ba79e1ef62 Update to 1.2.4.1 (beta). 2010-03-31 20:55:13 +00:00
delphij
242fa9b755 Update to zlib 1.2.4 and add versioned symbols to the
library.

Sponsored by:	iXsystems, Inc.
2010-03-22 21:11:55 +00:00
delphij
f1216d1f0a Create a custom branch where I will be able to do the merge. 2010-03-19 00:19:55 +00:00
des
ec17f77885 Resolve conflicts. 2006-03-23 14:09:21 +00:00
cperciva
d0d1021631 Correct a buffer overflow which occurred in the handling of some
particularly corrupt deflated data streams.

Security:	FreeBSD-SA-05:16.zlib
Approved by:	re (security blanket)
2005-07-06 14:00:52 +00:00
kientzle
2f1311730e Since the FreeBSD local modifications are mostly trivial (consisting
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
2005-05-11 03:47:48 +00:00
tjr
2368747166 Resolve conflicts. 2004-06-30 23:54:46 +00:00
green
7ca574f59c Fix conflicts. 2002-03-11 22:36:26 +00:00
dillon
198df63868 Add huff __FBSDID()s puff to whew! libz 2001-09-30 22:39:00 +00:00
peter
b66130e248 Import zlib 1.1.3 onto the vendor branch.
Obtained from: ftp.cdrom.com:/pub/infozip/zlib
1999-01-10 09:47:00 +00:00
steve
9f86c0bf8c Initial import of zlib-1.1.1
PR:		5869
Reviewed by:	jdp
1998-02-28 06:04:26 +00:00
ache
5372e30856 Official patch from infozip 1997-09-23 21:34:42 +00:00
peter
70c83c0586 Initial import of zlib-1.0.4 1996-08-18 17:54:27 +00:00