From e75de023b6cd7177c8e44ef1c72b74f5efde5418 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 29 Jan 2012 10:13:15 -0800 Subject: [PATCH] zlib 1.2.6 --- ChangeLog | 28 ++++++++++++++++++++++++++-- gzguts.h | 2 +- gzwrite.c | 2 +- zlib.3 | 2 +- zlib.3.pdf | Bin 8735 -> 8735 bytes zlib.h | 4 ++-- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 198e55f..6fa5d44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,32 @@ ChangeLog file for zlib -Changes in 1.2.6 (xx Jan 2012) -- +Changes in 1.2.6 (29 Jan 2012) +- Update the Pascal interface in contrib/pascal +- Fix function numbers for gzgetc_ in zlibvc.def files +- Fix configure.ac for contrib/minizip [Schiffer] +- Fix large-entry detection in minizip on 64-bit systems [Schiffer] +- Have ./configure use the compiler return code for error indication +- Fix CMakeLists.txt for cross compilation [McClure] +- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes] +- Fix compilation of contrib/minizip on FreeBSD [Marquez] +- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath] +- Include io.h for Turbo C / Borland C on all platforms [Truta] +- Make version explicit in contrib/minizip/configure.ac [Bosmans] +- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant] +- Minor cleanup up contrib/minizip/unzip.c [Vollant] +- Fix bug when compiling minizip with C++ [Vollant] +- Protect for long name and extra fields in contrib/minizip [Vollant] +- Avoid some warnings in contrib/minizip [Vollant] +- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip +- Add missing libs to minizip linker command +- Add support for VPATH builds in contrib/minizip +- Add an --enable-demos option to contrib/minizip/configure +- Add the generation of configure.log by ./configure +- Exit when required parameters not provided to win32/Makefile.gcc +- Have gzputc return the character written instead of the argument +- Use the -m option on ldconfig for BSD systems [Tobias] +- Correct in zlib.map when deflateResetKeep was added Changes in 1.2.5.3 (15 Jan 2012) - Restore gzgetc function for binary compatibility diff --git a/gzguts.h b/gzguts.h index 48bd98f..3107c36 100644 --- a/gzguts.h +++ b/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/gzwrite.c b/gzwrite.c index c48c906..caa35b6 100644 --- a/gzwrite.c +++ b/gzwrite.c @@ -1,5 +1,5 @@ /* gzwrite.c -- zlib functions for writing gzip files - * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ diff --git a/zlib.3 b/zlib.3 index d6b0b08..d051c79 100644 --- a/zlib.3 +++ b/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "xx Jan 2012" +.TH ZLIB 3 "29 Jan 2012" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS diff --git a/zlib.3.pdf b/zlib.3.pdf index 7ac376de1faaacaed3a307e9ad5584f4535b3f79..ffa2a78a37f77aa215df1918b68431764b6b5f63 100644 GIT binary patch delta 5924 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 diff --git a/zlib.h b/zlib.h index 9452fee..79142d1 100644 --- a/zlib.h +++ b/zlib.h @@ -1,5 +1,5 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.6, January xxth, 2012 + version 1.2.6, January 29th, 2012 Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.6-motley" +#define ZLIB_VERSION "1.2.6" #define ZLIB_VERNUM 0x1260 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2