[src/netbsd-1-5]: src/lib/libz Pull up revision 1.12 (requested by fvdl):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/699267791c95
branches:  netbsd-1-5
changeset: 492969:699267791c95
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 20 23:18:16 2002 +0000

description:
Pull up revision 1.12 (requested by fvdl):
  Upgrade libz to 1.1.4 due to a possible security bug.

diffstat:

 lib/libz/gzio.c |  6 +++---
 lib/libz/zlib.h |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r 53f7bde2ed17 -r 699267791c95 lib/libz/gzio.c
--- a/lib/libz/gzio.c   Wed Mar 20 23:18:14 2002 +0000
+++ b/lib/libz/gzio.c   Wed Mar 20 23:18:16 2002 +0000
@@ -1,13 +1,13 @@
-/* $NetBSD: gzio.c,v 1.9 1999/07/03 12:30:53 simonb Exp $ */
+/* $NetBSD: gzio.c,v 1.9.8.1 2002/03/20 23:18:16 he Exp $ */
 
 /* gzio.c -- IO on .gz files
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) Id */
+/* @(#) $Id: gzio.c,v 1.9.8.1 2002/03/20 23:18:16 he Exp $ */
 
 #include <stdio.h>
 
diff -r 53f7bde2ed17 -r 699267791c95 lib/libz/zlib.h
--- a/lib/libz/zlib.h   Wed Mar 20 23:18:14 2002 +0000
+++ b/lib/libz/zlib.h   Wed Mar 20 23:18:16 2002 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: zlib.h,v 1.9 1999/10/26 22:16:48 itojun Exp $ */
+/* $NetBSD: zlib.h,v 1.9.6.1 2002/03/20 23:18:16 he Exp $ */
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
+  version 1.1.4, March 11th, 2002
 
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -43,7 +43,7 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.1.3"
+#define ZLIB_VERSION "1.1.4"
 
 /* 
      The 'zlib' compression library provides in-memory compression and