packages: zlib/zlib.spec, zlib/zlib-gzflush.patch (NEW) - rel 3; gzflush se...

[arekm]

Author: arekm                        Date: Wed Feb  3 17:18:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; gzflush segfault fix

---- Files affected:
packages/zlib:
   zlib.spec (1.117 -> 1.118) , zlib-gzflush.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.117 packages/zlib/zlib.spec:1.118
--- packages/zlib/zlib.spec:1.117	Wed Feb  3 02:43:57 2010
+++ packages/zlib/zlib.spec	Wed Feb  3 18:18:00 2010
@@ -32,9 +32,10 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.3.7
-Release:	2
+Release:	3
 Patch0:		minizip-autotools.patch
 Patch1:		define-off64_t
+Patch2:		%{name}-gzflush.patch
 License:	BSD
 Group:		Libraries
 Source0:	http://www.zlib.net/current/beta/%{name}-%{version}.tar.gz
@@ -282,6 +283,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
@@ -380,6 +382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2010/02/03 17:18:00  arekm
+- rel 3; gzflush segfault fix
+
 Revision 1.117  2010/02/03 01:43:57  glen
 - release 2
 

================================================================
Index: packages/zlib/zlib-gzflush.patch
diff -u /dev/null packages/zlib/zlib-gzflush.patch:1.1
--- /dev/null	Wed Feb  3 18:18:06 2010
+++ packages/zlib/zlib-gzflush.patch	Wed Feb  3 18:18:00 2010
@@ -0,0 +1,12 @@
+--- gzwrite.c	2010-01-18 21:18:27.000000000 +0100
++++ gzwrite.c	2010-01-28 04:37:20.330530306 +0100
+@@ -435,7 +435,8 @@
+     state = (gz_statep)file;
+ 
+     /* check that we're writing and that there's no error */
+-    if (state->mode != GZ_WRITE|| state->err != Z_OK)
++    if (state->mode != GZ_WRITE || state->err != Z_OK)
++        return Z_STREAM_ERROR;
+ 
+     /* check flush parameter */
+     if (flush < 0 || flush > Z_FINISH)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.117&r2=1.118&f=u