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: 06-Jul-2005 18:49:15
Branch: OPENPKG_2_2_SOLID Handle: 2005070617491500
Modified files: (Branch: OPENPKG_2_2_SOLID)
openpkg-src/zlib zlib.patch zlib.spec
Log:
Fix zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
Summary:
Revision Changes Path
1.3.2.1 +15 -0 openpkg-src/zlib/zlib.patch
1.28.2.2 +1 -1 openpkg-src/zlib/zlib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zlib/zlib.patch
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 zlib.patch
--- openpkg-src/zlib/zlib.patch 25 Aug 2004 10:49:00 -0000 1.3
+++ openpkg-src/zlib/zlib.patch 6 Jul 2005 16:49:15 -0000 1.3.2.1
@@ -26,3 +26,18 @@
/* build code tables */
state->next = state->codes;
state->lencode = (code const FAR *)(state->next);
+
+Security Bugfixes (CAN-2005-2096, OpenPKG-SA-2005.013-zlib):
+
+Index: inftrees.c
+--- inftrees.c.orig 2004-09-15 16:30:06 +0200
++++ inftrees.c 2005-07-06 18:31:14 +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/zlib/zlib.spec
============================================================================
$ cvs diff -u -r1.28.2.1 -r1.28.2.2 zlib.spec
--- openpkg-src/zlib/zlib.spec 11 Oct 2004 18:59:56 -0000 1.28.2.1
+++ openpkg-src/zlib/zlib.spec 6 Jul 2005 16:49:15 -0000 1.28.2.2
@@ -34,7 +34,7 @@
Group: Compression
License: BSD
Version: 1.2.1
-Release: 2.2.0
+Release: 2.2.1
# list of sources
Source0: http://www.gzip.org/zlib/zlib-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
