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:35:51
Branch: HEAD Handle: 2005070710355100
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
Fix zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
Summary:
Revision Changes Path
1.12 +12 -0 openpkg-src/qt/qt.patch
1.120 +2 -2 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 qt.patch
--- openpkg-src/qt/qt.patch 3 May 2005 13:25:54 -0000 1.11
+++ openpkg-src/qt/qt.patch 7 Jul 2005 09:35:51 -0000 1.12
@@ -346,3 +346,15 @@
next();
break;
}
+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.119 -r1.120 qt.spec
--- openpkg-src/qt/qt.spec 3 May 2005 13:25:54 -0000 1.119
+++ openpkg-src/qt/qt.spec 7 Jul 2005 09:35:51 -0000 1.120
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.3.4
-Release: 20050503
+Release: 20050707
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -131,7 +131,7 @@
case "%{l_platform -t}" in
*-freebsd* ) oscomp="freebsd-g++" ;;
*-linux* ) oscomp="linux-g++" ;;
- *-sunos* ) oscomp="solaris-g++" ;;
+ *-sunos* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1 ;;
esac
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
