rpms/zlib/FC-4 zlib-1.2.2.2-can-2005-2096.patch, NONE, 1.1 zlib.spec, 1.19, 1.20
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 7 09:46:06 UTC 2005
Author: varekova
Update of /cvs/dist/rpms/zlib/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15288
Modified Files:
zlib.spec
Added Files:
zlib-1.2.2.2-can-2005-2096.patch
Log Message:
- fix bug 162392 - CAN-2005-2096
zlib-1.2.2.2-can-2005-2096.patch:
inftrees.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE zlib-1.2.2.2-can-2005-2096.patch ---
--- zlib-1.2.2.2/inftrees.c.overfl 2004-10-31 18:54:30.000000000 +0100
+++ zlib-1.2.2.2/inftrees.c 2005-07-07 09:53:07.030896064 +0200
@@ -134,7 +134,7 @@
left -= count[len];
if (left < 0) return -1; /* over-subscribed */
}
- if (left > 0 && (type == CODES || (codes - count[0] != 1)))
+ if (left > 0 && (type == CODES || max != 1))
return -1; /* incomplete set */
/* generate offsets into symbol table for each length for sorting */
Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/FC-4/zlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zlib.spec 12 Apr 2005 06:57:16 -0000 1.19
+++ zlib.spec 7 Jul 2005 09:45:57 -0000 1.20
@@ -1,10 +1,11 @@
Summary: The zlib compression and decompression library.
Name: zlib
Version: 1.2.2.2
-Release: 3
+Release: 4.fc4
Group: System Environment/Libraries
Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
Patch0: zlib-1.1.4-make-test.patch
+Patch1: zlib-1.2.2.2-can-2005-2096.patch
URL: http://www.gzip.org/zlib/
License: BSD
Prefix: %{_prefix}
@@ -27,6 +28,7 @@
%prep
%setup -q
%patch0 -p1 -b .make-test
+%patch1 -p1 -b .overfl
%build
CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
@@ -77,6 +79,9 @@
%{_mandir}/man3/zlib.3*
%changelog
+* Thu Jul 7 2005 Ivana Varekova <varekova at redhat.com> 1.2.2.2-4.fc4
+- fix bug 162392 - CAN-2005-2096
+
* Wed Mar 30 2005 Ivana Varekova <varekova at redhat.com> 1.2.2.2-3
- fix bug 122408 - zlib build process runs configure twice
More information about the fedora-cvs-commits
mailing list