From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 24 May 2010 19:59:27 +0000 (+0000)
Subject: - added lfs patch
X-Git-Tag: auto/th/crossmingw32-zlib-1_2_5-3~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-zlib.git;a=commitdiff_plain;h=c247493cad543dde31b7907da72140e0fc2492a8

- added lfs patch
- release 2

Changed files:
    crossmingw32-zlib.spec -> 1.27
    zlib-lfs.patch -> 1.1
---

diff --git a/crossmingw32-zlib.spec b/crossmingw32-zlib.spec
index cc36e89..e751f1f 100644
--- a/crossmingw32-zlib.spec
+++ b/crossmingw32-zlib.spec
@@ -14,12 +14,13 @@ Summary:	Library for compression and decompression - Ming32 cross version
 Summary(pl.UTF-8):	Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla Ming32
 Name:		crossmingw32-%{realname}
 Version:	1.2.5
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Libraries
 Source0:	http://www.zlib.net/current/%{realname}-%{version}.tar.gz
 # Source0-md5:	c735eab2d659a96e5a594c9e8541ad63
 Patch0:		%{name}-LFS.patch
+Patch1:		%{realname}-lfs.patch
 URL:		http://www.zlib.net/
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	sed >= 4.0
@@ -89,6 +90,7 @@ zlib - biblioteka DLL dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if %{with asmopt}
 %ifarch i686 athlon
diff --git a/zlib-lfs.patch b/zlib-lfs.patch
new file mode 100644
index 0000000..51f0a67
--- /dev/null
+++ b/zlib-lfs.patch
@@ -0,0 +1,37 @@
+Improper condition was introduced in 1.2.5 causing some applications
+(e.g. cgit) to fail due to conflicting declarations.
+
+References:
+- http://mail.madler.net/pipermail/zlib-devel_madler.net/2010-May/002249.html
+- http://bugs.debian.org/439980
+- http://bugs.gentoo.org/show_bug.cgi?id=316377
+- http://bugs.gentoo.org/show_bug.cgi?id=316855
+- http://bugs.archlinux.org/task/19280
+- https://bugs.launchpad.net/ubuntu/+source/libpciaccess/+bug/402178
+
+--- zlib-1.2.5/zlib.h.orig	2010-04-20 06:12:48.000000000 +0200
++++ zlib-1.2.5/zlib.h	2010-05-24 21:28:52.465538337 +0200
+@@ -1562,7 +1562,7 @@
+  * functions are changed to 64 bits) -- in case these are set on systems
+  * without large file support, _LFS64_LARGEFILE must also be true
+  */
+-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
++#if (defined(_LARGEFILE64_SOURCE) || (_FILE_OFFSET_BITS-0 == 64)) && _LFS64_LARGEFILE-0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+@@ -1578,14 +1578,6 @@
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _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));
+-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+-#  endif
+ #else
+    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));