diff options
Diffstat (limited to 'meta/packages/zlib')
-rw-r--r-- | meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz | bin | 51163 -> 0 bytes | |||
-rw-r--r-- | meta/packages/zlib/files/Makefile.am | 9 | ||||
-rw-r--r-- | meta/packages/zlib/files/autotools.patch | 849 | ||||
-rw-r--r-- | meta/packages/zlib/files/configure.ac | 48 | ||||
-rw-r--r-- | meta/packages/zlib/files/visibility.patch | 985 | ||||
-rw-r--r-- | meta/packages/zlib/zlib_1.2.3.bb | 19 | ||||
-rw-r--r-- | meta/packages/zlib/zlib_1.2.5.bb | 22 |
7 files changed, 79 insertions, 1853 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 Binary files differdeleted file mode 100644 index 2afb60de8..000000000 --- a/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz +++ /dev/null diff --git a/meta/packages/zlib/files/Makefile.am b/meta/packages/zlib/files/Makefile.am new file mode 100644 index 000000000..b66d299d8 --- /dev/null +++ b/meta/packages/zlib/files/Makefile.am @@ -0,0 +1,9 @@ +lib_LTLIBRARIES = libz.la + +libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \ + gzwrite.c uncompr.c deflate.c trees.c zutil.c inflate.c \ + infback.c inftrees.c inffast.c + +libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map + +include_HEADERS = zconf.h zlib.h zlibdefs.h diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch deleted file mode 100644 index c2db0848f..000000000 --- a/meta/packages/zlib/files/autotools.patch +++ /dev/null @@ -1,849 +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, --# of if you need special compiler, flags or install directory. --# Otherwise, you can just use directly "make test; make install" --# --# To create a shared library, use "configure --shared"; by default a static --# library is created. If the primitive shared library support provided here --# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz --# --# To impose specific compiler or flags or install directory, use for example: --# prefix=$HOME CC=cc CFLAGS="-O4" ./configure --# or for csh/tcsh users: --# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) --# LDSHARED is the command to be used to create a shared library -- --# Incorrect settings of CC or CFLAGS may prevent creating a shared library. --# If you have problems, try without defining CC and CFLAGS before reporting --# an error. -- --LIBS=libz.a --LDFLAGS="-L. ${LIBS}" --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"} --AR_RC="${AR} rc" --RANLIB=${RANLIB-"ranlib"} --prefix=${prefix-/usr/local} --exec_prefix=${exec_prefix-'${prefix}'} --libdir=${libdir-'${exec_prefix}/lib'} --includedir=${includedir-'${prefix}/include'} --mandir=${mandir-'${prefix}/share/man'} --shared_ext='.so' --shared=1 --zprefix=0 --gcc=0 --old_cc="$CC" --old_cflags="$CFLAGS" -- --while test $# -ge 1 --do --case "$1" in -- -h* | --help) -- echo 'usage:' -- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' -- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR] [--zprefix]' -- exit 0;; -- -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;; -- -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 -- --test=ztest$$ --cat > $test.c <<EOF --extern int getchar(); --int hello() {return getchar();} --EOF -- --test -z "$CC" && echo Checking for gcc... --cc=${CC-gcc} --cflags=${CFLAGS-"-O3"} --# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure --case "$cc" in -- *gcc*) gcc=1;; --esac -- --if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then -- CC="$cc" -- 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 -- # (alain.bonnefoy@icbt.com) -- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; -- HP-UX*) -- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} -- case `(uname -m || echo unknown) 2>/dev/null` in -- ia64) -- shared_ext='.so' -- SHAREDLIB='libz.so';; -- *) -- shared_ext='.sl' -- SHAREDLIB='libz.sl';; -- esac;; -- Darwin*) shared_ext='.dylib' -- SHAREDLIB=libz$shared_ext -- SHAREDLIBV=libz.$VER$shared_ext -- SHAREDLIBM=libz.$VER1$shared_ext -- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; -- *) LDSHARED=${LDSHARED-"$cc -shared"};; -- esac --else -- # find system name and corresponding cc options -- CC=${CC-cc} -- 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"} -- LDSHARED=${LDSHARED-"ld -b"} -- case `(uname -m || echo unknown) 2>/dev/null` in -- ia64) -- shared_ext='.so' -- SHAREDLIB='libz.so';; -- *) -- shared_ext='.sl' -- SHAREDLIB='libz.sl';; -- esac;; -- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} -- CFLAGS=${CFLAGS-"-ansi -O2"} -- 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 -Wl,-soname,libz.so.1"};; -- QNX*) SFLAGS=${CFLAGS-"-4 -O"} -- CFLAGS=${CFLAGS-"-4 -O"} -- LDSHARED=${LDSHARED-"cc"} -- RANLIB=${RANLIB-"true"} -- AR_RC="cc -A";; -- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} -- CFLAGS=${CFLAGS-"-O3"} -- LDSHARED=${LDSHARED-"cc -dy -KPIC -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"};; -- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} -- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} -- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; -- UNIX_System_V\ 4.2.0) -- SFLAGS=${CFLAGS-"-KPIC -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- UNIX_SV\ 4.2MP) -- SFLAGS=${CFLAGS-"-Kconform_pic -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- OpenUNIX\ 5) -- SFLAGS=${CFLAGS-"-KPIC -O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -G"};; -- AIX*) # Courtesy of dbakker@arrayasolutions.com -- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} -- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} -- LDSHARED=${LDSHARED-"xlc -G"};; -- # send working options for other systems to support@gzip.org -- *) SFLAGS=${CFLAGS-"-O"} -- CFLAGS=${CFLAGS-"-O"} -- LDSHARED=${LDSHARED-"cc -shared"};; -- esac --fi -- --SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} --SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} --SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} -- --if test $shared -eq 1; then -- echo Checking for shared library support... -- # 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 -- 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 -- 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 --#include <unistd.h> --int main() { return 0; } --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- 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 -- 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> --#include "zconf.h" -- --int main() --{ --#ifndef STDC -- choke me --#endif -- -- return 0; --} --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()." -- -- cat > $test.c <<EOF --#include <stdio.h> --#include <stdarg.h> -- --int mytest(char *fmt, ...) --{ -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- vsnprintf(buf, sizeof(buf), fmt, ap); -- va_end(ap); -- return 0; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then -- echo "Checking for vsnprintf() in stdio.h... Yes." -- -- cat >$test.c <<EOF --#include <stdio.h> --#include <stdarg.h> -- --int mytest(char *fmt, ...) --{ -- int n; -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- n = vsnprintf(buf, sizeof(buf), fmt, ap); -- va_end(ap); -- return n; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of vsnprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" -- echo "Checking for return value of vsnprintf()... No." -- echo " WARNING: apparently vsnprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- else -- CFLAGS="$CFLAGS -DNO_vsnprintf" -- echo "Checking for vsnprintf() in stdio.h... No." -- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" -- echo " can build but will be open to possible buffer-overflow security" -- echo " vulnerabilities." -- -- cat >$test.c <<EOF --#include <stdio.h> --#include <stdarg.h> -- --int mytest(char *fmt, ...) --{ -- int n; -- char buf[20]; -- va_list ap; -- -- va_start(ap, fmt); -- n = vsprintf(buf, fmt, ap); -- va_end(ap); -- return n; --} -- --int main() --{ -- return (mytest("Hello%d\n", 1)); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of vsprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_vsprintf_void" -- echo "Checking for return value of vsprintf()... No." -- echo " WARNING: apparently vsprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- fi --else -- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." -- -- cat >$test.c <<EOF --#include <stdio.h> -- --int mytest() --{ -- char buf[20]; -- -- snprintf(buf, sizeof(buf), "%s", "foo"); -- return 0; --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then -- echo "Checking for snprintf() in stdio.h... Yes." -- -- cat >$test.c <<EOF --#include <stdio.h> -- --int mytest() --{ -- char buf[20]; -- -- return snprintf(buf, sizeof(buf), "%s", "foo"); --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of snprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_snprintf_void" -- echo "Checking for return value of snprintf()... No." -- echo " WARNING: apparently snprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- else -- CFLAGS="$CFLAGS -DNO_snprintf" -- echo "Checking for snprintf() in stdio.h... No." -- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" -- echo " can build but will be open to possible buffer-overflow security" -- echo " vulnerabilities." -- -- cat >$test.c <<EOF --#include <stdio.h> -- --int mytest() --{ -- char buf[20]; -- -- return sprintf(buf, "%s", "foo"); --} -- --int main() --{ -- return (mytest()); --} --EOF -- -- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for return value of sprintf()... Yes." -- else -- CFLAGS="$CFLAGS -DHAS_sprintf_void" -- echo "Checking for return value of sprintf()... No." -- echo " WARNING: apparently sprintf() does not return a value. zlib" -- echo " can build but will be open to possible string-format security" -- echo " vulnerabilities." -- fi -- fi --fi -- --cat >$test.c <<EOF --#include <errno.h> --int main() { return 0; } --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- echo "Checking for errno.h... Yes." --else -- echo "Checking for errno.h... No." -- CFLAGS="$CFLAGS -DNO_ERRNO_H" --fi -- --cat > $test.c <<EOF --#include <sys/types.h> --#include <sys/mman.h> --#include <sys/stat.h> --caddr_t hello() { -- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); --} --EOF --if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then -- CFLAGS="$CFLAGS -DUSE_MMAP" -- echo Checking for mmap support... Yes. --else -- echo Checking for mmap support... No. --fi -- --CPP=${CPP-"$CC -E"} --case $CFLAGS in -- *ASMV*) -- if test "`nm $test.o | grep _hello`" = ""; then -- CPP="$CPP -DNO_UNDERLINE" -- echo Checking for underline in external names... No. -- else -- echo Checking for underline in external names... Yes. -- fi;; --esac -- --rm -f $test.[co] $test $test$shared_ext -- --# udpate Makefile --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_RC# --/^RANLIB *=/s#=.*#=$RANLIB# --/^EXE *=/s#=.*#=$EXE# --/^prefix *=/s#=.*#=$prefix# --/^exec_prefix *=/s#=.*#=$exec_prefix# --/^libdir *=/s#=.*#=$libdir# --/^includedir *=/s#=.*#=$includedir# --/^mandir *=/s#=.*#=$mandir# --/^LDFLAGS *=/s#=.*#=$LDFLAGS# --" | 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) -+ -+AC_PREREQ([2.59]) -+ -+AC_PROG_CC([gcc]) -+AC_PROG_LIBTOOL -+ -+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=no -+ if test "$ac_cv_type_off64_t" = "yes"; then -+ zlib_cv_use_lfs64=yes -+ fi -+]) -+ -+if test "$zlib_cv_use_lfs64" = "yes"; then -+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" -+ -+ #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 -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 --version-script zlib.map -+ -+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-2006 Jean-loup Gailly. --# For conditions of distribution and use, see copyright notice in zlib.h -- --# To compile and test, type: --# ./configure; make test --# The call of configure is optional if you don't have special requirements --# If you wish to build zlib as a shared library, use: ./configure -s -- --# To use the asm code, type: --# cp contrib/asm?86/match.S ./match.S --# make LOC=-DASMV OBJA=match.o -- --# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: --# make install --# To install in $HOME instead of /usr/local, use: --# make install prefix=$HOME -- --CC=cc -- --CFLAGS=-O --#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 --#CFLAGS=-g -DDEBUG --#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.3 --SHAREDLIBM=libz.so.1 -- --AR=ar --RANLIB=ranlib --TAR=tar --SHELL=/bin/sh --EXE= -- --prefix = /usr/local --exec_prefix = ${prefix} --libdir = ${exec_prefix}/lib --includedir = ${prefix}/include --mandir = ${prefix}/share/man --man3dir = ${mandir}/man3 --pkgconfigdir = ${libdir}/pkgconfig -- --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 -- --allstatic: example$(EXE) minigzip$(EXE) -- --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 ***'; \ -- else \ -- echo ' *** zlib test FAILED ***'; \ -- fi -- --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 -- $(CPP) match.S > _match.s -- $(CC) -c _match.s -- mv _match.o match.o -- rm -f _match.s -- --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) -- --example$(EXE): example.o $(LIBS) -- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -- --minigzip$(EXE): minigzip.o $(LIBS) -- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -- --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 $(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 $(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 $(DESTDIR)$(man3dir); rm -f zlib.3 -- cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc -- --mostlyclean: clean --clean: -- 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 -- rm zlibdefs.h -- touch -r configure zlibdefs.h -- rm -f zlib.pc .DS_Store -- --tags: -- etags *.[ch] -- --depend: -- makedepend -- $(CFLAGS) -- *.[ch] -- --# DO NOT DELETE THIS LINE -- make depend depends on it. -- --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/configure.ac b/meta/packages/zlib/files/configure.ac new file mode 100644 index 000000000..4761b7ef2 --- /dev/null +++ b/meta/packages/zlib/files/configure.ac @@ -0,0 +1,48 @@ +AC_INIT(zlib,1.2.5) +AC_CONFIG_SRCDIR(adler32.c) +AM_INIT_AUTOMAKE(zlibs,1.2.5) + +AC_PREREQ([2.59]) + +AC_PROG_CC([gcc]) +AC_PROG_LIBTOOL + +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=no + if test "$ac_cv_type_off64_t" = "yes"; then + zlib_cv_use_lfs64=yes + fi +]) + +if test "$zlib_cv_use_lfs64" = "yes"; then + CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" + + #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 --git a/meta/packages/zlib/files/visibility.patch b/meta/packages/zlib/files/visibility.patch deleted file mode 100644 index 2dee8e0fe..000000000 --- a/meta/packages/zlib/files/visibility.patch +++ /dev/null @@ -1,985 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -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 - - /* ========================================================================= */ --uLong ZEXPORT adler32(adler, buf, len) -+ZEXPORT uLong adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -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. - */ --int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) -+ZEXPORT int compress2 (dest, destLen, source, sourceLen, level) - Bytef *dest; - uLongf *destLen; - const Bytef *source; -@@ -59,7 +59,7 @@ - - /* =========================================================================== - */ --int ZEXPORT compress (dest, destLen, source, sourceLen) -+ZEXPORT int compress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; -@@ -72,7 +72,7 @@ - If the default memLevel or windowBits for deflateInit() is changed, then - this function needs to be updated. - */ --uLong ZEXPORT compressBound (sourceLen) -+ZEXPORT uLong compressBound (sourceLen) - uLong sourceLen; - { - 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() - */ --const unsigned long FAR * ZEXPORT get_crc_table() -+ZEXPORT const unsigned long FAR * get_crc_table() - { - #ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) -@@ -222,7 +222,7 @@ - #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - - /* ========================================================================= */ --unsigned long ZEXPORT crc32(crc, buf, len) -+ZEXPORT unsigned long crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -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)); - - /* ========================================================================= */ --int ZEXPORT deflateInit_(strm, level, version, stream_size) -+ZEXPORT int deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; -@@ -213,7 +213,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, -+ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; -@@ -312,7 +312,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) -+ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -354,7 +354,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateReset (strm) -+ZEXPORT int deflateReset (strm) - z_streamp strm; - { - deflate_state *s; -@@ -401,7 +401,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflatePrime (strm, bits, value) -+ZEXPORT int deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -@@ -413,7 +413,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateParams(strm, level, strategy) -+ZEXPORT int deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -@@ -486,7 +486,7 @@ - * 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; - { -@@ -581,7 +581,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflate (strm, flush) -+ZEXPORT int deflate (strm, flush) - z_streamp strm; - int flush; - { -@@ -888,7 +888,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateEnd (strm) -+ZEXPORT int deflateEnd (strm) - z_streamp strm; - { - int status; -@@ -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). - */ --int ZEXPORT deflateCopy (dest, source) -+ZEXPORT int deflateCopy (dest, source) - z_streamp dest; - z_streamp source; - { -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. - */ --gzFile ZEXPORT gzopen (path, mode) -+ZEXPORT gzFile gzopen (path, mode) - const char *path; - const char *mode; - { -@@ -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. - */ --gzFile ZEXPORT gzdopen (fd, mode) -+ZEXPORT gzFile gzdopen (fd, mode) - int fd; - const char *mode; - { -@@ -269,7 +269,7 @@ - /* =========================================================================== - * Update the compression level and strategy - */ --int ZEXPORT gzsetparams (file, level, strategy) -+ZEXPORT int gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -@@ -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). - */ --int ZEXPORT gzread (file, buf, len) -+ZEXPORT int gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -@@ -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. - */ --int ZEXPORT gzgetc(file) -+ZEXPORT int gzgetc(file) - gzFile file; - { - unsigned char c; -@@ -551,7 +551,7 @@ - /* =========================================================================== - Push one byte back onto the stream. - */ --int ZEXPORT gzungetc(c, file) -+ZEXPORT int gzungetc(c, file) - int c; - gzFile file; - { -@@ -576,7 +576,7 @@ - - The current implementation is not optimized at all. - */ --char * ZEXPORT gzgets(file, buf, len) -+ZEXPORT char * gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -@@ -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). - */ --int ZEXPORT gzwrite (file, buf, len) -+ZEXPORT int gzwrite (file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -@@ -639,7 +639,7 @@ - #ifdef STDC - #include <stdarg.h> - --int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -+ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...) - { - char buf[Z_PRINTF_BUFSIZE]; - va_list va; -@@ -673,7 +673,7 @@ - } - #else /* not ANSI C */ - --int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, -+ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; -@@ -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. - */ --int ZEXPORT gzputc(file, c) -+ZEXPORT int gzputc(file, c) - gzFile file; - int c; - { -@@ -729,7 +729,7 @@ - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. - */ --int ZEXPORT gzputs(file, s) -+ZEXPORT int gzputs(file, s) - gzFile file; - const char *s; - { -@@ -782,7 +782,7 @@ - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; - } - --int ZEXPORT gzflush (file, flush) -+ZEXPORT int gzflush (file, flush) - gzFile file; - int flush; - { -@@ -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; -@@ -935,7 +935,7 @@ - /* =========================================================================== - Rewinds input file. - */ --int ZEXPORT gzrewind (file) -+ZEXPORT int gzrewind (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -959,7 +959,7 @@ - given compressed file. This position represents a number of bytes in the - uncompressed data stream. - */ --z_off_t ZEXPORT gztell (file) -+ZEXPORT z_off_t gztell (file) - gzFile file; - { - return gzseek(file, 0L, SEEK_CUR); -@@ -982,7 +982,7 @@ - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. - */ --int ZEXPORT gzeof (file) -+ZEXPORT int gzeof (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -1044,7 +1044,7 @@ - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. - */ --int ZEXPORT gzclose (file) -+ZEXPORT int gzclose (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -1078,7 +1078,7 @@ - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. - */ --const char * ZEXPORT gzerror (file, errnum) -+ZEXPORT const char * gzerror (file, errnum) - gzFile file; - int *errnum; - { -@@ -1108,7 +1108,7 @@ - /* =========================================================================== - Clear the error and end-of-file flags, and do the same for the real file. - */ --void ZEXPORT gzclearerr (file) -+ZEXPORT void gzclearerr (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -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. - */ --int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -+ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size) - z_streamp strm; - int windowBits; - unsigned char FAR *window; -@@ -238,7 +238,7 @@ - inflateBack() can also return Z_STREAM_ERROR if the input parameters - are not correct, i.e. strm is Z_NULL or the state was not initialized. - */ --int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -+ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc) - z_streamp strm; - in_func in; - void FAR *in_desc; -@@ -611,7 +611,7 @@ - return ret; - } - --int ZEXPORT inflateBackEnd(strm) -+ZEXPORT int inflateBackEnd(strm) - z_streamp strm; - { - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) -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)); - --int ZEXPORT inflateReset(strm) -+ZEXPORT int inflateReset(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -142,7 +142,7 @@ - return Z_OK; - } - --int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -+ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size) - z_streamp strm; - int windowBits; - const char *version; -@@ -185,7 +185,7 @@ - return inflateReset(strm); - } - --int ZEXPORT inflateInit_(strm, version, stream_size) -+ZEXPORT int inflateInit_(strm, version, stream_size) - z_streamp strm; - const char *version; - int stream_size; -@@ -552,7 +552,7 @@ - will return Z_BUF_ERROR if it has not reached the end of the stream. - */ - --int ZEXPORT inflate(strm, flush) -+ZEXPORT int inflate(strm, flush) - z_streamp strm; - int flush; - { -@@ -1168,7 +1168,7 @@ - return ret; - } - --int ZEXPORT inflateEnd(strm) -+ZEXPORT int inflateEnd(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -1182,7 +1182,7 @@ - return Z_OK; - } - --int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -+ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -1275,7 +1275,7 @@ - return next; - } - --int ZEXPORT inflateSync(strm) -+ZEXPORT int inflateSync(strm) - z_streamp strm; - { - unsigned len; /* number of bytes to look at or looked at */ -@@ -1326,7 +1326,7 @@ - block. When decompressing, PPP checks that at the end of input packet, - inflate is waiting for these length bytes. - */ --int ZEXPORT inflateSyncPoint(strm) -+ZEXPORT int inflateSyncPoint(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -1336,7 +1336,7 @@ - return state->mode == STORED && state->bits == 0; - } - --int ZEXPORT inflateCopy(dest, source) -+ZEXPORT int inflateCopy(dest, source) - z_streamp dest; - z_streamp source; - { -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. - */ --int ZEXPORT uncompress (dest, destLen, source, sourceLen) -+ZEXPORT int uncompress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; -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 */ - --ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -+ZEXTERN ZEXPORT const char * zlibVersion OF((void)); - /* 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. -@@ -220,7 +220,7 @@ - */ - - /* --ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); -+ZEXTERN ZEXPORT int deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. -@@ -242,7 +242,7 @@ - */ - - --ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -+ZEXTERN ZEXPORT int deflate OF((z_streamp strm, int flush)); - /* - 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 -@@ -328,7 +328,7 @@ - */ - - --ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int deflateEnd OF((z_streamp strm)); - /* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any -@@ -343,7 +343,7 @@ - - - /* --ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by -@@ -367,7 +367,7 @@ - */ - - --ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -+ZEXTERN ZEXPORT int inflate OF((z_streamp strm, int flush)); - /* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce -@@ -466,7 +466,7 @@ - */ - - --ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateEnd OF((z_streamp strm)); - /* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any -@@ -484,7 +484,7 @@ - */ - - /* --ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, -@@ -542,7 +542,7 @@ - not perform any compression: this will be done by deflate(). - */ - --ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); - /* -@@ -581,7 +581,7 @@ - perform any compression: this will be done by deflate(). - */ - --ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, -+ZEXTERN ZEXPORT int deflateCopy OF((z_streamp dest, - z_streamp source)); - /* - Sets the destination stream as a complete copy of the source stream. -@@ -599,7 +599,7 @@ - destination. - */ - --ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -+ZEXTERN ZEXPORT int deflateReset OF((z_streamp strm)); - /* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. -@@ -610,7 +610,7 @@ - stream state was inconsistent (such as zalloc or state being NULL). - */ - --ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateParams OF((z_streamp strm, - int level, - int strategy)); - /* -@@ -648,7 +648,7 @@ - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - --ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, -+ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm, - uLong sourceLen)); - /* - deflateBound() returns an upper bound on the compressed size after -@@ -658,7 +658,7 @@ - called before deflate(). - */ - --ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm, - int bits, - int value)); - /* -@@ -699,7 +699,7 @@ - */ - - /* --ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The -@@ -745,7 +745,7 @@ - that is deferred until inflate() is called. - */ - --ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); - /* -@@ -767,7 +767,7 @@ - inflate(). - */ - --ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateSync OF((z_streamp strm)); - /* - 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 -@@ -782,7 +782,7 @@ - until success or end of the input data. - */ - --ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, -+ZEXTERN ZEXPORT int inflateCopy OF((z_streamp dest, - z_streamp source)); - /* - Sets the destination stream as a complete copy of the source stream. -@@ -798,7 +798,7 @@ - destination. - */ - --ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateReset OF((z_streamp strm)); - /* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. -@@ -865,7 +865,7 @@ - */ - - /* --ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() -@@ -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)); - --ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); - /* -@@ -958,7 +958,7 @@ - that inflateBack() cannot return Z_OK. - */ - --ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateBackEnd OF((z_streamp strm)); - /* - All memory allocated by inflateBackInit() is freed. - -@@ -966,7 +966,7 @@ - state was inconsistent. - */ - --ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -+ZEXTERN ZEXPORT uLong zlibCompileFlags OF((void)); - /* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: -@@ -1018,7 +1018,7 @@ - utility functions can easily be modified if you need special options. - */ - --ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - /* - Compresses the source buffer into the destination buffer. sourceLen is -@@ -1033,7 +1033,7 @@ - buffer. - */ - --ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); - /* -@@ -1049,14 +1049,14 @@ - Z_STREAM_ERROR if the level parameter is invalid. - */ - --ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); -+ZEXTERN ZEXPORT uLong compressBound OF((uLong sourceLen)); - /* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before - a compress() or compress2() call to allocate the destination buffer. - */ - --ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - /* - Decompresses the source buffer into the destination buffer. sourceLen is -@@ -1095,7 +1095,7 @@ - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). */ - --ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -+ZEXTERN ZEXPORT gzFile gzdopen OF((int fd, const char *mode)); - /* - gzdopen() associates a gzFile with the file descriptor fd. File - descriptors are obtained from calls like open, dup, creat, pipe or -@@ -1108,7 +1108,7 @@ - the (de)compression state. - */ - --ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -+ZEXTERN ZEXPORT int gzsetparams OF((gzFile file, int level, int strategy)); - /* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. -@@ -1116,7 +1116,7 @@ - opened for writing. - */ - --ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -+ZEXTERN ZEXPORT int gzread OF((gzFile file, voidp buf, unsigned len)); - /* - 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 -@@ -1124,7 +1124,7 @@ - gzread returns the number of uncompressed bytes actually read (0 for - end of file, -1 for error). */ - --ZEXTERN int ZEXPORT gzwrite OF((gzFile file, -+ZEXTERN ZEXPORT int gzwrite OF((gzFile file, - voidpc buf, unsigned len)); - /* - Writes the given number of uncompressed bytes into the compressed file. -@@ -1132,7 +1132,7 @@ - (0 in case of error). - */ - --ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -+ZEXTERN ZEXPORTVA int gzprintf OF((gzFile file, const char *format, ...)); - /* - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of -@@ -1145,14 +1145,14 @@ - because the secure snprintf() or vsnprintf() functions were not available. - */ - --ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -+ZEXTERN ZEXPORT int gzputs OF((gzFile file, const char *s)); - /* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. - */ - --ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -+ZEXTERN ZEXPORT char * gzgets OF((gzFile file, char *buf, int len)); - /* - 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 -@@ -1161,19 +1161,19 @@ - gzgets returns buf, or Z_NULL in case of error. - */ - --ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -+ZEXTERN ZEXPORT int gzputc OF((gzFile file, int c)); - /* - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. - */ - --ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -+ZEXTERN ZEXPORT int gzgetc OF((gzFile file)); - /* - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. - */ - --ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); -+ZEXTERN ZEXPORT int gzungetc OF((int c, gzFile file)); - /* - Push one character back onto the stream to be read again later. - Only one character of push-back is allowed. gzungetc() returns the -@@ -1183,7 +1183,7 @@ - or gzrewind(). - */ - --ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -+ZEXTERN ZEXPORT int gzflush OF((gzFile file, int flush)); - /* - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. The return value is the zlib -@@ -1212,7 +1212,7 @@ - would be before the current position. - */ - --ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -+ZEXTERN ZEXPORT int gzrewind OF((gzFile file)); - /* - Rewinds the given file. This function is supported only for reading. - -@@ -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)); - /* - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. - */ - --ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); -+ZEXTERN ZEXPORT int gzdirect OF((gzFile file)); - /* - Returns 1 if file is being read directly without decompression, otherwise - zero. - */ - --ZEXTERN int ZEXPORT 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 -@@ -1249,7 +1249,7 @@ - file, since its structures have been deallocated. - */ - --ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -+ZEXTERN ZEXPORT const char * gzerror OF((gzFile file, int *errnum)); - /* - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an -@@ -1261,7 +1261,7 @@ - this function may invalidate the returned string. - */ - --ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -+ZEXTERN ZEXPORT void gzclearerr OF((gzFile file)); - /* - 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 -@@ -1276,7 +1276,7 @@ - compression library. - */ - --ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); -+ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len)); - /* - 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 -@@ -1302,7 +1302,7 @@ - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. - */ - --ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -+ZEXTERN ZEXPORT uLong crc32 OF((uLong crc, const Bytef *buf, uInt len)); - /* - 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 -@@ -1334,17 +1334,17 @@ - /* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ --ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, -+ZEXTERN ZEXPORT int deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, -+ZEXTERN ZEXPORT int deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); --ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -@@ -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)); --ZEXTERN const uLongf * ZEXPORT 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 - } -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 @@ - ""}; - - --const char * ZEXPORT zlibVersion() -+ZEXPORT const char * zlibVersion() - { - return ZLIB_VERSION; - } - --uLong ZEXPORT zlibCompileFlags() -+ZEXPORT uLong zlibCompileFlags() - { - uLong flags; - -@@ -130,7 +130,7 @@ - /* exported to allow conversion of error code to string for compress() and - * uncompress() - */ --const char * ZEXPORT zError(err) -+ZEXPORT const char * zError(err) - int err; - { - return ERR_MSG(err); diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb deleted file mode 100644 index c58d5f2d2..000000000 --- a/meta/packages/zlib/zlib_1.2.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Zlib Compression Library" -SECTION = "libs" -PRIORITY = "required" -HOMEPAGE = "http://www.gzip.org/zlib/" -LICENSE = "zlib" -LIC_FILES_CHKSUM = "file://README;md5=ae764cfda68da96df20af9fbf9fe49bd \ - file://zlib.h;beginline=1;endline=30;md5=6ab03f03a5ee92d06b809797d4d5586d " -PR = "r7" - -SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ - file://1.2.3.3.dfsg.patch.gz;patch=1 \ - file://visibility.patch;patch=1 \ - file://autotools.patch;patch=1 " - -DEPENDS = "libtool-cross" - -inherit autotools - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/zlib/zlib_1.2.5.bb b/meta/packages/zlib/zlib_1.2.5.bb new file mode 100644 index 000000000..e6db69e3a --- /dev/null +++ b/meta/packages/zlib/zlib_1.2.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Zlib Compression Library" +HOMEPAGE = "http://zlib.net/" +SECTION = "libs" +PRIORITY = "required" +LICENSE = "zlib" +LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" + +DEPENDS = "libtool-cross" +PR = "r0" + +SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ + file://configure.ac \ + file://Makefile.am" + +inherit autotools + +do_configure_prepend () { + cp ${WORKDIR}/configure.ac ${S}/ + cp ${WORKDIR}/Makefile.am ${S}/ +} + +BBCLASSEXTEND = "native nativesdk" |