1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-23 11:18:54 +00:00
Commit Graph

65 Commits

Author SHA1 Message Date
Dag-Erling Smørgrav
ed440ef6e4 Resolve conflicts. 2006-03-23 14:09:21 +00:00
Dag-Erling Smørgrav
cb71c8b01e 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
Dag-Erling Smørgrav
72b100abeb Vendor import of ZLib 1.2.3. 2006-03-23 14:02:36 +00:00
Colin Percival
1fcc990954 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
Colin Percival
8d284299a9 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
Warner Losh
474a2ca954 Remove libz and pppd redundancy 2005-06-03 15:25:13 +00:00
Tim Kientzle
85e66aedb4 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
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
d2c5caadde 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
Tim Kientzle
61933f067b ZLib 1.2.2 2005-04-24 17:11:32 +00:00
Tim Kientzle
c9d3530b69 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
Jacques Vidrine
521adbdfc7 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
Tim J. Robbins
51593ba7e5 Remove files that are no longer present in the zlib distribution from
the vendor branch.
2004-07-01 03:00:10 +00:00
Tim J. Robbins
9e64ecd96c Update makefile for zlib 1.2.1. 2004-06-30 23:58:22 +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
Tim J. Robbins
1fa1f918ab 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 Tetlow
41d8423f71 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
Stefan Eßer
3a8c99f73f Fix URL of zlib home page: It's hosted at gzip.org now. 2003-06-26 20:05:47 +00:00
Jean-Marc Zucconi
c6aa003c0d 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 Karlsson
208464c323 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
Mark Murray
c13373b7d7 Fix an easy warning in a local addition. 2002-08-01 11:29:05 +00:00
Kris Kennaway
3167dde2d5 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
Brian Feldman
5bd33b09b8 Remove some files we don't want. 2002-03-11 22:53:27 +00:00
Brian Feldman
de0a8799ad s/nilename/filename/ 2002-03-11 22:36:45 +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
Brian Feldman
422658d924 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
Brian Feldman
4193647780 Import zlib 1.1.4 onto the vendor branch. 2002-03-11 22:29:59 +00:00
Brian Feldman
40b687d4f8 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
Chris D. Faulhaber
efec00ac60 Error handling fixes for inflate. 2002-02-17 17:35:18 +00:00
Matthew Dillon
fa81a9761d Add huff __FBSDID()s puff to whew! libz 2001-09-30 22:39:00 +00:00
Kris Kennaway
131ee164c7 Add zopen(), a stdio wrapper for gzipped data streams.
Obtained from:	NetBSD
2001-09-06 09:14:49 +00:00
Dima Dorfman
7ebcc426ef Remove whitespace at EOL. 2001-07-15 07:53:42 +00:00
Ruslan Ermilov
4a558355e5 MAN[1-9] -> MAN. 2001-03-27 17:27:19 +00:00
Jeroen Ruigrok van der Werven
2fa72ea7d4 Fix typo: compatability -> compatibility.
Compatability is not an existing english word.
2001-02-06 12:05:58 +00:00
Chris D. Faulhaber
f3b0f821b0 Add appropriate defines to use snprintf/vsnprintf instead of
sprintf/vsprintf.

Approved by:	peter
2000-12-06 01:49:08 +00:00
Kris Kennaway
82b449c6a3 sprintf -> snprintf 2000-11-26 11:04:45 +00:00
Kris Kennaway
cd79a42a80 Prevent buffer overflows. 2000-08-04 06:25:30 +00:00
Sheldon Hearn
c6ff3a1bf7 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
Rodney W. Grimes
d05257b0f2 Replace beforeinstall target with new variables used by .mk system.
Reviewed by:	marcel, and make world
2000-01-14 07:57:47 +00:00
Bruce Evans
1d64c295bb Hard-configure z_off_t as long. Soft configuration using HAVE_UNISTD_H
just breaks the prototypes for gzseek() and gztell() when an application
defines HAVE_UNISTD_H before including <zlib.h>.  z_off_t was always
long for compiling zlib, but was sometimes off_t for compiling
applications, e.g., Ethereal 0.7.5.

This "fix" preserves bug for bug binary compatibility.  z_off_t should
be off_t for everything, but zlib doesn't support off_t being longer
than long, so using the correct type without fixing zlib's internals
would at best break binary compatibility.  This "fix" also make the
namespace problems for HAVE_UNISTD_H no worse than hundreds of other
namespace prooblems in zconf.h.  I'll wait for a new release of zlib
for proper fixes.

Reported by:	Guy Harris via jkh
1999-10-09 11:31:50 +00:00
Mike Pritchard
229494cb51 Add $FreeBSD$ lines to man pages that are missing them to make it
easier for translation teams.

PR:		docs/13418
Submitted by:	Alexey Zelkin <phantom@cris.net>
1999-08-28 23:10:20 +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
Peter Wemm
52454dcd09 This commit was generated by cvs2svn to compensate for changes in r42468,
which included commits to RCS files with non-trunk default branches.
1999-01-10 09:47:00 +00:00
Jordan K. Hubbard
7998601706 Allow minigzip to be invoked more like gzip, checking to see
if we're being called as gunzip as well as dealing with the -c
flag.
Submitted by:	jhay
1998-09-29 04:56:30 +00:00
Poul-Henning Kamp
4fe6f197e0 Backup out the last commit, it was already there.
Noticed by:	bde
1998-04-17 08:31:07 +00:00
Poul-Henning Kamp
b881fb3d9c Manpages not installed
PR:		6327
Reviewed by:	phk
Submitted by:	Chia-liang Kao <clkao@cirx.org>
1998-04-17 07:26:51 +00:00