From 42ca8a066811fb46266631cce8d080fb1b311d22 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 7 Jan 2007 00:27:22 +0000 Subject: [PATCH] zlib: dropped older then 1.2.3 --- packages/zlib/files/.mtn2git_empty | 0 packages/zlib/files/visibility.patch | 1022 ---------------------- packages/zlib/files/zlib_1.2.2-8.diff.gz | Bin 15553 -> 0 bytes packages/zlib/zlib-native_1.1.4.bb | 4 - packages/zlib/zlib-native_1.2.2.bb | 4 - packages/zlib/zlib_1.1.4.bb | 33 - packages/zlib/zlib_1.2.2.bb | 37 - 7 files changed, 1100 deletions(-) delete mode 100644 packages/zlib/files/.mtn2git_empty delete mode 100644 packages/zlib/files/visibility.patch delete mode 100644 packages/zlib/files/zlib_1.2.2-8.diff.gz delete mode 100644 packages/zlib/zlib-native_1.1.4.bb delete mode 100644 packages/zlib/zlib-native_1.2.2.bb delete mode 100644 packages/zlib/zlib_1.1.4.bb delete mode 100644 packages/zlib/zlib_1.2.2.bb diff --git a/packages/zlib/files/.mtn2git_empty b/packages/zlib/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zlib/files/visibility.patch b/packages/zlib/files/visibility.patch deleted file mode 100644 index ba1a2a6fef..0000000000 --- a/packages/zlib/files/visibility.patch +++ /dev/null @@ -1,1022 +0,0 @@ ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/adler32.c 2003-11-17 15:24:27.000000000 -0600 -+++ zlib-1.2.2/adler32.c 2005-02-28 19:04:09.000000000 -0600 -@@ -44,7 +44,7 @@ - #endif - - /* ========================================================================= */ --uLong ZEXPORT adler32(adler, buf, len) -+ZEXPORT uLong adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/compress.c 2003-07-07 00:37:56.000000000 -0500 -+++ zlib-1.2.2/compress.c 2005-02-28 19:04:09.000000000 -0600 -@@ -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) + 11; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/crc32.c 2004-10-03 21:29:30.000000000 -0500 -+++ zlib-1.2.2/crc32.c 2005-02-28 19:04:09.000000000 -0600 -@@ -198,7 +198,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) -@@ -212,7 +212,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; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/deflate.c 2004-09-15 09:28:14.000000000 -0500 -+++ zlib-1.2.2/deflate.c 2005-02-28 19:04:09.000000000 -0600 -@@ -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; -@@ -311,7 +311,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) -+ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -355,7 +355,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateReset (strm) -+ZEXPORT int deflateReset (strm) - z_streamp strm; - { - deflate_state *s; -@@ -391,7 +391,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflatePrime (strm, bits, value) -+ZEXPORT int deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -@@ -403,7 +403,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateParams(strm, level, strategy) -+ZEXPORT int deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -@@ -457,7 +457,7 @@ - * But even the conservative 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; - { -@@ -520,7 +520,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflate (strm, flush) -+ZEXPORT int deflate (strm, flush) - z_streamp strm; - int flush; - { -@@ -696,7 +696,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateEnd (strm) -+ZEXPORT int deflateEnd (strm) - z_streamp strm; - { - int status; -@@ -726,7 +726,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; - { ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/gzio.c 2004-10-03 21:30:37.000000000 -0500 -+++ zlib-1.2.2/gzio.c 2005-02-28 19:06:11.000000000 -0600 -@@ -205,7 +205,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; - { -@@ -216,7 +216,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; - { -@@ -231,7 +231,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; -@@ -391,7 +391,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; -@@ -500,7 +500,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; -@@ -512,7 +512,7 @@ - /* =========================================================================== - Push one byte back onto the stream. - */ --int ZEXPORT gzungetc(c, file) -+ZEXPORT int gzungetc(c, file) - int c; - gzFile file; - { -@@ -537,7 +537,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; -@@ -556,7 +556,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; -@@ -600,7 +600,7 @@ - #ifdef STDC - #include - --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; -@@ -634,7 +634,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; -@@ -675,7 +675,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; - { -@@ -690,7 +690,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; - { -@@ -743,7 +743,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; - { -@@ -764,7 +764,7 @@ - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. - */ --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 @@ - /* =========================================================================== - Rewinds input file. - */ --int ZEXPORT gzrewind (file) -+ZEXPORT int gzrewind (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -878,7 +878,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); -@@ -888,7 +888,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; -@@ -938,7 +938,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; - { - int err; -@@ -967,7 +967,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; - { -@@ -997,7 +997,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; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/infback.c 2004-10-03 21:31:20.000000000 -0500 -+++ zlib-1.2.2/infback.c 2005-02-28 19:04:09.000000000 -0600 -@@ -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_stream FAR *strm; - int windowBits; - unsigned char FAR *window; -@@ -237,7 +237,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_stream FAR *strm; - in_func in; - void FAR *in_desc; -@@ -610,7 +610,7 @@ - return ret; - } - --int ZEXPORT inflateBackEnd(strm) -+ZEXPORT int inflateBackEnd(strm) - z_stream FAR *strm; - { - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/inflate.c 2004-10-03 21:33:51.000000000 -0500 -+++ zlib-1.2.2/inflate.c 2005-02-28 19:04:09.000000000 -0600 -@@ -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; -@@ -122,7 +122,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; -@@ -165,7 +165,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; -@@ -532,7 +532,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; - { -@@ -1085,7 +1085,7 @@ - return ret; - } - --int ZEXPORT inflateEnd(strm) -+ZEXPORT int inflateEnd(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -1099,7 +1099,7 @@ - return Z_OK; - } - --int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -+ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -1171,7 +1171,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 */ -@@ -1222,7 +1222,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; -@@ -1232,7 +1232,7 @@ - return state->mode == STORED && state->bits == 0; - } - --int ZEXPORT inflateCopy(dest, source) -+ZEXPORT int inflateCopy(dest, source) - z_streamp dest; - z_streamp source; - { ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/uncompr.c 2003-07-07 00:36:56.000000000 -0500 -+++ zlib-1.2.2/uncompr.c 2005-02-28 19:04:09.000000000 -0600 -@@ -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; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zconf.in.h 2004-05-30 15:38:00.000000000 -0500 -+++ zlib-1.2.2/zconf.in.h 2005-02-28 19:04:09.000000000 -0600 -@@ -198,11 +198,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, -@@ -223,30 +221,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 ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zlib.h 2004-10-03 21:57:26.000000000 -0500 -+++ zlib-1.2.2/zlib.h 2005-02-28 19:04:09.000000000 -0600 -@@ -184,7 +184,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. -@@ -192,7 +192,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. -@@ -214,7 +214,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 -@@ -296,7 +296,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 -@@ -311,7 +311,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 -@@ -331,7 +331,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 -@@ -430,7 +430,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 -@@ -448,7 +448,7 @@ - */ - - /* --ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, -@@ -504,7 +504,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)); - /* -@@ -541,7 +541,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. -@@ -559,7 +559,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. -@@ -570,7 +570,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)); - /* -@@ -591,7 +591,7 @@ - if strm->avail_out was zero. - */ - --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 -@@ -600,7 +600,7 @@ - for deflation in a single pass, and so would be called before deflate(). - */ - --ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm, - int bits, - int value)); - /* -@@ -617,7 +617,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 -@@ -659,7 +659,7 @@ - modified, but next_out and avail_out are unchanged.) - */ - --ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); - /* -@@ -678,7 +678,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 -@@ -693,7 +693,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. -@@ -709,7 +709,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. -@@ -720,7 +720,7 @@ - */ - - /* --ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit OF((z_stream FAR *strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() -@@ -744,7 +744,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_stream FAR *strm, -+ZEXTERN ZEXPORT int inflateBack OF((z_stream FAR *strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); - /* -@@ -813,7 +813,7 @@ - that inflateBack() cannot return Z_OK. - */ - --ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm)); -+ZEXTERN ZEXPORT int inflateBackEnd OF((z_stream FAR *strm)); - /* - All memory allocated by inflateBackInit() is freed. - -@@ -821,7 +821,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: -@@ -873,7 +873,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 -@@ -888,7 +888,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)); - /* -@@ -904,14 +904,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 -@@ -932,7 +932,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 -@@ -949,7 +949,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 -@@ -962,7 +962,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. -@@ -970,7 +970,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 -@@ -978,7 +978,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. -@@ -986,7 +986,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 -@@ -999,14 +999,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 -@@ -1015,19 +1015,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 -@@ -1037,7 +1037,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 -@@ -1047,7 +1047,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 -@@ -1065,14 +1065,14 @@ - 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. - - 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 -@@ -1081,20 +1081,20 @@ - 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 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). - */ - --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 -@@ -1103,7 +1103,7 @@ - to get the exact error code. - */ - --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 -@@ -1118,7 +1118,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 -@@ -1135,7 +1135,7 @@ - if (adler != original_adler) error(); - */ - --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 with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value -@@ -1157,17 +1157,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_stream FAR *strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit_ OF((z_stream FAR *strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -@@ -1189,9 +1189,9 @@ - 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 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)); - - #ifdef __cplusplus - } ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zutil.c 2003-08-27 21:34:34.000000000 -0500 -+++ zlib-1.2.2/zutil.c 2005-02-28 19:04:09.000000000 -0600 -@@ -28,12 +28,12 @@ - ""}; - - --const char * ZEXPORT zlibVersion() -+ZEXPORT const char * zlibVersion() - { - return ZLIB_VERSION; - } - --uLong ZEXPORT zlibCompileFlags() -+ZEXPORT uLong zlibCompileFlags() - { - uLong flags; - -@@ -134,7 +134,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/packages/zlib/files/zlib_1.2.2-8.diff.gz b/packages/zlib/files/zlib_1.2.2-8.diff.gz deleted file mode 100644 index c8501419733bf5a80c900d1925267fa8db82c252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15553 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