Commit graph

139 commits

Author SHA1 Message Date
Simon J. Gerraty d1d0158641 Merge from head 2013-09-05 20:18:59 +00:00
Xin LI 1392a0b021 MFV: Update zlib to 1.2.8.
MFC after:	1 month
2013-05-05 06:20:49 +00:00
Gabor Kovesdan ab3f6b347e - Correct mispellings of the word occurrence
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de> (via private mail)
2013-04-17 11:40:10 +00:00
Simon J. Gerraty 7cf3a1c6b2 Updated dependencies 2013-03-11 17:21:52 +00:00
Simon J. Gerraty f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
Simon J. Gerraty 7cd2dcf076 Updated/new Makefile.depend 2012-11-08 21:24:17 +00:00
Simon J. Gerraty 23090366f7 Sync from head 2012-11-04 02:52:03 +00:00
Marcel Moolenaar 7750ad47a9 Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
2012-08-22 19:25:57 +00:00
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
Dimitry Andric 07b202a847 Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp

MFC after:	2 weeks
2012-02-28 18:30:18 +00:00
Xin LI 54257e2cbd Disable gvmat64.S, the assembler version of longest_match for now.
PR:		kern/154073
MFC after:	3 days
Approved by:	re (kib)
2011-07-18 19:23:50 +00:00
Dimitry Andric 2754fe609d Upgrade our copy of llvm/clang to r126079, from upstream's trunk.
This contains many improvements, primarily better C++ support, an
integrated assembler for x86 and support for -pg.
2011-02-20 19:33:47 +00:00
Dimitry Andric 152e60f2fe Fix some leftover binaries and shared libraries in the system that still
have an executable stack, due to linking in hand-assembled .S or .s
files, that have no .GNU-stack sections:

RWX --- ---  /lib/libcrypto.so.6
RWX --- ---  /lib/libmd.so.5
RWX --- ---  /lib/libz.so.6
RWX --- ---  /lib/libzpool.so.2
RWX --- ---  /usr/lib/liblzma.so.5

These were found using scanelf, from the sysutils/pax-utils port.

Reviewed by:	kib
2011-02-15 22:03:09 +00:00
Warner Losh 1aee0aeb6d Revert 212517 to restore pristine state of this file 2010-10-13 16:34:08 +00:00
Warner Losh c885004b9e Include FreeBSD svn tag 2010-09-13 01:44:07 +00:00
Xin LI 4f6f4d0316 MFV: zlib 1.2.5. 2010-04-20 21:14:30 +00:00
Xin LI 0c5aed59ee 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
Xin LI d413c90f0d MFV: libz 1.2.4.3. 2010-04-16 20:04:45 +00:00
Xin LI 1918350778 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
Xin LI 39b60c98ef 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
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
Ed Schouten daaf575910 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
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
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
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
Andrey A. Chernov 271012d5b9 Install manpage too 1998-02-28 10:41:01 +00:00
Steve Price e827b8c5cb foo.gz is created by 'make test' so add it to CLEANFILES. 1998-02-28 06:27:59 +00:00
Steve Price 163df7f801 algorithm.doc renamed to algorithm.txt in new distribution. 1998-02-28 06:10:08 +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
Steve Price 9521a6bb06 This commit was generated by cvs2svn to compensate for changes in r33904,
which included commits to RCS files with non-trunk default branches.
1998-02-28 06:04:26 +00:00
Andrey A. Chernov e97dbe1e30 Official patch from infozip 1997-09-23 21:34:42 +00:00
Andrey A. Chernov 65fce1274e This commit was generated by cvs2svn to compensate for changes in r29747,
which included commits to RCS files with non-trunk default branches.
1997-09-23 21:34:42 +00:00
Peter Wemm 57ece64fc6 Back out an easy $FreeBSD$ 1997-02-22 11:38:21 +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 7b9dff76d5 Clean up the beforeinstall target a bit more, bde pointed out that the old
one was a mess.  (I was in a 'talk' session at the time, can you tell? :-)
1996-08-19 01:21:46 +00:00
Peter Wemm fd86e51e98 oops.. attempted to install header files from wrong directory.. 1996-08-18 23:52:20 +00:00
cvs2svn 65bf410cec This commit was manufactured by cvs2svn to create branch 'VENDOR-libz'. 1996-08-18 17:59:49 +00:00
Peter Wemm b1c8a8dffe Add a bmakefile for zlib. 1996-08-18 17:59:48 +00:00
Peter Wemm ac0a48f6a5 Initial import of zlib-1.0.4 1996-08-18 17:54:27 +00:00