diff options
Diffstat (limited to 'debian/patches/057-no_apache_installed.patch')
| -rw-r--r-- | debian/patches/057-no_apache_installed.patch | 73 |
1 files changed, 70 insertions, 3 deletions
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch index 2e35bcf7f..966cd091d 100644 --- a/debian/patches/057-no_apache_installed.patch +++ b/debian/patches/057-no_apache_installed.patch @@ -1,7 +1,7 @@ -Index: php5-5.2.0/sapi/apache2handler/config.m4 +Index: php5-5.2.3/sapi/apache2handler/config.m4 =================================================================== ---- php5-5.2.0.orig/sapi/apache2handler/config.m4 2007-03-18 22:56:59.000000000 +0100 -+++ php5-5.2.0/sapi/apache2handler/config.m4 2007-03-18 22:58:44.000000000 +0100 +--- php5-5.2.3.orig/sapi/apache2handler/config.m4 2005-09-01 16:33:47.000000000 +0200 ++++ php5-5.2.3/sapi/apache2handler/config.m4 2007-06-04 00:28:02.000000000 +0200 @@ -56,13 +56,13 @@ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" @@ -23,3 +23,70 @@ Index: php5-5.2.0/sapi/apache2handler/config.m4 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then +Index: php5-5.2.3/sapi/apache/config.m4 +=================================================================== +--- php5-5.2.3.orig/sapi/apache/config.m4 2007-06-04 00:29:29.000000000 +0200 ++++ php5-5.2.3/sapi/apache/config.m4 2007-06-04 00:30:22.000000000 +0200 +@@ -52,11 +52,11 @@ + APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + APACHE_INCLUDE=-I$APXS_INCLUDEDIR + +- # Test that we're trying to configure with apache 1.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -ge 2000000; then +- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) +- fi ++dnl # Test that we're trying to configure with apache 1.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -ge 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) ++dnl fi + + for flag in $APXS_CFLAGS; do + case $flag in +Index: php5-5.2.3/sapi/apache2filter/config.m4 +=================================================================== +--- php5-5.2.3.orig/sapi/apache2filter/config.m4 2007-06-04 00:29:29.000000000 +0200 ++++ php5-5.2.3/sapi/apache2filter/config.m4 2007-06-04 00:31:08.000000000 +0200 +@@ -57,13 +57,13 @@ + + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" + +- # Test that we're trying to configure with apache 2.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -le 2000000; then +- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) +- elif test "$APACHE_VERSION" -lt 2000040; then +- AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required]) +- fi ++dnl # Test that we're trying to configure with apache 2.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -le 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) ++dnl elif test "$APACHE_VERSION" -lt 2000040; then ++dnl AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required]) ++dnl fi + + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then +Index: php5-5.2.3/sapi/apache_hooks/config.m4 +=================================================================== +--- php5-5.2.3.orig/sapi/apache_hooks/config.m4 2007-06-04 00:29:29.000000000 +0200 ++++ php5-5.2.3/sapi/apache_hooks/config.m4 2007-06-04 00:29:55.000000000 +0200 +@@ -53,11 +53,11 @@ + APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + APACHE_INCLUDE=-I$APXS_INCLUDEDIR + +- # Test that we're trying to configure with apache 1.x +- PHP_AP_EXTRACT_VERSION($APXS_HTTPD) +- if test "$APACHE_VERSION" -ge 2000000; then +- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) +- fi ++dnl # Test that we're trying to configure with apache 1.x ++dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD) ++dnl if test "$APACHE_VERSION" -ge 2000000; then ++dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2]) ++dnl fi + + for flag in $APXS_CFLAGS; do + case $flag in |