4 commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	ed440ef6e4	Resolve conflicts.	2006-03-23 14:09:21 +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
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	aea8f65dfe	Import zlib 1.2.1 (trimmed)	2004-06-30 23:43:39 +00:00