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

3 files changed, 459 insertions, 310 deletions

diff --git a/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz b/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz
new file mode 100644
index 0000000000..2afb60de8c
--- /dev/null
+++ b/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz
diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch
index d1dc8dd8d4..d70c2f6892 100644
--- a/meta/packages/zlib/files/autotools.patch
+++ b/meta/packages/zlib/files/autotools.patch
@@ -1,7 +1,8 @@
-diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
---- zlib-1.2.3/configure	2005-07-11 22:11:57.000000000 +0200
-+++ zlib-1.2.3new/configure	1970-01-01 01:00:00.000000000 +0100
-@@ -1,459 +0,0 @@
+Index: zlib-1.2.3/configure
+===================================================================
+--- zlib-1.2.3.orig/configure	2008-08-23 11:23:47.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,558 +0,0 @@
 -#!/bin/sh
 -# configure script for zlib. This script is needed only if
 -# you wish to build a shared library and your system supports them,
@@ -27,7 +28,8 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
 -VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
 -VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
--AR=${AR-"ar rc"}
+-AR=${AR-"ar"}
+-AR_RC="${AR} rc"
 -RANLIB=${RANLIB-"ranlib"}
 -prefix=${prefix-/usr/local}
 -exec_prefix=${exec_prefix-'${prefix}'}
@@ -35,7 +37,8 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -includedir=${includedir-'${prefix}/include'}
 -mandir=${mandir-'${prefix}/share/man'}
 -shared_ext='.so'
--shared=0
+-shared=1
+-zprefix=0
 -gcc=0
 -old_cc="$CC"
 -old_cflags="$CFLAGS"
@@ -43,20 +46,25 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -while test $# -ge 1
 -do
 -case "$1" in
--    -h* | --h*)
+-    -h* | --help)
 -      echo 'usage:'
 -      echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'
--      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
+-      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR] [--zprefix]'
 -        exit 0;;
--    -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
--    -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+-    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+-    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
 -    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
 -    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
--    -p* | --p*) prefix="$2"; shift; shift;;
--    -e* | --e*) exec_prefix="$2"; shift; shift;;
--    -l* | --l*) libdir="$2"; shift; shift;;
--    -i* | --i*) includedir="$2"; shift; shift;;
--    -s* | --s*) shared=1; shift;;
+-    -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
+-    -p* | --prefix) prefix="$2"; shift; shift;;
+-    -e* | --eprefix) exec_prefix="$2"; shift; shift;;
+-    -l* | --libdir) libdir="$2"; shift; shift;;
+-    -i* | --includedir) includedir="$2"; shift; shift;;
+-    -s* | --shared | --enable-shared) shared=1; shift;;
+-    -t | --static) shared=0; shift;;
+-    -z* | --zprefix) zprefix=1; shift;;
+-    --sysconfdir=*) echo "ignored option: --sysconfdir"; shift;;
+-    --localstatedir=*) echo "ignored option: --localstatedir"; shift;;
 -    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;
 -    esac
 -done
@@ -77,10 +85,13 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -
 -if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
 -  CC="$cc"
--  SFLAGS=${CFLAGS-"-fPIC -O3"}
--  CFLAGS="$cflags"
--  case `(uname -s || echo unknown) 2>/dev/null` in
--  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+-  SFLAGS="${CFLAGS-"-O3"} -fPIC"
+-  CFLAGS="${CFLAGS-"-O3"}"
+-  if test -z $uname; then
+-    uname=`(uname -s || echo unknown) 2>/dev/null`
+-  fi
+-  case "$uname" in
+-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"};;
 -  CYGWIN* | Cygwin* | cygwin* | OS/2* )
 -             EXE='.exe';;
 -  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
@@ -106,7 +117,10 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -else
 -  # find system name and corresponding cc options
 -  CC=${CC-cc}
--  case `(uname -sr || echo unknown) 2>/dev/null` in
+-  if test -z $uname; then
+-    uname=`(uname -sr || echo unknown) 2>/dev/null`
+-  fi
+-  case "$uname" in
 -  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
 -             CFLAGS=${CFLAGS-"-O"}
 -#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
@@ -121,24 +135,30 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -         esac;;
 -  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
 -             CFLAGS=${CFLAGS-"-ansi -O2"}
--             LDSHARED=${LDSHARED-"cc -shared"};;
+-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"};;
 -  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
 -             CFLAGS=${CFLAGS-"-O -std1"}
 -             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;
 -  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
 -             CFLAGS=${CFLAGS-"-O -std1"}
--             LDSHARED=${LDSHARED-"cc -shared"};;
+-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"};;
 -  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
 -             CFLAGS=${CFLAGS-"-4 -O"}
 -             LDSHARED=${LDSHARED-"cc"}
 -             RANLIB=${RANLIB-"true"}
--             AR="cc -A";;
+-             AR_RC="cc -A";;
 -  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
 -             CFLAGS=${CFLAGS-"-O3"}
 -             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
--  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
--             CFLAGS=${CFLAGS-"-fast -xcg89"}
--             LDSHARED=${LDSHARED-"cc -G"};;
+-  SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}
+-         case `(uname -m || echo unknown) 2>/dev/null` in
+-         i86*)
+-             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
+-             CFLAGS=${CFLAGS-"-xpentium -fast"};;
+-         *)
+-             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
+-             CFLAGS=${CFLAGS-"-fast -xcg92"};;
+-         esac;;
 -  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
 -             CFLAGS=${CFLAGS-"-O2"}
 -             LDSHARED=${LDSHARED-"ld"};;
@@ -177,22 +197,63 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -  # we must test in two steps (cc then ld), required at least on SunOS 4.x
 -  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
 -     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
--    CFLAGS="$SFLAGS"
--    LIBS="$SHAREDLIBV"
+-    LIBS="$LIBS $SHAREDLIBV"
 -    echo Building shared library $SHAREDLIBV with $CC.
 -  elif test -z "$old_cc" -a -z "$old_cflags"; then
 -    echo No shared library support.
 -    shared=0;
 -  else
+-    echo Tested $CC -c $SFLAGS $test.c
+-    $CC -c $SFLAGS $test.c
+-    echo Tested $LDSHARED -o $test$shared_ext $test.o
+-    $LDSHARED -o $test$shared_ext $test.o
 -    echo 'No shared library support; try without defining CC and CFLAGS'
 -    shared=0;
 -  fi
 -fi
 -if test $shared -eq 0; then
 -  LDSHARED="$CC"
+-  ALL="allstatic"
+-  TEST="teststatic"
 -  echo Building static library $LIBS version $VER with $CC.
 -else
--  LDFLAGS="-L. ${SHAREDLIBV}"
+-  ALL="allstatic allshared"
+-  TEST="teststatic testshared"
+-fi
+-
+-cat > zlibdefs.h << EOF
+-/* zlibdefs.h -- compile-time definitions for the zlib compression library
+- * Copyright (C) 1995-2006 Jean-loup Gailly.
+- * For conditions of distribution and use, see copyright notice in zlib.h
+- */
+-
+-EOF
+-
+-cat > $test.c <<EOF
+-#include <sys/types.h>
+-off64_t dummy = 0;
+-EOF
+-if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then
+-  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
+-  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
+-  echo "Checking for off64_t... Yes."
+-  echo "Checking for fseeko... Yes."
+-else
+-  echo "Checking for off64_t... No."
+-  cat > $test.c <<EOF
+-#include <stdio.h>
+-int main(void) {
+-  fseeko(NULL, 0, 0);
+-  return 0;
+-}
+-EOF
+-  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
+-    echo "Checking for fseeko... Yes."
+-  else
+-    CFLAGS="${CFLAGS} -DNO_FSEEKO"
+-    SFLAGS="${SFLAGS} -DNO_FSEEKO"
+-    echo "Checking for fseeko... No."
+-  fi
 -fi
 -
 -cat > $test.c <<EOF
@@ -200,13 +261,27 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -int main() { return 0; }
 -EOF
 -if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
--  sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h
+-  cat >> zlibdefs.h <<EOF
+-#include <sys/types.h>	/* for off_t */
+-#include <unistd.h>	/* for SEEK_* and off_t */
+-#ifdef VMS
+-#  include <unixio.h>	/* for off_t */
+-#endif
+-#ifndef z_off_t
+-#  define z_off_t off_t
+-#endif
+-EOF
 -  echo "Checking for unistd.h... Yes."
 -else
--  cp -p zconf.in.h zconf.h
 -  echo "Checking for unistd.h... No."
 -fi
 -
+-if test $zprefix -eq 1; then
+-  sed < zconf.h "/#ifdef Z_PREFIX/s/def Z_PREFIX/ 1/" > zconf.temp.h
+-  mv zconf.temp.h zconf.h
+-  echo "Using z_ prefix on all symbols."
+-fi
+-
 -cat > $test.c <<EOF
 -#include <stdio.h>
 -#include <stdarg.h>
@@ -223,7 +298,7 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -EOF
 -
 -if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
--  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"
+-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()."
 -
 -  cat > $test.c <<EOF
 -#include <stdio.h>
@@ -320,7 +395,7 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -    fi
 -  fi
 -else
--  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()"
+-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()."
 -
 -  cat >$test.c <<EOF
 -#include <stdio.h>
@@ -445,13 +520,36 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -sed < Makefile.in "
 -/^CC *=/s#=.*#=$CC#
 -/^CFLAGS *=/s#=.*#=$CFLAGS#
+-/^SFLAGS *=/s#=.*#=$SFLAGS#
+-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+-/^LDSHARED *=/s#=.*#=$LDSHARED#
+-/^CPP *=/s#=.*#=$CPP#
+-/^LIBS *=/s#=.*#=$LIBS#
+-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+-/^AR *=/s#=.*#=$AR_RC#
+-/^RANLIB *=/s#=.*#=$RANLIB#
+-/^EXE *=/s#=.*#=$EXE#
+-/^prefix *=/s#=.*#=$prefix#
+-/^exec_prefix *=/s#=.*#=$exec_prefix#
+-/^libdir *=/s#=.*#=$libdir#
+-/^includedir *=/s#=.*#=$includedir#
+-/^mandir *=/s#=.*#=$mandir#
+-/^all: */s#:.*#: $ALL#
+-/^test: */s#:.*#: $TEST#
+-" > Makefile
+-
+-sed < zlib.pc.in "
+-/^CC *=/s#=.*#=$CC#
+-/^CFLAGS *=/s#=.*#=$CFLAGS#
 -/^CPP *=/s#=.*#=$CPP#
 -/^LDSHARED *=/s#=.*#=$LDSHARED#
 -/^LIBS *=/s#=.*#=$LIBS#
 -/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
 -/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
 -/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
--/^AR *=/s#=.*#=$AR#
+-/^AR *=/s#=.*#=$AR_RC#
 -/^RANLIB *=/s#=.*#=$RANLIB#
 -/^EXE *=/s#=.*#=$EXE#
 -/^prefix *=/s#=.*#=$prefix#
@@ -460,11 +558,14 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure
 -/^includedir *=/s#=.*#=$includedir#
 -/^mandir *=/s#=.*#=$mandir#
 -/^LDFLAGS *=/s#=.*#=$LDFLAGS#
--" > Makefile
-diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac
---- zlib-1.2.3/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.3new/configure.ac	2006-08-07 20:38:31.612402750 +0200
-@@ -0,0 +1,14 @@
+-" | sed -e "
+-s/\@VERSION\@/$VER/g;
+-" > zlib.pc
+Index: zlib-1.2.3/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ zlib-1.2.3/configure.ac	2008-08-23 12:01:15.000000000 +0100
+@@ -0,0 +1,48 @@
 +AC_INIT(zlib,1.2.3)
 +AC_CONFIG_SRCDIR(adler32.c)
 +AM_INIT_AUTOMAKE(zlibs,1.2.3)
@@ -476,27 +577,63 @@ diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac
 +
 +AC_HEADER_STDC
 +
++zlib_save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
++AC_CHECK_TYPES(off64_t)
++CPPFLAGS=$zlib_save_CPPFLAGS
++
++AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [
++    zlib_cv_use_lfs64=yes
++    if test "$ac_cv_off64_t" = "yes"; then
++        zlib_cv_use_lfs64=yes
++    fi
++])
++
++if test "$zlib_cv_use_lfs64" = "yes"; then
++    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
++    echo "eek"
++    #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
++fi    
++
++cat > zlibdefs.h << EOF
++/* zlibdefs.h -- compile-time definitions for the zlib compression library
++ * Copyright (C) 1995-2006 Jean-loup Gailly.
++ * For conditions of distribution and use, see copyright notice in zlib.h
++ */
++
++#include <sys/types.h>	/* for off_t */
++#include <unistd.h>	/* for SEEK_* and off_t */
++#ifdef VMS
++#  include <unixio.h>	/* for off_t */
++#endif
++#ifndef z_off_t
++#  define z_off_t off_t
++#endif
++EOF
++
 +AC_CONFIG_FILES([Makefile])
 +
 +AC_OUTPUT
-diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am
---- zlib-1.2.3/Makefile.am	2006/10/14 05:35:40	1.1
-+++ zlib-1.2.3new/Makefile.am	2006/10/14 05:36:49
+Index: zlib-1.2.3/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ zlib-1.2.3/Makefile.am	2008-08-23 11:23:47.000000000 +0100
 @@ -0,0 +1,8 @@
 +lib_LTLIBRARIES = libz.la
 +
 +libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \
 +		  trees.c zutil.c inflate.c infback.c inftrees.c inffast.c
 +
-+libz_la_LDFLAGS = -version-number 1:2:3
++libz_la_LDFLAGS = -version-number 1:2:3 --version-script zlib.map
 +
-+include_HEADERS = zconf.h zlib.h
-diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
---- zlib-1.2.3/Makefile.in	2005-07-18 04:25:21.000000000 +0200
-+++ zlib-1.2.3new/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,154 +0,0 @@
++include_HEADERS = zconf.h zlib.h zlibdefs.h
+Index: zlib-1.2.3/Makefile.in
+===================================================================
+--- zlib-1.2.3.orig/Makefile.in	2008-08-23 11:23:47.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,215 +0,0 @@
 -# Makefile for zlib
--# Copyright (C) 1995-2005 Jean-loup Gailly.
+-# Copyright (C) 1995-2006 Jean-loup Gailly.
 -# For conditions of distribution and use, see copyright notice in zlib.h
 -
 -# To compile and test, type:
@@ -521,16 +658,18 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 -#           -Wstrict-prototypes -Wmissing-prototypes
 -
+-SFLAGS=-O
+-
 -LDFLAGS=libz.a
 -LDSHARED=$(CC)
 -CPP=$(CC) -E
 -
 -LIBS=libz.a
 -SHAREDLIB=libz.so
--SHAREDLIBV=libz.so.1.2.3
+-SHAREDLIBV=libz.so.1.2.3.3
 -SHAREDLIBM=libz.so.1
 -
--AR=ar rc
+-AR=ar
 -RANLIB=ranlib
 -TAR=tar
 -SHELL=/bin/sh
@@ -542,21 +681,28 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -includedir = ${prefix}/include
 -mandir = ${prefix}/share/man
 -man3dir = ${mandir}/man3
+-pkgconfigdir = ${libdir}/pkgconfig
 -
--OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+-OBJC = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 -       zutil.o inflate.o infback.o inftrees.o inffast.o
 -
 -OBJA =
 -# to use the asm code: make OBJA=match.o
 -
+-OBJS = $(OBJC) $(OBJA)
+-
+-PIC_OBJS = $(OBJS:%.o=%.lo)
+-
 -TEST_OBJS = example.o minigzip.o
 -
--all: example$(EXE) minigzip$(EXE)
+-allstatic: example$(EXE) minigzip$(EXE)
 -
--check: test
--test: all
--	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
--	echo hello world | ./minigzip | ./minigzip -d || \
+-allshared: examplesh$(EXE) minigzipsh$(EXE)
+-
+-all: allstatic allshared
+-
+-teststatic: allstatic
+-	@echo hello world | ./minigzip | ./minigzip -d || \
 -	  echo '		*** minigzip test FAILED ***' ; \
 -	if ./example; then \
 -	  echo '		*** zlib test OK ***'; \
@@ -564,8 +710,24 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -	  echo '		*** zlib test FAILED ***'; \
 -	fi
 -
--libz.a: $(OBJS) $(OBJA)
--	$(AR) $@ $(OBJS) $(OBJA)
+-testshared: allshared
+-	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+-	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
+-	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
+-	echo hello world | ./minigzipsh | ./minigzipsh -d || \
+-	  echo '		*** minigzip shared test FAILED ***' ; \
+-	if ./examplesh; then \
+-	  echo '		*** zlib shared test OK ***'; \
+-	else \
+-	  echo '		*** zlib shared test FAILED ***'; \
+-	fi
+-
+-test: teststatic testshared
+-
+-check: test
+-
+-libz.a: $(OBJS)
+-	$(AR) $@ $(OBJS)
 -	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 -
 -match.o: match.S
@@ -574,8 +736,17 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -	mv _match.o match.o
 -	rm -f _match.s
 -
--$(SHAREDLIBV): $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS)
+-match.lo: match.S
+-	$(CPP) match.S > _match.s
+-	$(CC) -c -fPIC _match.s
+-	mv _match.o match.lo
+-	rm -f _match.s
+-
+-%.lo: %.c
+-	$(CC) $(SFLAGS) -DPIC -c $< -o $@
+-
+-$(SHAREDLIBV): $(PIC_OBJS)
+-	$(LDSHARED) -o $@ $(PIC_OBJS) -lc
 -	rm -f $(SHAREDLIB) $(SHAREDLIBM)
 -	ln -s $@ $(SHAREDLIB)
 -	ln -s $@ $(SHAREDLIBM)
@@ -586,46 +757,60 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -minigzip$(EXE): minigzip.o $(LIBS)
 -	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 -
--install: $(LIBS)
--	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
--	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
--	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
--	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
--	cp zlib.h zconf.h $(includedir)
--	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
--	cp $(LIBS) $(libdir)
--	cd $(libdir); chmod 755 $(LIBS)
--	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
--	cd $(libdir); if test -f $(SHAREDLIBV); then \
+-examplesh$(EXE): example.o $(LIBS)
+-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIB)
+-
+-minigzipsh$(EXE): minigzip.o $(LIBS)
+-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIB)
+-
+-install-libs: $(LIBS)
+-	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
+-	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
+-	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+-	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+-	cp $(LIBS) $(DESTDIR)$(libdir)
+-	cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
+-	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+-	cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
 -	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
 -	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
 -	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
 -	  (ldconfig || true)  >/dev/null 2>&1; \
 -	fi
--	cp zlib.3 $(man3dir)
--	chmod 644 $(man3dir)/zlib.3
+-	cp zlib.3 $(DESTDIR)$(man3dir)
+-	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+-	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
+-	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 -# The ranlib in install is needed on NeXTSTEP which checks file times
 -# ldconfig is for Linux
 -
+-install: install-libs
+-	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+-	cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
+-	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
+-
 -uninstall:
--	cd $(includedir); \
--	cd $(libdir); rm -f libz.a; \
+-	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
+-	cd $(DESTDIR)$(libdir); rm -f libz.a; \
 -	if test -f $(SHAREDLIBV); then \
 -	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
 -	fi
--	cd $(man3dir); rm -f zlib.3
+-	cd $(DESTDIR)$(man3dir); rm -f zlib.3
+-	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
 -
 -mostlyclean: clean
 -clean:
--	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
+-	rm -f *.o *.lo *~ \
+-	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
 -	   libz.* foo.gz so_locations \
 -	   _match.s maketree contrib/infback9/*.o
 -
 -maintainer-clean: distclean
 -distclean: clean
 -	cp -p Makefile.in Makefile
--	cp -p zconf.in.h zconf.h
--	rm -f .DS_Store
+-	rm zlibdefs.h
+-	touch -r configure zlibdefs.h
+-	rm -f zlib.pc .DS_Store
 -
 -tags:
 -	etags *.[ch]
@@ -635,17 +820,30 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
 -
 -# DO NOT DELETE THIS LINE -- make depend depends on it.
 -
--adler32.o: zlib.h zconf.h
--compress.o: zlib.h zconf.h
--crc32.o: crc32.h zlib.h zconf.h
--deflate.o: deflate.h zutil.h zlib.h zconf.h
--example.o: zlib.h zconf.h
--gzio.o: zutil.h zlib.h zconf.h
--inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
--inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
--infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
--inftrees.o: zutil.h zlib.h zconf.h inftrees.h
--minigzip.o: zlib.h zconf.h
--trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
--uncompr.o: zlib.h zconf.h
--zutil.o: zutil.h zlib.h zconf.h
+-adler32.o: zlib.h zconf.h zlibdefs.h
+-compress.o: zlib.h zconf.h zlibdefs.h
+-crc32.o: crc32.h zlib.h zconf.h zlibdefs.h
+-deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
+-example.o: zlib.h zconf.h zlibdefs.h
+-gzio.o: zutil.h zlib.h zconf.h zlibdefs.h
+-inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
+-inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
+-infback.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
+-inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
+-minigzip.o: zlib.h zconf.h zlibdefs.h
+-trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
+-uncompr.o: zlib.h zconf.h zlibdefs.h
+-zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
+-
+-adler32.lo: zlib.h zconf.h zlibdefs.h
+-compress.lo: zlib.h zconf.h zlibdefs.h
+-crc32.lo: crc32.h zlib.h zconf.h zlibdefs.h
+-deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
+-gzio.lo: zutil.h zlib.h zconf.h zlibdefs.h
+-inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
+-inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
+-infback.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
+-inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
+-trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
+-uncompr.lo: zlib.h zconf.h zlibdefs.h
+-zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
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 @@
  ""};