zlib 1.2.6

diff --git a/ChangeLog b/ChangeLog
index 198e55f72ac20c27345105dfc0b26942b05795c2..6fa5d4411ac9a9c728206987b267c9f91e3b4b22 100644 (file)
--- 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 48bd98ff1b76861ad1a0a2cbf9b45b709a2cea91..3107c363b25484684302dc2dc4d298a7bd8df601 100644 (file)
--- 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 c48c906daed96c5c762c4f7662e91cd7ab0582b3..caa35b61ad9d834fe5a7a0b66cc23b4a5f4e386a 100644 (file)
--- 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 d6b0b081a262c68f5274c5143026bf29045e29ca..d051c79b54072581c485a678de992cd46b37317b 100644 (file)
--- 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 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 9452fee5baf63da2b7886abb30ed9a62d04c7b24..79142d1172e8760ac89ac7b2ad92a79928af737c 100644 (file)
--- 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