OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2004 14:18:44
Branch: OPENPKG_2_0_SOLID Handle: 2004082513184300
Added files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg zlib.patch
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg HISTORY openpkg.spec
Log:
Security Bugfixes (CAN-2004-0797, OpenPKG-SA-2004.038-zlib)
Summary:
Revision Changes Path
1.142.2.7 +3 -0 openpkg-src/openpkg/HISTORY
1.295.2.12 +5 -1 openpkg-src/openpkg/openpkg.spec
1.1.4.1 +28 -0 openpkg-src/openpkg/zlib.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.142.2.6 -r1.142.2.7 HISTORY
--- openpkg-src/openpkg/HISTORY 7 May 2004 14:03:51 -0000 1.142.2.6
+++ openpkg-src/openpkg/HISTORY 25 Aug 2004 12:18:43 -0000 1.142.2.7
@@ -2,6 +2,9 @@
2004
====
+20040825 **** RELEASE AS PART OF OPENPKG 2.0.4 ***
+20040825 applied security bugfixes for ZLIB 1.2.1
+
20040507 **** RELEASE AS PART OF OPENPKG 2.0.3 ***
20040507 synchronize aux.prereq.sh platform checks with official list as of OpenPKG
2.0
20040507 fix disk space detection in aux.prereq.sh script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.295.2.11 -r1.295.2.12 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 7 May 2004 14:03:51 -0000 1.295.2.11
+++ openpkg-src/openpkg/openpkg.spec 25 Aug 2004 12:18:43 -0000 1.295.2.12
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.0.3
+%define V_openpkg 2.0.4
# the used software versions
%define V_rpm 4.2.1
@@ -133,6 +133,7 @@
Source62: man.sh
Source63: uuid.pod
Source64: uuid.8
+Source65: zlib.patch
# build information
Prefix: %{l_prefix}
@@ -475,6 +476,9 @@
set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"
# apply OpenPKG patches to distribution trees
+ ( cd zlib-%{V_zlib}
+ ${l_patch} -p0 <`SOURCE zlib.patch`
+ ) || exit $?
( cd rpm-%{V_rpm}
sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.bugfix` | ${l_patch}
-p0
sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.feature` | ${l_patch}
-p0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/zlib.patch
============================================================================
$ cvs diff -u -r0 -r1.1.4.1 zlib.patch
--- /dev/null 2004-08-25 14:18:44 +0200
+++ zlib.patch 2004-08-25 14:18:44 +0200
@@ -0,0 +1,28 @@
+Security Bugfixes (CAN-2004-0797, OpenPKG-SA-2004.038-zlib):
+
+Index: infback.c
+--- infback.c.orig 2003-08-12 01:48:06 +0200
++++ infback.c 2004-08-25 12:37:07 +0200
+@@ -434,6 +434,9 @@
+ }
+ }
+
++ if (state->mode == BAD)
++ break;
++
+ /* build code tables */
+ state->next = state->codes;
+ state->lencode = (code const FAR *)(state->next);
+Index: inflate.c
+--- inflate.c.orig 2003-10-26 07:15:36 +0100
++++ inflate.c 2004-08-25 12:37:07 +0200
+@@ -861,6 +861,9 @@
+ }
+ }
+
++ if (state->mode == BAD)
++ break;
++
+ /* build code tables */
+ state->next = state->codes;
+ state->lencode = (code const FAR *)(state->next);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
