Commit Graph

21 Commits

Author SHA1 Message Date
Xin LI
a2953f767d 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
2012-06-21 21:47:08 +00:00
Xin LI
4f6f4d0316 MFV: zlib 1.2.5. 2010-04-20 21:14:30 +00:00
Xin LI
d413c90f0d MFV: libz 1.2.4.3. 2010-04-16 20:04:45 +00:00
Xin LI
d2b338199d Update to 1.2.4.1 (beta). 2010-03-31 20:55:13 +00:00
Xin LI
798aea00f8 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
Xin LI
6bca913248 Flattern zlib vendor tree. 2010-02-23 01:04:29 +00:00
Dag-Erling Smørgrav
ed440ef6e4 Resolve conflicts. 2006-03-23 14:09:21 +00:00
Dag-Erling Smørgrav
72b100abeb Vendor import of ZLib 1.2.3. 2006-03-23 14:02:36 +00:00
Tim Kientzle
42307a8f43 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
Tim Kientzle
61933f067b ZLib 1.2.2 2005-04-24 17:11:32 +00:00
Tim J. Robbins
0b73a4c301 Resolve conflicts. 2004-06-30 23:54:46 +00:00
Tim J. Robbins
aea8f65dfe Import zlib 1.2.1 (trimmed) 2004-06-30 23:43:39 +00:00
Brian Feldman
4d22b11a56 Fix conflicts. 2002-03-11 22:36:26 +00:00
Brian Feldman
cdbc2952f3 Import zlib 1.1.4 onto the vendor branch. 2002-03-11 22:30:00 +00:00
Peter Wemm
7f3dea244c $Id$ -> $FreeBSD$ 1999-08-28 00:22:10 +00:00
Peter Wemm
41d54c8049 Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline. 1999-01-10 09:53:51 +00:00
Peter Wemm
628b9c3475 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 Price
25552e1d6d Merge conflicts. 1998-02-28 06:08:17 +00:00
Steve Price
bd957a8d6c Initial import of zlib-1.1.1
PR:		5869
Reviewed by:	jdp
1998-02-28 06:04:26 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Peter Wemm
ac0a48f6a5 Initial import of zlib-1.0.4 1996-08-18 17:54:27 +00:00