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:43:23
Branch: HEAD Handle: 2005070617432300
Added files:
openpkg-src/zlib zlib.patch
Modified files:
openpkg-src/zlib zlib.spec
Log:
Fix zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
Summary:
Revision Changes Path
1.5 +12 -0 openpkg-src/zlib/zlib.patch
1.34 +3 -1 openpkg-src/zlib/zlib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zlib/zlib.patch
============================================================================
$ cvs diff -u -r0 -r1.5 zlib.patch
--- /dev/null 2005-07-06 18:43:20 +0200
+++ zlib.patch 2005-07-06 18:43:23 +0200
@@ -0,0 +1,12 @@
+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.33 -r1.34 zlib.spec
--- openpkg-src/zlib/zlib.spec 24 Mar 2005 11:20:50 -0000 1.33
+++ openpkg-src/zlib/zlib.spec 6 Jul 2005 16:43:23 -0000 1.34
@@ -33,10 +33,11 @@
Group: Compression
License: BSD
Version: 1.2.2
-Release: 20050219
+Release: 20050706
# list of sources
Source0: http://www.zlib.net/zlib-%{version}.tar.gz
+Patch0: zlib.patch
# build information
Prefix: %{l_prefix}
@@ -67,6 +68,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
