[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/rpm/FC-4 rpm-4.4.1-zlib-can-2005-2096.patch, NONE, 1.1 rpm.spec, 1.171, 1.172



Author: pnasrat

Update of /cvs/dist/rpms/rpm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29968

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.1-zlib-can-2005-2096.patch 
Log Message:
zlib fix

rpm-4.4.1-zlib-can-2005-2096.patch:
 inftrees.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.4.1-zlib-can-2005-2096.patch ---
--- rpm-4.4.1/zlib/inftrees.c.zlib	2005-01-01 20:20:31.000000000 -0500
+++ rpm-4.4.1/zlib/inftrees.c	2005-07-13 11:32:48.000000000 -0400
@@ -128,7 +128,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: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/FC-4/rpm.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- rpm.spec	24 May 2005 15:29:06 -0000	1.171
+++ rpm.spec	13 Jul 2005 15:34:47 -0000	1.172
@@ -20,7 +20,7 @@
 %define version 4.4.1
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 21
+Release: 22
 Group: System Environment/Base
 Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
 Source1: popt_zh_TW.po
@@ -36,6 +36,7 @@
 Patch8: rpm-4.4.1-ordererase.patch
 Patch9: rpm-4.4.1-matchpathcon.patch
 Patch10: rpm-4.4.1-check-symlinks.patch
+Patch11: rpm-4.4.1-zlib-can-2005-2096.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -155,6 +156,7 @@
 %patch8 -p1  -b .ordererase
 %patch9 -p1  -b .matchpathcon
 %patch10 -p1  -b .checklinks
+%patch11 -p1  -b .zlib
 
 # XXX move zh_CN
 sed -i 's/zh_CN.GB2312/zh_CN zh_TW/' popt/configure*
@@ -560,6 +562,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jul 13 2005 Paul Nasrat <pnasrat redhat com> - 4.4.1-22
+- zlib fix for CAN-2005-2096
+
 * Tue May 24 2005 Paul Nasrat <pnasrat redhat com> - 4.4.1-21
 - Update translations (#154623)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]