OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jul-2005 11:39:06
Branch: OPENPKG_2_3_SOLID Handle: 2005070710390600
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/qt qt.patch qt.spec
Log:
Fix zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
Summary:
Revision Changes Path
1.10.2.1 +12 -0 openpkg-src/qt/qt.patch
1.116.2.2 +1 -1 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.10 -r1.10.2.1 qt.patch
--- openpkg-src/qt/qt.patch 1 Feb 2005 09:15:37 -0000 1.10
+++ openpkg-src/qt/qt.patch 7 Jul 2005 09:39:06 -0000 1.10.2.1
@@ -195,3 +195,15 @@
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+Index: src/3rdparty/zlib/inftrees.c
+--- src/3rdparty/zlib/inftrees.c.orig 2004-09-15 16:30:06 +0200
++++ src/3rdparty/zlib/inftrees.c 2005-07-07 11:33:34 +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 */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.116.2.1 -r1.116.2.2 qt.spec
--- openpkg-src/qt/qt.spec 21 Feb 2005 17:08:19 -0000 1.116.2.1
+++ openpkg-src/qt/qt.spec 7 Jul 2005 09:39:06 -0000 1.116.2.2
@@ -34,7 +34,7 @@
Group: XWindow
License: GPL
Version: 3.3.4
-Release: 2.3.0
+Release: 2.3.1
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
