zlib: Upgrade from 1.2.3 to 1.2.3.3 to add 64 bit extensions and improve operation on recent 64 bit platforms

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5094 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 167 insertions, 216 deletions

diff --git a/meta/packages/zlib/files/visibility.patch b/meta/packages/zlib/files/visibility.patch
index a4e7ae907a..2dee8e0fe2 100644
--- a/meta/packages/zlib/files/visibility.patch
+++ b/meta/packages/zlib/files/visibility.patch
@@ -3,9 +3,11 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- zlib-1.2.3-orig/adler32.c~visibility
-+++ zlib-1.2.3-orig/adler32.c
-@@ -54,7 +54,7 @@
+Index: zlib-1.2.3/adler32.c
+===================================================================
+--- zlib-1.2.3.orig/adler32.c	2008-08-23 11:17:43.000000000 +0100
++++ zlib-1.2.3/adler32.c	2008-08-23 11:17:44.000000000 +0100
+@@ -63,7 +63,7 @@
  #endif
  
  /* ========================================================================= */
@@ -14,8 +16,10 @@
      uLong adler;
      const Bytef *buf;
      uInt len;
---- zlib-1.2.3-orig/compress.c~visibility
-+++ zlib-1.2.3-orig/compress.c
+Index: zlib-1.2.3/compress.c
+===================================================================
+--- zlib-1.2.3.orig/compress.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/compress.c	2008-08-23 11:17:44.000000000 +0100
 @@ -19,7 +19,7 @@
     memory, Z_BUF_ERROR if there was not enough room in the output buffer,
     Z_STREAM_ERROR if the level parameter is invalid.
@@ -42,10 +46,12 @@
 +ZEXPORT uLong compressBound (sourceLen)
      uLong sourceLen;
  {
-     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
---- zlib-1.2.3-orig/crc32.c~visibility
-+++ zlib-1.2.3-orig/crc32.c
-@@ -202,7 +202,7 @@
+     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+Index: zlib-1.2.3/crc32.c
+===================================================================
+--- zlib-1.2.3.orig/crc32.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/crc32.c	2008-08-23 11:17:44.000000000 +0100
+@@ -208,7 +208,7 @@
  /* =========================================================================
   * This function can be used by asm versions of crc32()
   */
@@ -54,7 +60,7 @@
  {
  #ifdef DYNAMIC_CRC_TABLE
      if (crc_table_empty)
-@@ -216,7 +216,7 @@
+@@ -222,7 +222,7 @@
  #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
  
  /* ========================================================================= */
@@ -63,8 +69,10 @@
      unsigned long crc;
      const unsigned char FAR *buf;
      unsigned len;
---- zlib-1.2.3-orig/deflate.c~visibility
-+++ zlib-1.2.3-orig/deflate.c
+Index: zlib-1.2.3/deflate.c
+===================================================================
+--- zlib-1.2.3.orig/deflate.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/deflate.c	2008-08-23 11:17:44.000000000 +0100
 @@ -201,7 +201,7 @@
      zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
  
@@ -120,15 +128,15 @@
      int level;
      int strategy;
 @@ -486,7 +486,7 @@
-  * But even the conservative upper bound of about 14% expansion does not
-  * seem onerous for output buffer allocation.
+  * upper bound of about 14% expansion does not seem onerous for output buffer
+  * allocation.
   */
 -uLong ZEXPORT deflateBound(strm, sourceLen)
 +ZEXPORT uLong deflateBound(strm, sourceLen)
      z_streamp strm;
      uLong sourceLen;
  {
-@@ -549,7 +549,7 @@
+@@ -581,7 +581,7 @@
  }
  
  /* ========================================================================= */
@@ -137,7 +145,7 @@
      z_streamp strm;
      int flush;
  {
-@@ -856,7 +856,7 @@
+@@ -888,7 +888,7 @@
  }
  
  /* ========================================================================= */
@@ -146,7 +154,7 @@
      z_streamp strm;
  {
      int status;
-@@ -891,7 +891,7 @@
+@@ -923,7 +923,7 @@
   * To simplify the source, this is not supported for 16-bit MSDOS (which
   * doesn't have enough memory anyway to duplicate compression states).
   */
@@ -155,9 +163,11 @@
      z_streamp dest;
      z_streamp source;
  {
---- zlib-1.2.3-orig/gzio.c~visibility
-+++ zlib-1.2.3-orig/gzio.c
-@@ -205,7 +205,7 @@
+Index: zlib-1.2.3/gzio.c
+===================================================================
+--- zlib-1.2.3.orig/gzio.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/gzio.c	2008-08-23 11:17:44.000000000 +0100
+@@ -233,7 +233,7 @@
  /* ===========================================================================
       Opens a gzip (.gz) file for reading or writing.
  */
@@ -166,7 +176,7 @@
      const char *path;
      const char *mode;
  {
-@@ -216,7 +216,7 @@
+@@ -254,7 +254,7 @@
       Associate a gzFile with the file descriptor fd. fd is not dup'ed here
     to mimic the behavio(u)r of fdopen.
  */
@@ -175,7 +185,7 @@
      int fd;
      const char *mode;
  {
-@@ -231,7 +231,7 @@
+@@ -269,7 +269,7 @@
  /* ===========================================================================
   * Update the compression level and strategy
   */
@@ -184,7 +194,7 @@
      gzFile file;
      int level;
      int strategy;
-@@ -391,7 +391,7 @@
+@@ -430,7 +430,7 @@
       Reads the given number of uncompressed bytes from the compressed file.
     gzread returns the number of bytes actually read (0 for end of file).
  */
@@ -193,7 +203,7 @@
      gzFile file;
      voidp buf;
      unsigned len;
-@@ -500,7 +500,7 @@
+@@ -539,7 +539,7 @@
        Reads one byte from the compressed file. gzgetc returns this byte
     or -1 in case of end of file or error.
  */
@@ -202,7 +212,7 @@
      gzFile file;
  {
      unsigned char c;
-@@ -512,7 +512,7 @@
+@@ -551,7 +551,7 @@
  /* ===========================================================================
        Push one byte back onto the stream.
  */
@@ -211,7 +221,7 @@
      int c;
      gzFile file;
  {
-@@ -537,7 +537,7 @@
+@@ -576,7 +576,7 @@
  
        The current implementation is not optimized at all.
  */
@@ -220,7 +230,7 @@
      gzFile file;
      char *buf;
      int len;
-@@ -556,7 +556,7 @@
+@@ -595,7 +595,7 @@
       Writes the given number of uncompressed bytes into the compressed file.
     gzwrite returns the number of bytes actually written (0 in case of error).
  */
@@ -229,7 +239,7 @@
      gzFile file;
      voidpc buf;
      unsigned len;
-@@ -600,7 +600,7 @@
+@@ -639,7 +639,7 @@
  #ifdef STDC
  #include <stdarg.h>
  
@@ -238,7 +248,7 @@
  {
      char buf[Z_PRINTF_BUFSIZE];
      va_list va;
-@@ -634,7 +634,7 @@
+@@ -673,7 +673,7 @@
  }
  #else /* not ANSI C */
  
@@ -247,7 +257,7 @@
                         a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
      gzFile file;
      const char *format;
-@@ -675,7 +675,7 @@
+@@ -714,7 +714,7 @@
        Writes c, converted to an unsigned char, into the compressed file.
     gzputc returns the value that was written, or -1 in case of error.
  */
@@ -256,7 +266,7 @@
      gzFile file;
      int c;
  {
-@@ -690,7 +690,7 @@
+@@ -729,7 +729,7 @@
     the terminating null character.
        gzputs returns the number of characters written, or -1 in case of error.
  */
@@ -265,7 +275,7 @@
      gzFile file;
      const char *s;
  {
-@@ -743,7 +743,7 @@
+@@ -782,7 +782,7 @@
      return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
  }
  
@@ -274,16 +284,16 @@
       gzFile file;
       int flush;
  {
-@@ -764,7 +764,7 @@
-       SEEK_END is not implemented, returns error.
-       In this version of the library, gzseek can be extremely slow.
+@@ -906,7 +906,7 @@
+ /* ===========================================================================
+     Define external functions gzseek() and gzseek64() using local gz_seek().
  */
 -z_off_t ZEXPORT gzseek (file, offset, whence)
 +ZEXPORT z_off_t gzseek (file, offset, whence)
      gzFile file;
      z_off_t offset;
      int whence;
-@@ -854,7 +854,7 @@
+@@ -935,7 +935,7 @@
  /* ===========================================================================
       Rewinds input file.
  */
@@ -292,7 +302,7 @@
      gzFile file;
  {
      gz_stream *s = (gz_stream*)file;
-@@ -878,7 +878,7 @@
+@@ -959,7 +959,7 @@
     given compressed file. This position represents a number of bytes in the
     uncompressed data stream.
  */
@@ -301,7 +311,7 @@
      gzFile file;
  {
      return gzseek(file, 0L, SEEK_CUR);
-@@ -888,7 +888,7 @@
+@@ -982,7 +982,7 @@
       Returns 1 when EOF has previously been detected reading the given
     input stream, otherwise zero.
  */
@@ -310,7 +320,7 @@
      gzFile file;
  {
      gz_stream *s = (gz_stream*)file;
-@@ -950,7 +950,7 @@
+@@ -1044,7 +1044,7 @@
       Flushes all pending output if necessary, closes the compressed file
     and deallocates all the (de)compression state.
  */
@@ -319,7 +329,7 @@
      gzFile file;
  {
      gz_stream *s = (gz_stream*)file;
-@@ -984,7 +984,7 @@
+@@ -1078,7 +1078,7 @@
     errnum is set to Z_ERRNO and the application may consult errno
     to get the exact error code.
  */
@@ -328,7 +338,7 @@
      gzFile file;
      int *errnum;
  {
-@@ -1014,7 +1014,7 @@
+@@ -1108,7 +1108,7 @@
  /* ===========================================================================
       Clear the error and end-of-file flags, and do the same for the real file.
  */
@@ -337,8 +347,10 @@
      gzFile file;
  {
      gz_stream *s = (gz_stream*)file;
---- zlib-1.2.3-orig/infback.c~visibility
-+++ zlib-1.2.3-orig/infback.c
+Index: zlib-1.2.3/infback.c
+===================================================================
+--- zlib-1.2.3.orig/infback.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/infback.c	2008-08-23 11:17:44.000000000 +0100
 @@ -25,7 +25,7 @@
     windowBits is in the range 8..15, and window is a user-supplied
     window and output buffer that is 2**windowBits bytes.
@@ -366,8 +378,10 @@
  z_streamp strm;
  {
      if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
---- zlib-1.2.3-orig/inflate.c~visibility
-+++ zlib-1.2.3-orig/inflate.c
+Index: zlib-1.2.3/inflate.c
+===================================================================
+--- zlib-1.2.3.orig/inflate.c	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/inflate.c	2008-08-23 11:17:44.000000000 +0100
 @@ -100,7 +100,7 @@
  local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
                                unsigned len));
@@ -377,7 +391,7 @@
  z_streamp strm;
  {
      struct inflate_state FAR *state;
-@@ -141,7 +141,7 @@
+@@ -142,7 +142,7 @@
      return Z_OK;
  }
  
@@ -386,7 +400,7 @@
  z_streamp strm;
  int windowBits;
  const char *version;
-@@ -184,7 +184,7 @@
+@@ -185,7 +185,7 @@
      return inflateReset(strm);
  }
  
@@ -395,7 +409,7 @@
  z_streamp strm;
  const char *version;
  int stream_size;
-@@ -551,7 +551,7 @@
+@@ -552,7 +552,7 @@
     will return Z_BUF_ERROR if it has not reached the end of the stream.
   */
  
@@ -404,7 +418,7 @@
  z_streamp strm;
  int flush;
  {
-@@ -1152,7 +1152,7 @@
+@@ -1168,7 +1168,7 @@
      return ret;
  }
  
@@ -413,7 +427,7 @@
  z_streamp strm;
  {
      struct inflate_state FAR *state;
-@@ -1166,7 +1166,7 @@
+@@ -1182,7 +1182,7 @@
      return Z_OK;
  }
  
@@ -422,7 +436,7 @@
  z_streamp strm;
  const Bytef *dictionary;
  uInt dictLength;
-@@ -1259,7 +1259,7 @@
+@@ -1275,7 +1275,7 @@
      return next;
  }
  
@@ -431,7 +445,7 @@
  z_streamp strm;
  {
      unsigned len;               /* number of bytes to look at or looked at */
-@@ -1310,7 +1310,7 @@
+@@ -1326,7 +1326,7 @@
     block. When decompressing, PPP checks that at the end of input packet,
     inflate is waiting for these length bytes.
   */
@@ -440,7 +454,7 @@
  z_streamp strm;
  {
      struct inflate_state FAR *state;
-@@ -1320,7 +1320,7 @@
+@@ -1336,7 +1336,7 @@
      return state->mode == STORED && state->bits == 0;
  }
  
@@ -449,8 +463,10 @@
  z_streamp dest;
  z_streamp source;
  {
---- zlib-1.2.3-orig/uncompr.c~visibility
-+++ zlib-1.2.3-orig/uncompr.c
+Index: zlib-1.2.3/uncompr.c
+===================================================================
+--- zlib-1.2.3.orig/uncompr.c	2003-07-07 06:36:56.000000000 +0100
++++ zlib-1.2.3/uncompr.c	2008-08-23 11:17:44.000000000 +0100
 @@ -23,7 +23,7 @@
     enough memory, Z_BUF_ERROR if there was not enough room in the output
     buffer, or Z_DATA_ERROR if the input data was corrupted.
@@ -460,88 +476,11 @@
      Bytef *dest;
      uLongf *destLen;
      const Bytef *source;
---- zlib-1.2.3-orig/zconf.in.h~visibility
-+++ zlib-1.2.3-orig/zconf.in.h
-@@ -204,11 +204,9 @@
-     */
- #  ifdef ZLIB_DLL
- #    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
--#      ifdef ZLIB_INTERNAL
--#        define ZEXTERN extern __declspec(dllexport)
--#      else
--#        define ZEXTERN extern __declspec(dllimport)
--#      endif
-+#      define ZDLLLOCAL __declspec(dllimport)
-+#      define ZDLLPUBLIC __declspec(dllexport)
-+#      define ZEXTERN extern
- #    endif
- #  endif  /* ZLIB_DLL */
-    /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-@@ -229,30 +227,45 @@
- #      define ZEXPORTVA FAR CDECL
- #    endif
- #  endif
--#endif
--
--#if defined (__BEOS__)
-+#elif defined (__BEOS__)
- #  ifdef ZLIB_DLL
--#    ifdef ZLIB_INTERNAL
--#      define ZEXPORT   __declspec(dllexport)
--#      define ZEXPORTVA __declspec(dllexport)
--#    else
--#      define ZEXPORT   __declspec(dllimport)
--#      define ZEXPORTVA __declspec(dllimport)
--#    endif
-+#    define ZDLLIMPORT __declspec(dllimport)
-+#    define ZDLLPUBLIC __declspec(dllexport)
-+#    define ZDLLLOCAL
-+#  endif
-+#else
-+#  define ZDLLIMPORT
-+#  ifdef GCC_HASCLASSVISIBILITY
-+#    define ZDLLLOCAL __attribute__ ((visibility("hidden")))
-+#    define ZDLLPUBLIC __attribute__ ((visibility("default")))
-+#  else
-+#    define ZDLLLOCAL
-+#    define ZDLLPUBLIC
- #  endif
- #endif
- 
- #ifndef ZEXTERN
- #  define ZEXTERN extern
- #endif
--#ifndef ZEXPORT
--#  define ZEXPORT
--#endif
--#ifndef ZEXPORTVA
--#  define ZEXPORTVA
-+#ifdef ZLIB_INTERNAL
-+#  ifndef ZLIB_DLL
-+#   define ZEXPORT
-+#   define ZEXPORTVA
-+#  endif
-+#  ifndef ZEXPORT
-+#    define ZEXPORT ZDLLPUBLIC
-+#  endif
-+#  ifndef ZEXPORTVA
-+#    define ZEXPORTVA ZDLLPUBLIC
-+#  endif
-+#else
-+#  ifndef ZEXPORT
-+#    define ZEXPORT ZDLLIMPORT
-+#  endif
-+#  ifndef ZEXPORTVA
-+#    define ZEXPORTVA ZDLLIMPORT
-+#  endif
- #endif
--
- #ifndef FAR
- #  define FAR
- #endif
---- zlib-1.2.3-orig/zlib.h~visibility
-+++ zlib-1.2.3-orig/zlib.h
-@@ -209,7 +209,7 @@
+Index: zlib-1.2.3/zlib.h
+===================================================================
+--- zlib-1.2.3.orig/zlib.h	2008-08-23 11:17:44.000000000 +0100
++++ zlib-1.2.3/zlib.h	2008-08-23 11:23:26.000000000 +0100
+@@ -212,7 +212,7 @@
  
                          /* basic functions */
  
@@ -550,7 +489,7 @@
  /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
     If the first character differs, the library code actually used is
     not compatible with the zlib.h header file used by the application.
-@@ -217,7 +217,7 @@
+@@ -220,7 +220,7 @@
   */
  
  /*
@@ -559,7 +498,7 @@
  
       Initializes the internal stream state for compression. The fields
     zalloc, zfree and opaque must be initialized before by the caller.
-@@ -239,7 +239,7 @@
+@@ -242,7 +242,7 @@
  */
  
  
@@ -568,7 +507,7 @@
  /*
      deflate compresses as much data as possible, and stops when the input
    buffer becomes empty or the output buffer becomes full. It may introduce some
-@@ -325,7 +325,7 @@
+@@ -328,7 +328,7 @@
  */
  
  
@@ -577,7 +516,7 @@
  /*
       All dynamically allocated data structures for this stream are freed.
     This function discards any unprocessed input and does not flush any
-@@ -340,7 +340,7 @@
+@@ -343,7 +343,7 @@
  
  
  /*
@@ -586,7 +525,7 @@
  
       Initializes the internal stream state for decompression. The fields
     next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-@@ -360,7 +360,7 @@
+@@ -367,7 +367,7 @@
  */
  
  
@@ -595,7 +534,7 @@
  /*
      inflate decompresses as much data as possible, and stops when the input
    buffer becomes empty or the output buffer becomes full. It may introduce
-@@ -459,7 +459,7 @@
+@@ -466,7 +466,7 @@
  */
  
  
@@ -604,7 +543,7 @@
  /*
       All dynamically allocated data structures for this stream are freed.
     This function discards any unprocessed input and does not flush any
-@@ -477,7 +477,7 @@
+@@ -484,7 +484,7 @@
  */
  
  /*
@@ -613,7 +552,7 @@
                                       int  level,
                                       int  method,
                                       int  windowBits,
-@@ -535,7 +535,7 @@
+@@ -542,7 +542,7 @@
     not perform any compression: this will be done by deflate().
  */
  
@@ -622,7 +561,7 @@
                                               const Bytef *dictionary,
                                               uInt  dictLength));
  /*
-@@ -574,7 +574,7 @@
+@@ -581,7 +581,7 @@
     perform any compression: this will be done by deflate().
  */
  
@@ -631,7 +570,7 @@
                                      z_streamp source));
  /*
       Sets the destination stream as a complete copy of the source stream.
-@@ -592,7 +592,7 @@
+@@ -599,7 +599,7 @@
     destination.
  */
  
@@ -640,7 +579,7 @@
  /*
       This function is equivalent to deflateEnd followed by deflateInit,
     but does not free and reallocate all the internal compression state.
-@@ -603,7 +603,7 @@
+@@ -610,7 +610,7 @@
     stream state was inconsistent (such as zalloc or state being NULL).
  */
  
@@ -649,7 +588,7 @@
                                        int level,
                                        int strategy));
  /*
-@@ -641,7 +641,7 @@
+@@ -648,7 +648,7 @@
     returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
   */
  
@@ -658,8 +597,8 @@
                                         uLong sourceLen));
  /*
       deflateBound() returns an upper bound on the compressed size after
-@@ -650,7 +650,7 @@
-    for deflation in a single pass, and so would be called before deflate().
+@@ -658,7 +658,7 @@
+    called before deflate().
  */
  
 -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
@@ -667,7 +606,7 @@
                                       int bits,
                                       int value));
  /*
-@@ -691,7 +691,7 @@
+@@ -699,7 +699,7 @@
  */
  
  /*
@@ -676,8 +615,8 @@
                                       int  windowBits));
  
       This is another version of inflateInit with an extra parameter. The
-@@ -733,7 +733,7 @@
-    and avail_out are unchanged.)
+@@ -745,7 +745,7 @@
+    that is deferred until inflate() is called.
  */
  
 -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -685,7 +624,7 @@
                                               const Bytef *dictionary,
                                               uInt  dictLength));
  /*
-@@ -755,7 +755,7 @@
+@@ -767,7 +767,7 @@
     inflate().
  */
  
@@ -694,7 +633,7 @@
  /*
      Skips invalid compressed data until a full flush point (see above the
    description of deflate with Z_FULL_FLUSH) can be found, or until all
-@@ -770,7 +770,7 @@
+@@ -782,7 +782,7 @@
    until success or end of the input data.
  */
  
@@ -703,7 +642,7 @@
                                      z_streamp source));
  /*
       Sets the destination stream as a complete copy of the source stream.
-@@ -786,7 +786,7 @@
+@@ -798,7 +798,7 @@
     destination.
  */
  
@@ -712,7 +651,7 @@
  /*
       This function is equivalent to inflateEnd followed by inflateInit,
     but does not free and reallocate all the internal decompression state.
-@@ -853,7 +853,7 @@
+@@ -865,7 +865,7 @@
  */
  
  /*
@@ -721,7 +660,7 @@
                                          unsigned char FAR *window));
  
       Initialize the internal stream state for decompression using inflateBack()
-@@ -877,7 +877,7 @@
+@@ -889,7 +889,7 @@
  typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
  typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
  
@@ -730,7 +669,7 @@
                                      in_func in, void FAR *in_desc,
                                      out_func out, void FAR *out_desc));
  /*
-@@ -946,7 +946,7 @@
+@@ -958,7 +958,7 @@
     that inflateBack() cannot return Z_OK.
  */
  
@@ -739,7 +678,7 @@
  /*
       All memory allocated by inflateBackInit() is freed.
  
-@@ -954,7 +954,7 @@
+@@ -966,7 +966,7 @@
     state was inconsistent.
  */
  
@@ -748,7 +687,7 @@
  /* Return flags indicating compile-time options.
  
      Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-@@ -1006,7 +1006,7 @@
+@@ -1018,7 +1018,7 @@
     utility functions can easily be modified if you need special options.
  */
  
@@ -757,7 +696,7 @@
                                   const Bytef *source, uLong sourceLen));
  /*
       Compresses the source buffer into the destination buffer.  sourceLen is
-@@ -1021,7 +1021,7 @@
+@@ -1033,7 +1033,7 @@
     buffer.
  */
  
@@ -766,7 +705,7 @@
                                    const Bytef *source, uLong sourceLen,
                                    int level));
  /*
-@@ -1037,14 +1037,14 @@
+@@ -1049,14 +1049,14 @@
     Z_STREAM_ERROR if the level parameter is invalid.
  */
  
@@ -783,16 +722,7 @@
                                     const Bytef *source, uLong sourceLen));
  /*
       Decompresses the source buffer into the destination buffer.  sourceLen is
-@@ -1065,7 +1065,7 @@
- 
- typedef voidp gzFile;
- 
--ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-+ZEXTERN ZEXPORT gzFile gzopen  OF((const char *path, const char *mode));
- /*
-      Opens a gzip (.gz) file for reading or writing. The mode parameter
-    is as in fopen ("rb" or "wb") but can also include a compression level
-@@ -1082,7 +1082,7 @@
+@@ -1095,7 +1095,7 @@
     can be checked to distinguish the two cases (if errno is zero, the
     zlib error is Z_MEM_ERROR).  */
  
@@ -801,7 +731,7 @@
  /*
       gzdopen() associates a gzFile with the file descriptor fd.  File
     descriptors are obtained from calls like open, dup, creat, pipe or
-@@ -1095,7 +1095,7 @@
+@@ -1108,7 +1108,7 @@
     the (de)compression state.
  */
  
@@ -810,7 +740,7 @@
  /*
       Dynamically update the compression level or strategy. See the description
     of deflateInit2 for the meaning of these parameters.
-@@ -1103,7 +1103,7 @@
+@@ -1116,7 +1116,7 @@
     opened for writing.
  */
  
@@ -819,7 +749,7 @@
  /*
       Reads the given number of uncompressed bytes from the compressed file.
     If the input file was not in gzip format, gzread copies the given number
-@@ -1111,7 +1111,7 @@
+@@ -1124,7 +1124,7 @@
       gzread returns the number of uncompressed bytes actually read (0 for
     end of file, -1 for error). */
  
@@ -828,7 +758,7 @@
                                     voidpc buf, unsigned len));
  /*
       Writes the given number of uncompressed bytes into the compressed file.
-@@ -1119,7 +1119,7 @@
+@@ -1132,7 +1132,7 @@
     (0 in case of error).
  */
  
@@ -837,7 +767,7 @@
  /*
       Converts, formats, and writes the args to the compressed file under
     control of the format string, as in fprintf. gzprintf returns the number of
-@@ -1132,14 +1132,14 @@
+@@ -1145,14 +1145,14 @@
     because the secure snprintf() or vsnprintf() functions were not available.
  */
  
@@ -854,7 +784,7 @@
  /*
        Reads bytes from the compressed file until len-1 characters are read, or
     a newline character is read and transferred to buf, or an end-of-file
-@@ -1148,19 +1148,19 @@
+@@ -1161,19 +1161,19 @@
        gzgets returns buf, or Z_NULL in case of error.
  */
  
@@ -877,7 +807,7 @@
  /*
        Push one character back onto the stream to be read again later.
     Only one character of push-back is allowed.  gzungetc() returns the
-@@ -1170,7 +1170,7 @@
+@@ -1183,7 +1183,7 @@
     or gzrewind().
  */
  
@@ -886,38 +816,21 @@
  /*
       Flushes all pending output into the compressed file. The parameter
     flush is as in the deflate() function. The return value is the zlib
-@@ -1180,7 +1180,7 @@
-    degrade compression.
- */
- 
--ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-+ZEXTERN ZEXPORT z_off_t    gzseek OF((gzFile file,
-                                       z_off_t offset, int whence));
- /*
-       Sets the starting position for the next gzread or gzwrite on the
-@@ -1198,14 +1198,14 @@
+@@ -1212,7 +1212,7 @@
     would be before the current position.
  */
  
 -ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-+ZEXTERN ZEXPORT int    gzrewind OF((gzFile file));
++ZEXTERN ZEXPORT int     gzrewind OF((gzFile file));
  /*
       Rewinds the given file. This function is supported only for reading.
  
-    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
- */
- 
--ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-+ZEXTERN ZEXPORT z_off_t    gztell OF((gzFile file));
- /*
-      Returns the starting position for the next gzread or gzwrite on the
-    given compressed file. This position represents a number of bytes in the
-@@ -1214,26 +1214,26 @@
+@@ -1229,19 +1229,19 @@
     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
  */
  
 -ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-+ZEXTERN ZEXPORT int gzeof OF((gzFile file));
++ZEXTERN ZEXPORT int  gzeof OF((gzFile file));
  /*
       Returns 1 when EOF has previously been detected reading the given
     input stream, otherwise zero.
@@ -931,11 +844,12 @@
  */
  
 -ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-+ZEXTERN ZEXPORT int    gzclose OF((gzFile file));
++ZEXTERN ZEXPORT int     gzclose OF((gzFile file));
  /*
       Flushes all pending output if necessary, closes the compressed file
     and deallocates all the (de)compression state. The return value is the zlib
-    error number (see function gzerror below).
+@@ -1249,7 +1249,7 @@
+    file, since its structures have been deallocated.
  */
  
 -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
@@ -943,8 +857,8 @@
  /*
       Returns the error message for the last error which occurred on the
     given compressed file. errnum is set to zlib error number. If an
-@@ -1242,7 +1242,7 @@
-    to get the exact error code.
+@@ -1261,7 +1261,7 @@
+    this function may invalidate the returned string.
  */
  
 -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
@@ -952,7 +866,7 @@
  /*
       Clears the error and end-of-file flags for file. This is analogous to the
     clearerr() function in stdio. This is useful for continuing to read a gzip
-@@ -1257,7 +1257,7 @@
+@@ -1276,7 +1276,7 @@
     compression library.
  */
  
@@ -961,7 +875,7 @@
  /*
       Update a running Adler-32 checksum with the bytes buf[0..len-1] and
     return the updated checksum. If buf is NULL, this function returns
-@@ -1282,7 +1282,7 @@
+@@ -1302,7 +1302,7 @@
     seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
  */
  
@@ -970,7 +884,7 @@
  /*
       Update a running CRC-32 with the bytes buf[0..len-1] and return the
     updated CRC-32. If buf is NULL, this function returns the required initial
-@@ -1314,17 +1314,17 @@
+@@ -1334,17 +1334,17 @@
  /* deflateInit and inflateInit are macros to allow checking the zlib version
   * and the compiler's view of z_stream:
   */
@@ -993,21 +907,58 @@
                                           unsigned char FAR *window,
                                           const char *version,
                                           int stream_size));
-@@ -1346,9 +1346,9 @@
+@@ -1362,11 +1362,11 @@
+                                             ZLIB_VERSION, sizeof(z_stream))
+ 
+ #ifdef _LARGEFILE64_SOURCE
+-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+-   ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int));
+-   ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile));
+-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t));
+-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
++   ZEXTERN ZEXPORT gzFile gzopen64 OF((const char *, const char *));
++   ZEXTERN ZEXPORT off64_t gzseek64 OF((gzFile, off64_t, int));
++   ZEXTERN ZEXPORT off64_t gztell64 OF((gzFile));
++   ZEXTERN ZEXPORT uLong adler32_combine64 OF((uLong, uLong, off64_t));
++   ZEXTERN ZEXPORT uLong crc32_combine64 OF((uLong, uLong, off64_t));
+ #endif
+ 
+ #if _FILE_OFFSET_BITS == 64
+@@ -1376,21 +1376,21 @@
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+ #else
+-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
++   ZEXTERN ZEXPORT gzFile gzopen OF((const char *, const char *));
++   ZEXTERN ZEXPORT z_off_t gzseek OF((gzFile, z_off_t, int));
++   ZEXTERN ZEXPORT z_off_t gztell OF((gzFile));
++   ZEXTERN ZEXPORT uLong adler32_combine OF((uLong, uLong, z_off_t));
++   ZEXTERN ZEXPORT uLong crc32_combine OF((uLong, uLong, z_off_t));
+ #endif
+ 
+ #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
      struct internal_state {int dummy;}; /* hack for buggy compilers */
  #endif
  
 -ZEXTERN const char   * ZEXPORT zError           OF((int));
--ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 -ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-+ZEXTERN ZEXPORT const char   *  zError           OF((int));
-+ZEXTERN ZEXPORT int            inflateSyncPoint OF((z_streamp z));
-+ZEXTERN ZEXPORT const uLongf *  get_crc_table    OF((void));
+-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
++ZEXTERN ZEXPORT const char   * zError           OF((int));
++ZEXTERN ZEXPORT int            inflateSyncPoint OF((z_streamp));
++ZEXTERN ZEXPORT const uLongf * get_crc_table    OF((void));
++ZEXTERN ZEXPORT int            inflateUndermine OF((z_streamp, int));
  
  #ifdef __cplusplus
  }
---- zlib-1.2.3-orig/zutil.c~visibility
-+++ zlib-1.2.3-orig/zutil.c
+Index: zlib-1.2.3/zutil.c
+===================================================================
+--- zlib-1.2.3.orig/zutil.c	2005-06-13 01:37:49.000000000 +0100
++++ zlib-1.2.3/zutil.c	2008-08-23 11:17:44.000000000 +0100
 @@ -24,12 +24,12 @@
  ""};