Update patches for 5.5.2 release

3 files changed, 21 insertions, 40 deletions

diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 907b19fdb..e6b1f19ff 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -81,7 +81,7 @@ Last-Update: 2010-01-18
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -863,51 +863,6 @@ default_socket_timeout = 60
+@@ -863,50 +863,6 @@ default_socket_timeout = 60
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -129,7 +129,6 @@ Last-Update: 2010-01-18
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_zip.dll
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 26883025e..939b78801 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -5,85 +5,65 @@ Last-Update: 2010-01-18
 
 --- php5.orig/sapi/apache2handler/config.m4
 +++ php5/sapi/apache2handler/config.m4
-@@ -58,13 +58,13 @@ if test "$PHP_APXS2" != "no"; then
+@@ -58,14 +58,6 @@ if test "$PHP_APXS2" != "no"; then
  
    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)])
+-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
 -  elif test "$APACHE_VERSION" -lt 2000044; then
 -    AC_MSG_ERROR([Please note that Apache version >= 2.0.44 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 2000044; then
-+dnl    AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
-+dnl  fi
- 
+-
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
 --- php5.orig/sapi/apache/config.m4
 +++ php5/sapi/apache/config.m4
-@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
+@@ -56,12 +56,6 @@ if test "$PHP_APXS" != "no"; then
    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]) 
+-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate 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
+     -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";;
 --- php5.orig/sapi/apache2filter/config.m4
 +++ php5/sapi/apache2filter/config.m4
-@@ -59,13 +59,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
+@@ -59,14 +59,6 @@ if test "$PHP_APXS2FILTER" != "no"; then
  
    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)])
+-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate 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
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
 --- php5.orig/sapi/apache_hooks/config.m4
 +++ php5/sapi/apache_hooks/config.m4
-@@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
+@@ -57,12 +57,6 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
    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]) 
+-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate 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
+     -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";;
diff --git a/debian/patches/Zend_OpCache_GNUHurd_fix.patch b/debian/patches/Zend_OpCache_GNUHurd_fix.patch
index 367a516c6..41b477700 100644
--- a/debian/patches/Zend_OpCache_GNUHurd_fix.patch
+++ b/debian/patches/Zend_OpCache_GNUHurd_fix.patch
@@ -34,7 +34,7 @@
  # endif
 --- php5.orig/ext/opcache/config.m4
 +++ php5/ext/opcache/config.m4
-@@ -326,38 +326,42 @@ int main() {
+@@ -326,40 +326,42 @@ int main() {
      msg=yes,msg=no,msg=no)
    AC_MSG_RESULT([$msg])
  
@@ -100,7 +100,9 @@
 -# endif
 -#endif
 -int main() { return 0; }
--], [], [AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])], [])
+-],
+-[AC_MSG_RESULT([done])],
+-[AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])], [])
 +if test "$flock_type" == "unknown"; then
 +	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
 +fi