add two fixes from centos/el. addresses CVE-2011-4153 CVE-2014-2270

[packages/php.git] / php-stupidapache_version.patch

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index e76de125b31b84e1d2cc40eb08b39cdc7b7c99e2..f2478a4400a1fe5250a7ae43da5f51f3b3439f23 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -1,17 +1,15 @@
---- ./acinclude.m4~    2005-06-16 21:20:24.000000000 +0300
-+++ ./acinclude.m4     2005-06-16 21:20:34.000000000 +0300
-@@ -1949,8 +1949,14 @@
- dnl This macro is used to get a comparable
+--- php-5.3.1/acinclude.m4~    2009-11-26 00:49:53.000000000 +0200
++++ php-5.3.1/acinclude.m4     2009-11-26 00:51:11.466867803 +0200
+@@ -2582,7 +2582,11 @@
  dnl version for apache1/2.
  dnl
-+
  AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
-+if test "$with_apache_version" != "no"; then
-+  ac_output="foo bar baz $with_apache_version"
-+else
-   ac_output=`$1 -v 2>&1`
-+fi
-+
+-  ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
++  if test "$with_apache_version" != "no"; then
++    ac_output="foo bar baz $with_apache_version"
++  else
++    ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
++  fi
    ac_IFS=$IFS
  IFS="- /.
  "