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: 03-Nov-2006 08:55:26
Branch: HEAD Handle: 2006110307552600
Added files:
openpkg-src/apache apache.patch.php
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.37 20061016 -> 20061103
Summary:
Revision Changes Path
1.7 +15 -0 openpkg-src/apache/apache.patch.php
1.353 +4 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
$ cvs diff -u -r0 -r1.7 apache.patch.php
--- /dev/null 2006-11-03 08:55:00 +0100
+++ apache.patch.php 2006-11-03 08:55:26 +0100
@@ -0,0 +1,15 @@
+Security Fix (CVE-2006-4625)
+
+Index: Zend/zend_ini.c
+--- Zend/zend_ini.c.orig 2006-09-06 10:54:44 +0200
++++ Zend/zend_ini.c 2006-11-03 08:46:12 +0100
+@@ -235,7 +235,8 @@
+ char *duplicate;
+ TSRMLS_FETCH();
+
+- if (zend_hash_find(EG(ini_directives), name, name_length, (void **)
&ini_entry)==FAILURE) {
++ if (zend_hash_find(EG(ini_directives), name, name_length, (void **)
&ini_entry)==FAILURE ||
++ (stage == ZEND_INI_STAGE_RUNTIME && (ini_entry->modifiable &
ZEND_INI_USER)==0)) {
+ return FAILURE;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.352 -r1.353 apache.spec
--- openpkg-src/apache/apache.spec 16 Oct 2006 17:33:55 -0000 1.352
+++ openpkg-src/apache/apache.spec 3 Nov 2006 07:55:26 -0000 1.353
@@ -35,7 +35,7 @@
%define V_apache 1.3.37
%define V_mod_ssl 2.8.28-1.3.37
%define V_mod_perl 1.29
-%define V_mod_php 5.1.6
+%define V_mod_php 5.2.0
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_dav 1.0.3-1.3.6
%define V_mod_layout 3.2.1
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20061016
+Release: 20061103
# package options (suexec related)
%option with_suexec yes
@@ -216,6 +216,7 @@
Patch1: apache.patch.modowa
Patch2:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
Patch3: apache.patch.suphp
+Patch4: apache.patch.php
# build information
Prefix: %{l_prefix}
@@ -514,6 +515,7 @@
%if "%{with_mod_php}" == "yes"
%setup -q -T -D -a 3
( cd php-%{V_mod_php}
+ %patch -p0 -P 4
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
configure \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
