diff options
Diffstat (limited to 'zlib/patches')
| -rw-r--r-- | zlib/patches/minizip-null.patch | 12 | ||||
| -rw-r--r-- | zlib/patches/zlib-1.2.5-gentoo.patch | 12 | ||||
| -rw-r--r-- | zlib/patches/zlib-1.2.5-minizip-fixuncrypt.patch | 14 | ||||
| -rw-r--r-- | zlib/patches/zlib-1.2.5-zip64.patch | 59 |
4 files changed, 0 insertions, 97 deletions
diff --git a/zlib/patches/minizip-null.patch b/zlib/patches/minizip-null.patch deleted file mode 100644 index bffe2072c689..000000000000 --- a/zlib/patches/minizip-null.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up zlib-1.2.5/contrib/minizip/unzip.c.pom zlib-1.2.5/contrib/minizip/unzip.c ---- zlib-1.2.5/contrib/minizip/unzip.c.pom 2010-02-15 12:59:40.000000000 +0100 -+++ zlib-1.2.5/contrib/minizip/unzip.c 2011-04-06 12:06:04.000000000 +0200 -@@ -1145,7 +1145,7 @@ extern int ZEXPORT unzGetCurrentFileInfo - szFileName,fileNameBufferSize, - extraField,extraFieldBufferSize, - szComment,commentBufferSize); -- if (err==UNZ_OK) -+ if (pfile_info && err==UNZ_OK) - { - pfile_info->version = file_info64.version; - pfile_info->version_needed = file_info64.version_needed; diff --git a/zlib/patches/zlib-1.2.5-gentoo.patch b/zlib/patches/zlib-1.2.5-gentoo.patch deleted file mode 100644 index 82c7f39732dd..000000000000 --- a/zlib/patches/zlib-1.2.5-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h ---- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200 -+++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200 -@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/zlib/patches/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib/patches/zlib-1.2.5-minizip-fixuncrypt.patch deleted file mode 100644 index d113879f5c37..000000000000 --- a/zlib/patches/zlib-1.2.5-minizip-fixuncrypt.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c ---- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt 2011-11-11 12:13:56.335867758 -0500 -+++ zlib-1.2.5/contrib/minizip/unzip.c 2011-11-11 12:14:01.747799372 -0500 -@@ -68,10 +68,6 @@ - #include <stdlib.h> - #include <string.h> - --#ifndef NOUNCRYPT -- #define NOUNCRYPT --#endif -- - #include "zlib.h" - #include "unzip.h" - diff --git a/zlib/patches/zlib-1.2.5-zip64.patch b/zlib/patches/zlib-1.2.5-zip64.patch deleted file mode 100644 index 2bc94deb2979..000000000000 --- a/zlib/patches/zlib-1.2.5-zip64.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -ru zlib-1.2.5/contrib/minizip/ioapi.c zlib-1.2.5-patch/contrib/minizip/ioapi.c ---- zlib-1.2.5/contrib/minizip/ioapi.c 2010-01-04 12:31:24.000000000 -0500 -+++ zlib-1.2.5-patch/contrib/minizip/ioapi.c 2011-07-05 15:47:48.263474587 -0400 -@@ -47,7 +47,7 @@ - else - { - uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream); -- if ((tell_uLong) == ((uLong)-1)) -+ if ((tell_uLong) == MAXU32) - return (ZPOS64_T)-1; - else - return tell_uLong; -diff -ru zlib-1.2.5/contrib/minizip/ioapi.h zlib-1.2.5-patch/contrib/minizip/ioapi.h ---- zlib-1.2.5/contrib/minizip/ioapi.h 2010-02-15 06:59:40.000000000 -0500 -+++ zlib-1.2.5-patch/contrib/minizip/ioapi.h 2011-07-05 15:48:36.281546917 -0400 -@@ -85,6 +85,8 @@ - typedef uint64_t ZPOS64_T; - #else - -+/* Maximum unsigned 32-bit value used as placeholder for zip64 */ -+#define MAXU32 0xffffffff - - #if defined(_MSC_VER) || defined(__BORLANDC__) - typedef unsigned __int64 ZPOS64_T; -diff -ru zlib-1.2.5/contrib/minizip/unzip.c zlib-1.2.5-patch/contrib/minizip/unzip.c ---- zlib-1.2.5/contrib/minizip/unzip.c 2010-02-15 06:59:40.000000000 -0500 -+++ zlib-1.2.5-patch/contrib/minizip/unzip.c 2011-07-05 15:50:31.409310349 -0400 -@@ -1040,26 +1040,26 @@ - { - uLong uL; - -- if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1) -+ if(file_info.uncompressed_size == MAXU32) - { - if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) - err=UNZ_ERRNO; - } - -- if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1) -+ if(file_info.compressed_size == MAXU32) - { - if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) - err=UNZ_ERRNO; - } - -- if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1) -+ if(file_info_internal.offset_curfile == MAXU32) - { - /* Relative Header offset */ - if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) - err=UNZ_ERRNO; - } - -- if(file_info.disk_num_start == (unsigned long)-1) -+ if(file_info.disk_num_start == MAXU32) - { - /* Disk Start Number */ - if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) - |