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 0f75407ea7148cf7e8f61550855a2fb7fe065236..f2478a4400a1fe5250a7ae43da5f51f3b3439f23 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -1,29 +1,15 @@
---- acinclude.m4~      2005-03-17 10:10:04.000000000 +0200
-+++ acinclude.m4       2005-03-17 09:57:25.000000000 +0200
-@@ -1851,8 +1851,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 -n "$with_apache_version"; 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="- /.
  "
---- configure.in~      2005-03-16 22:02:44.000000000 +0200
-+++ configure.in       2005-03-17 01:03:14.000000000 +0200
-@@ -766,6 +766,9 @@
- ])
- AC_MSG_RESULT([$PHP_VERSIONING])
- 
-+PHP_ARG_WITH(apache-version,[apache version],
-+[  --apache-version=MAJOR.MINOR.REVISION      Sets apache version to avoid calling apache/httpd binary], no, no)
-+
- divert(5)
- 
- dnl ## In diversion 5 we check which extensions should be compiled.