Commit Graph

74 Commits

Author SHA1 Message Date
delphij
e4b26ec67a MFV: zlib 1.2.5. 2010-04-20 21:14:30 +00:00
delphij
3ca03205ba Expose a few symbols as public interface rather than private.
Note: the *64 interfaces are no longer exposed via zlib.h but were keep
as public interfaces;

Note 2: this commit would break applications that uses the moved symbols
directly.
2010-04-16 20:07:24 +00:00
delphij
60d1ae7ed9 MFV: libz 1.2.4.3. 2010-04-16 20:04:45 +00:00
delphij
31655aa073 Remove _LARGEFILE64_SOURCE==1 case which is supposed to be always false
on FreeBSD.

Pointed out by:	dougb
2010-04-01 22:52:09 +00:00
delphij
8da4807e95 For now, hardcode FreeBSD configuration that will never change on zlib.h:
unifdef -D_FILE_OFFSET_BITS=64 -U_LFS64_LARGEFILE -U_LARGEFILE64_SOURCE
2010-04-01 21:21: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
ed
09818ac28e Build lib/ with WARNS=6 by default.
Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
2010-01-02 09:58:07 +00:00
des
ec17f77885 Resolve conflicts. 2006-03-23 14:09:21 +00:00
des
6d9b0264a1 This commit was generated by cvs2svn to compensate for changes in r157043,
which included commits to RCS files with non-trunk default branches.
2006-03-23 14:02:36 +00:00
des
caf24dd709 Vendor import of ZLib 1.2.3. 2006-03-23 14:02:36 +00:00
cperciva
6393df51cc Correct a buffer overflow which can occur when decompressing a
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]
2005-07-27 08:41:17 +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
imp
486a24c727 Remove libz and pppd redundancy 2005-06-03 15:25:13 +00:00
kientzle
bc7e5eb067 Document zlib update procedure and provide future maintainers a
snapshot of the current state of the import.

MFC after:	2 weeks
2005-05-11 03:50:50 +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
kientzle
3747e27470 Update zconf.h and gzio.c with changes from ZLib 1.2.1 to ZLib 1.2.2.
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
2005-04-24 22:04:34 +00:00
kientzle
dcdd7970c3 ZLib 1.2.2 2005-04-24 17:11:32 +00:00
kientzle
05a8bcf8e7 This commit was generated by cvs2svn to compensate for changes in r145474,
which included commits to RCS files with non-trunk default branches.
2005-04-24 17:11:32 +00:00
nectar
1871435a01 Correct a denial-of-service vulnerability in zlib.
For reference, this bug was first reported at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=252253

Submitted by:	"Dmitry V. Levin" <ldv@altlinux.org>
2004-08-26 19:37:06 +00:00
tjr
3178c167b5 Remove files that are no longer present in the zlib distribution from
the vendor branch.
2004-07-01 03:00:10 +00:00
tjr
4e2786d7b0 Update makefile for zlib 1.2.1. 2004-06-30 23:58:22 +00:00
tjr
2368747166 Resolve conflicts. 2004-06-30 23:54:46 +00:00
tjr
439ed8d847 Import zlib 1.2.1 (trimmed) 2004-06-30 23:43:39 +00:00
tjr
6ea5314b57 This commit was generated by cvs2svn to compensate for changes in r131377,
which included commits to RCS files with non-trunk default branches.
2004-06-30 23:43:39 +00:00
gordon
5901302929 Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.
2003-08-17 08:28:46 +00:00
se
1af2e8da3d Fix URL of zlib home page: It's hosted at gzip.org now. 2003-06-26 20:05:47 +00:00
jmz
1cf4d0f1fd In src/lib/libz/gzio.c the function gzprintf does not check if the
amount of bytes (supposed to be) written by vsnprintf exceeds the
size of the buffer.

PR:		bin/48844
Submitted by:	Peter A Jonsson <pj@ludd.luth.se>
Obtained from:	OpenBSD
MFC after:	1 month
2003-03-14 01:47:01 +00:00
johan
b8f13ad643 Actually implement gzip's -c option. minigzip now also doubles
as zcat properly.

PR:		13043
Submitted by:	Toshihiko ARAI <toshi@jp.freebsd.org>
		Jonathan Towne <jontow@twcny.rr.com>

Approved by:	peter, sheldonh (mentor)
MFC After:	2 weeks
2002-10-03 19:30:22 +00:00
markm
eb7b85d384 Fix an easy warning in a local addition. 2002-08-01 11:29:05 +00:00
kris
d7a9079b76 Work around a gcc bug which causes zlib to dump core in certain
situations.  This can be removed once gcc is fixed.

Submitted by:	bde
2002-03-31 23:47:52 +00:00
green
77c41bfb75 Remove some files we don't want. 2002-03-11 22:53:27 +00:00
green
afc9128405 s/nilename/filename/ 2002-03-11 22:36:45 +00:00
green
7ca574f59c Fix conflicts. 2002-03-11 22:36:26 +00:00
green
0288c7557e Import zlib 1.1.4 onto the vendor branch. 2002-03-11 22:30:00 +00:00
green
08dc078a21 This commit was generated by cvs2svn to compensate for changes in r92111,
which included commits to RCS files with non-trunk default branches.
2002-03-11 22:30:00 +00:00
green
502a015d4b Import zlib 1.1.4 onto the vendor branch. 2002-03-11 22:29:59 +00:00
green
bbf9985351 This commit was generated by cvs2svn to compensate for changes in r92109,
which included commits to RCS files with non-trunk default branches.
2002-03-11 22:29:59 +00:00
jedgar
9cc19e2aaa Error handling fixes for inflate. 2002-02-17 17:35:18 +00:00
dillon
198df63868 Add huff __FBSDID()s puff to whew! libz 2001-09-30 22:39:00 +00:00
kris
cb3a3b2a12 Add zopen(), a stdio wrapper for gzipped data streams.
Obtained from:	NetBSD
2001-09-06 09:14:49 +00:00
dd
a145482cf6 Remove whitespace at EOL. 2001-07-15 07:53:42 +00:00
ru
25ef23ac1c MAN[1-9] -> MAN. 2001-03-27 17:27:19 +00:00
asmodai
7d76aced28 Fix typo: compatability -> compatibility.
Compatability is not an existing english word.
2001-02-06 12:05:58 +00:00
jedgar
f3679089a1 Add appropriate defines to use snprintf/vsnprintf instead of
sprintf/vsprintf.

Approved by:	peter
2000-12-06 01:49:08 +00:00
kris
0bec2472fd sprintf -> snprintf 2000-11-26 11:04:45 +00:00
kris
0b697dfdc6 Prevent buffer overflows. 2000-08-04 06:25:30 +00:00
sheldonh
329223e6f2 Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.
2000-03-02 09:14:21 +00:00
rgrimes
c127d0e61e Replace beforeinstall target with new variables used by .mk system.
Reviewed by:	marcel, and make world
2000-01-14 07:57:47 +00:00