Update head to match stable 1.0

zlib/ChangeLog

@@ -1,3 +1,7 @@
+2002-03-12  Werner Koch  <wk@gnupg.org>
+
+	Merged changes from zlib 1.1.4. 
+
 Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* Makefile.am: Removed -Wall
@@ -8,19 +12,27 @@ Wed Jan 20 21:40:21 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 Wed Jan 13 14:10:15 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
-
-	* Merged version 1.1.13 with the previousy used 1.0.4
+	Merged version 1.1.3 with the previousy used 1.0.4
 
 Thu Feb 12 12:20:45 1998  Werner Koch  (wk@frodo)
 
-- removed a couple of files, as this is only used if zlib is
-  missing on a system.
-- added automake stuff
+        Removed a couple of files, as this is only used if zlib is
+        missing on a system.  Added automake stuff
 
 
 		ChangeLog file for zlib
 
 
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
+
 Changes in 1.1.3 (9 July 1998)
 - fix "an inflate input buffer bug that shows up on rare but persistent
   occasions" (Mark)
@@ -489,3 +501,5 @@ Changes in 0.3:
 - use Z_FINISH instead of deflateEnd to finish compression.
 - added Z_HUFFMAN_ONLY
 - added gzerror()
+
+