[Pkg-php-commits] [php/debian-experimental] refreshed all patches in series

Ondrej Sury ondrej at howl.office.nic.cz
Tue Aug 25 14:57:23 UTC 2009 

---
 debian/patches/001-libtool_fixes.patch             |   16 ++-
 debian/patches/002-static_openssl.patch            |    8 +-
 debian/patches/004-ldap_fix.patch                  |   10 +-
 debian/patches/006-debian_quirks.patch             |   78 ++++++----
 debian/patches/013-force_getaddrinfo.patch         |    8 +-
 debian/patches/017-pread_pwrite_disable.patch      |   10 +-
 debian/patches/019-z_off_t_as_long.patch           |   12 +-
 debian/patches/029-php.ini_paranoid.patch          |    6 +-
 debian/patches/033-we_WANT_libtool.patch           |    8 +-
 debian/patches/034-apache2_umask_fix.patch         |   12 +-
 debian/patches/036-fd_setsize_fix.patch            |   16 ++-
 debian/patches/043-recode_size_t.patch             |    8 +-
 debian/patches/044-strtod_arm_fix.patch            |   12 +-
 debian/patches/045-exif_nesting_level.patch        |    8 +-
 debian/patches/047-zts_with_dl.patch               |    8 +-
 debian/patches/052-phpinfo_no_configure.patch      |   16 ++-
 debian/patches/053-extension_api.patch             |   22 ++-
 debian/patches/057-no_apache_installed.patch       |   32 +++--
 debian/patches/100-recode_is_shared.patch          |    8 +-
 debian/patches/101-sqlite_is_shared.patch          |    8 +-
 debian/patches/108-64_bit_datetime.patch           |    6 +-
 debian/patches/112-proc_open.patch                 |    6 +-
 debian/patches/113-php.ini_securitynotes.patch     |   12 +-
 debian/patches/114-php_gd_segfault.patch           |   18 +-
 debian/patches/115-autoconf_ftbfs.patch            |   12 +-
 debian/patches/bad_whatis_entries.patch            |   18 ++-
 debian/patches/fix_broken_upstream_tests.patch     |   14 +-
 debian/patches/force_libmysqlclient_r.patch        |   24 ++-
 .../gentoo/006_ext-curl-set_opt-crash.patch        |    8 +-
 debian/patches/gentoo/009_ob-memory-leaks.patch    |   10 +-
 debian/patches/libdb_is_-ldb                       |    8 +-
 debian/patches/libedit_is_editline.patch           |   14 +-
 debian/patches/libtool2.2.patch                    |   10 +-
 debian/patches/manpage_spelling.patch              |   12 +-
 debian/patches/suhosin.patch                       |  160 ++++++++++----------
 debian/patches/use_embedded_timezonedb.patch       |   32 +++--
 36 files changed, 393 insertions(+), 277 deletions(-)

diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index af8eb7d..fa34537 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -1,6 +1,8 @@
---- php.orig/TSRM/configure.in
-+++ php/TSRM/configure.in
-@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
+Index: pkg-php/TSRM/configure.in
+===================================================================
+--- pkg-php.orig/TSRM/configure.in	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/TSRM/configure.in	2009-08-25 15:44:02.000000000 +0200
+@@ -13,9 +13,6 @@
  TSRM_THREADS_CHECKS
  	
  AM_PROG_LIBTOOL
@@ -10,9 +12,11 @@
  
  dnl TSRM_PTHREAD
  
---- php.orig/configure.in
-+++ php/configure.in
-@@ -1357,9 +1357,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+Index: pkg-php/configure.in
+===================================================================
+--- pkg-php.orig/configure.in	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:43.000000000 +0200
+@@ -1357,9 +1357,6 @@
  ])
  AC_PROG_LIBTOOL
  
diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 5477aed..4caf9a5 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,6 +1,8 @@
---- php.orig/acinclude.m4
-+++ php/acinclude.m4
-@@ -2373,9 +2373,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+Index: pkg-php/acinclude.m4
+===================================================================
+--- pkg-php.orig/acinclude.m4	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/acinclude.m4	2009-08-25 15:44:41.000000000 +0200
+@@ -2373,9 +2373,7 @@
  
      PHP_ADD_INCLUDE($OPENSSL_INCDIR)
    
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index 2fda128..5545d6b 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/ldap/ldap.c
-+++ php/ext/ldap/ldap.c
-@@ -1239,7 +1239,7 @@ PHP_FUNCTION(ldap_explode_dn)
+Index: pkg-php/ext/ldap/ldap.c
+===================================================================
+--- pkg-php.orig/ext/ldap/ldap.c	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/ext/ldap/ldap.c	2009-08-25 15:44:02.000000000 +0200
+@@ -1239,7 +1239,7 @@
  	}
  
  	i=0;
@@ -9,7 +11,7 @@
  	count = i;
  
  	array_init(return_value);
-@@ -1249,7 +1249,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1249,7 +1249,8 @@
  		add_index_string(return_value, i, ldap_value[i], 1);
  	}
  
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index a565326..fcac040 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,6 +1,8 @@
---- php.orig/configure.in
-+++ php/configure.in
-@@ -1032,7 +1032,7 @@ if test "$PHP_CLI" = "no"; then
+Index: pkg-php/configure.in
+===================================================================
+--- pkg-php.orig/configure.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:42.000000000 +0200
+@@ -1032,7 +1032,7 @@
  fi
  
  PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -9,7 +11,7 @@
    --without-pear          Do not install PEAR], DEFAULT, yes)
  
  if test "$PHP_PEAR" != "no"; then
-@@ -1062,7 +1062,7 @@ dnl
+@@ -1062,7 +1062,7 @@
    if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
      case $PHP_LAYOUT in
        GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -18,7 +20,7 @@
      esac
    fi
  
-@@ -1117,12 +1117,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1117,12 +1117,12 @@
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -33,7 +35,7 @@
      ;;
  esac
  
-@@ -1187,7 +1187,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1187,7 +1187,7 @@
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -42,9 +44,11 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
---- php.orig/ext/ext_skel
-+++ php/ext/ext_skel
-@@ -70,7 +70,7 @@ if test -d "$extname" ; then
+Index: pkg-php/ext/ext_skel
+===================================================================
+--- pkg-php.orig/ext/ext_skel	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/ext/ext_skel	2009-08-25 15:44:02.000000000 +0200
+@@ -70,7 +70,7 @@
  fi
  
  if test -z "$skel_dir"; then
@@ -53,9 +57,11 @@
  fi
  
  ## convert skel_dir to full path
---- php.orig/php.ini-development
-+++ php/php.ini-development
-@@ -785,7 +785,7 @@ default_mimetype = "text/html"
+Index: pkg-php/php.ini-development
+===================================================================
+--- pkg-php.orig/php.ini-development	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/php.ini-development	2009-08-25 15:44:31.000000000 +0200
+@@ -785,7 +785,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -64,9 +70,11 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
---- php.orig/php.ini-production
-+++ php/php.ini-production
-@@ -785,7 +785,7 @@ default_mimetype = "text/html"
+Index: pkg-php/php.ini-production
+===================================================================
+--- pkg-php.orig/php.ini-production	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/php.ini-production	2009-08-25 15:44:02.000000000 +0200
+@@ -785,7 +785,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -75,7 +83,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -939,53 +939,6 @@ default_socket_timeout = 60
+@@ -939,53 +939,6 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -129,9 +137,11 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
---- php.orig/sapi/caudium/config.m4
-+++ php/sapi/caudium/config.m4
-@@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then
+Index: pkg-php/sapi/caudium/config.m4
+===================================================================
+--- pkg-php.orig/sapi/caudium/config.m4	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/sapi/caudium/config.m4	2009-08-25 15:44:02.000000000 +0200
+@@ -26,8 +26,8 @@
      AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/])
    fi
    if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
@@ -142,7 +152,7 @@
      if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
        AC_MSG_ERROR(Failed to figure out Pike module and include directories)
      fi
-@@ -84,7 +84,9 @@ if test "$PHP_CAUDIUM" != "no"; then
+@@ -84,7 +84,9 @@
    PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`   
    AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support])
    PHP_SELECT_SAPI(caudium, shared, caudium.c)
@@ -153,9 +163,11 @@
    RESULT="  *** Pike binary used:         $PIKE
    *** Pike include dir(s) used: $PIKE_INCLUDE_DIR
    *** Pike version:             $PIKE_VERSION"
---- php.orig/sapi/cli/php.1.in
-+++ php/sapi/cli/php.1.in
-@@ -306,13 +306,14 @@ Shows configuration for extension
+Index: pkg-php/sapi/cli/php.1.in
+===================================================================
+--- pkg-php.orig/sapi/cli/php.1.in	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/sapi/cli/php.1.in	2009-08-25 15:44:25.000000000 +0200
+@@ -306,13 +306,14 @@
  .B name
  .SH FILES
  .TP 15
@@ -175,8 +187,10 @@
  .SH EXAMPLES
  .TP 5
  \fIphp -r 'echo "Hello World\\n";'\fP
---- php.orig/scripts/Makefile.frag
-+++ php/scripts/Makefile.frag
+Index: pkg-php/scripts/Makefile.frag
+===================================================================
+--- pkg-php.orig/scripts/Makefile.frag	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/scripts/Makefile.frag	2009-08-25 15:44:02.000000000 +0200
 @@ -3,8 +3,8 @@
  # Build environment install
  #
@@ -188,9 +202,11 @@
  
  BUILD_FILES = \
  	scripts/phpize.m4 \
---- php.orig/scripts/php-config.in
-+++ php/scripts/php-config.in
-@@ -5,8 +5,8 @@ prefix="@prefix@"
+Index: pkg-php/scripts/php-config.in
+===================================================================
+--- pkg-php.orig/scripts/php-config.in	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/scripts/php-config.in	2009-08-25 15:44:35.000000000 +0200
+@@ -5,8 +5,8 @@
  exec_prefix="@exec_prefix@"
  version="@PHP_VERSION@"
  vernum="@PHP_VERSION_ID@"
@@ -201,8 +217,10 @@
  ldflags="@PHP_LDFLAGS@"
  libs="@EXTRA_LIBS@"
  extension_dir='@EXTENSION_DIR@'
---- php.orig/scripts/phpize.in
-+++ php/scripts/phpize.in
+Index: pkg-php/scripts/phpize.in
+===================================================================
+--- pkg-php.orig/scripts/phpize.in	2009-08-25 15:43:42.000000000 +0200
++++ pkg-php/scripts/phpize.in	2009-08-25 15:44:42.000000000 +0200
 @@ -3,8 +3,8 @@
  # Variable declaration
  prefix='@prefix@'
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index 5a93f02..99a314a 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,6 +1,8 @@
---- php.orig/configure.in
-+++ php/configure.in
-@@ -642,50 +642,50 @@ asprintf \
+Index: pkg-php/configure.in
+===================================================================
+--- pkg-php.orig/configure.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:35.000000000 +0200
+@@ -642,50 +642,50 @@
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
diff --git a/debian/patches/017-pread_pwrite_disable.patch b/debian/patches/017-pread_pwrite_disable.patch
index 779bf35..f0c1f28 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,6 +1,8 @@
---- php.orig/acinclude.m4
-+++ php/acinclude.m4
-@@ -1219,7 +1219,7 @@ $1
+Index: pkg-php/acinclude.m4
+===================================================================
+--- pkg-php.orig/acinclude.m4	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/acinclude.m4	2009-08-25 15:44:02.000000000 +0200
+@@ -1219,7 +1219,7 @@
      }
  
    ],[
@@ -9,7 +11,7 @@
    ],[
      ac_cv_pwrite=no
    ],[
-@@ -1248,7 +1248,7 @@ $1
+@@ -1248,7 +1248,7 @@
      exit(0);
      }
    ],[
diff --git a/debian/patches/019-z_off_t_as_long.patch b/debian/patches/019-z_off_t_as_long.patch
index 5980221..204ae72 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -1,5 +1,7 @@
---- /dev/null
-+++ php/ext/zlib/zconf.h
+Index: pkg-php/ext/zlib/zconf.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pkg-php/ext/zlib/zconf.h	2009-08-25 15:44:02.000000000 +0200
 @@ -0,0 +1,326 @@
 +/* zconf.h -- configuration of the zlib compression library
 + * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -327,8 +329,10 @@
 +#endif
 +
 +#endif /* ZCONF_H */
---- /dev/null
-+++ php/ext/zlib/zlib.h
+Index: pkg-php/ext/zlib/zlib.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pkg-php/ext/zlib/zlib.h	2009-08-25 15:44:02.000000000 +0200
 @@ -0,0 +1,1200 @@
 +/* zlib.h -- interface of the 'zlib' general purpose compression library
 +  version 1.2.1.1, January 9th, 2004
diff --git a/debian/patches/029-php.ini_paranoid.patch b/debian/patches/029-php.ini_paranoid.patch
index 157d190..e2c231c 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -1,5 +1,7 @@
---- /dev/null
-+++ php/php.ini-paranoid
+Index: pkg-php/php.ini-paranoid
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pkg-php/php.ini-paranoid	2009-08-25 15:44:02.000000000 +0200
 @@ -0,0 +1,1504 @@
 +[PHP]
 +
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index c7f58f1..e38541e 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -6,9 +6,11 @@ from debian/rules)
 note that we don't touch the libtool.m4 that they ship here, and this file 
 gets included in the build process as part of the phpize stuff.  however,
 this is solved in ./debian/rules where it's overwritten with a symlink.
---- php.orig/build/build2.mk
-+++ php/build/build2.mk
-@@ -52,7 +52,8 @@ $(TOUCH_FILES):
+Index: pkg-php/build/build2.mk
+===================================================================
+--- pkg-php.orig/build/build2.mk	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/build/build2.mk	2009-08-25 15:44:02.000000000 +0200
+@@ -52,7 +52,8 @@
  
  aclocal.m4: configure.in acinclude.m4
  	@echo rebuilding $@
diff --git a/debian/patches/034-apache2_umask_fix.patch b/debian/patches/034-apache2_umask_fix.patch
index 4a3bf34..02ca990 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,9 +1,11 @@
 
 Save and restore umask across requests correctly.
 
---- php.orig/sapi/apache2handler/sapi_apache2.c
-+++ php/sapi/apache2handler/sapi_apache2.c
-@@ -448,6 +448,19 @@ static apr_status_t php_server_context_c
+Index: pkg-php/sapi/apache2handler/sapi_apache2.c
+===================================================================
+--- pkg-php.orig/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:44:28.000000000 +0200
+@@ -448,6 +448,19 @@
  	return APR_SUCCESS;
  }
  
@@ -23,7 +25,7 @@ Save and restore umask across requests correctly.
  static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
  {
  	char *content_length;
-@@ -639,6 +652,8 @@ zend_first_try {
+@@ -639,6 +652,8 @@
  	} else {
  		zend_file_handle zfd;
  
@@ -32,7 +34,7 @@ Save and restore umask across requests correctly.
  		zfd.type = ZEND_HANDLE_FILENAME;
  		zfd.filename = (char *) r->filename;
  		zfd.free_filename = 0;
-@@ -650,6 +665,9 @@ zend_first_try {
+@@ -650,6 +665,9 @@
  			zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd);
  		}
  
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch
index 59f7d8c..22c0b26 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/sockets/sockets.c
-+++ php/ext/sockets/sockets.c
-@@ -708,6 +708,7 @@ static int php_sock_array_to_fd_set(zval
+Index: pkg-php/ext/sockets/sockets.c
+===================================================================
+--- pkg-php.orig/ext/sockets/sockets.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/sockets/sockets.c	2009-08-25 15:44:03.000000000 +0200
+@@ -708,6 +708,7 @@
  
  		php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket);
  		if (!php_sock) continue; /* If element is not a resource, skip it */
@@ -8,9 +10,11 @@
  
  		PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
  		if (php_sock->bsd_socket > *max_fd) {
---- php.orig/ext/standard/streamsfuncs.c
-+++ php/ext/standard/streamsfuncs.c
-@@ -612,6 +612,9 @@ static int stream_array_to_fd_set(zval *
+Index: pkg-php/ext/standard/streamsfuncs.c
+===================================================================
+--- pkg-php.orig/ext/standard/streamsfuncs.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/streamsfuncs.c	2009-08-25 15:44:03.000000000 +0200
+@@ -612,6 +612,9 @@
  		 * is not displayed.
  		 * */
  		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd >= 0) {
diff --git a/debian/patches/043-recode_size_t.patch b/debian/patches/043-recode_size_t.patch
index d443cd0..4d0139b 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/recode/recode.c
-+++ php/ext/recode/recode.c
-@@ -149,7 +149,7 @@ PHP_FUNCTION(recode_string)
+Index: pkg-php/ext/recode/recode.c
+===================================================================
+--- pkg-php.orig/ext/recode/recode.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/recode/recode.c	2009-08-25 15:44:03.000000000 +0200
+@@ -149,7 +149,7 @@
  	int req_len, str_len;
  	char *req, *str;
  
diff --git a/debian/patches/044-strtod_arm_fix.patch b/debian/patches/044-strtod_arm_fix.patch
index ea3fe35..c949b6a 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,6 +1,8 @@
---- php.orig/Zend/zend_strtod.c
-+++ php/Zend/zend_strtod.c
-@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
+Index: pkg-php/Zend/zend_strtod.c
+===================================================================
+--- pkg-php.orig/Zend/zend_strtod.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/Zend/zend_strtod.c	2009-08-25 15:44:03.000000000 +0200
+@@ -152,14 +152,25 @@
  #define IEEE_LITTLE_ENDIAN
  #endif
  
@@ -33,7 +35,7 @@
  #endif
  
  #ifdef __vax__
-@@ -266,8 +277,7 @@ BEGIN_EXTERN_C()
+@@ -266,8 +277,7 @@
  
  #if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
  		    defined(IBM) != 1
@@ -43,7 +45,7 @@
  #endif
  
  	typedef union {
-@@ -287,7 +297,7 @@ BEGIN_EXTERN_C()
+@@ -287,7 +297,7 @@
   * An alternative that might be better on some machines is
   * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
   */
diff --git a/debian/patches/045-exif_nesting_level.patch b/debian/patches/045-exif_nesting_level.patch
index 1910d42..f30ddf0 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/exif/exif.c
-+++ php/ext/exif/exif.c
-@@ -99,7 +99,7 @@ typedef unsigned char uchar;
+Index: pkg-php/ext/exif/exif.c
+===================================================================
+--- pkg-php.orig/ext/exif/exif.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/exif/exif.c	2009-08-25 15:44:03.000000000 +0200
+@@ -99,7 +99,7 @@
  
  #define EFREE_IF(ptr)	if (ptr) efree(ptr)
  
diff --git a/debian/patches/047-zts_with_dl.patch b/debian/patches/047-zts_with_dl.patch
index e040e03..e5688b4 100644
--- a/debian/patches/047-zts_with_dl.patch
+++ b/debian/patches/047-zts_with_dl.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/standard/dl.c
-+++ php/ext/standard/dl.c
-@@ -77,12 +77,7 @@ PHPAPI PHP_FUNCTION(dl)
+Index: pkg-php/ext/standard/dl.c
+===================================================================
+--- pkg-php.orig/ext/standard/dl.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/dl.c	2009-08-25 15:44:28.000000000 +0200
+@@ -77,12 +77,7 @@
  		(strcmp(sapi_module.name, "cli") != 0) &&
  		(strncmp(sapi_module.name, "embed", 5) != 0)
  	) {
diff --git a/debian/patches/052-phpinfo_no_configure.patch b/debian/patches/052-phpinfo_no_configure.patch
index c806c27..ada2f63 100644
--- a/debian/patches/052-phpinfo_no_configure.patch
+++ b/debian/patches/052-phpinfo_no_configure.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/standard/info.c
-+++ php/ext/standard/info.c
-@@ -668,7 +668,7 @@ PHPAPI void php_print_info(int flag TSRM
+Index: pkg-php/ext/standard/info.c
+===================================================================
+--- pkg-php.orig/ext/standard/info.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/info.c	2009-08-25 15:44:28.000000000 +0200
+@@ -668,7 +668,7 @@
  #ifdef ARCHITECTURE
  		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
  #endif
@@ -9,9 +11,11 @@
  		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
  #endif
  
---- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php/ext/standard/tests/general_functions/phpinfo.phpt
-@@ -20,7 +20,6 @@ PHP Version => %s
+Index: pkg-php/ext/standard/tests/general_functions/phpinfo.phpt
+===================================================================
+--- pkg-php.orig/ext/standard/tests/general_functions/phpinfo.phpt	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/tests/general_functions/phpinfo.phpt	2009-08-25 15:44:26.000000000 +0200
+@@ -20,7 +20,6 @@
  
  System => %s
  Build Date => %s%a
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index 72deb02..7ea699f 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,6 +1,8 @@
---- php.orig/configure.in
-+++ php/configure.in
-@@ -1141,8 +1141,13 @@ dnl Build extension directory path
+Index: pkg-php/configure.in
+===================================================================
+--- pkg-php.orig/configure.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:30.000000000 +0200
+@@ -1141,8 +1141,13 @@
  
  ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
  
@@ -15,7 +17,7 @@
    if test "$oldstyleextdir" = "yes"; then
      if test "$PHP_DEBUG" = "1"; then
        part1=debug
-@@ -1287,6 +1292,7 @@ PHP_SUBST(CXX)
+@@ -1287,6 +1292,7 @@
  PHP_SUBST(CXXFLAGS)
  PHP_SUBST(CXXFLAGS_CLEAN)
  PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -23,9 +25,11 @@
  PHP_SUBST_OLD(EXTENSION_DIR)
  PHP_SUBST_OLD(EXTRA_LDFLAGS)
  PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
---- php.orig/scripts/php-config.in
-+++ php/scripts/php-config.in
-@@ -17,6 +17,7 @@ php_cli_binary=NONE
+Index: pkg-php/scripts/php-config.in
+===================================================================
+--- pkg-php.orig/scripts/php-config.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/scripts/php-config.in	2009-08-25 15:44:03.000000000 +0200
+@@ -17,6 +17,7 @@
  php_cgi_binary=NONE
  configure_options="@CONFIGURE_OPTIONS@"
  php_sapis="@PHP_INSTALLED_SAPIS@"
@@ -33,7 +37,7 @@
  
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
-@@ -55,6 +56,8 @@ case "$1" in
+@@ -55,6 +56,8 @@
    echo $include_dir;;
  --php-binary)
    echo $php_binary;;
@@ -42,7 +46,7 @@
  --php-sapis)
    echo $php_sapis;;
  --configure-options)
-@@ -75,6 +78,7 @@ Options:
+@@ -75,6 +78,7 @@
    --include-dir       [$include_dir]
    --php-binary        [$php_binary]
    --php-sapis         [$php_sapis]
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 3e48664..845d71e 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,6 +1,8 @@
---- php.orig/sapi/apache2handler/config.m4
-+++ php/sapi/apache2handler/config.m4
-@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
+Index: pkg-php/sapi/apache2handler/config.m4
+===================================================================
+--- pkg-php.orig/sapi/apache2handler/config.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/sapi/apache2handler/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -59,13 +59,13 @@
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
  
@@ -21,9 +23,11 @@
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- php.orig/sapi/apache/config.m4
-+++ php/sapi/apache/config.m4
-@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
+Index: pkg-php/sapi/apache/config.m4
+===================================================================
+--- pkg-php.orig/sapi/apache/config.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/sapi/apache/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -56,11 +56,11 @@
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
  
@@ -40,9 +44,11 @@
  
    for flag in $APXS_CFLAGS; do
      case $flag in
---- php.orig/sapi/apache2filter/config.m4
-+++ php/sapi/apache2filter/config.m4
-@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
+Index: pkg-php/sapi/apache2filter/config.m4
+===================================================================
+--- pkg-php.orig/sapi/apache2filter/config.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/sapi/apache2filter/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -60,13 +60,13 @@
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
  
@@ -63,9 +69,11 @@
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- php.orig/sapi/apache_hooks/config.m4
-+++ php/sapi/apache_hooks/config.m4
-@@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
+Index: pkg-php/sapi/apache_hooks/config.m4
+===================================================================
+--- pkg-php.orig/sapi/apache_hooks/config.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/sapi/apache_hooks/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -57,11 +57,11 @@
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
  
diff --git a/debian/patches/100-recode_is_shared.patch b/debian/patches/100-recode_is_shared.patch
index 4a3340d..72168e4 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/recode/config9.m4
-+++ php/ext/recode/config9.m4
-@@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
+Index: pkg-php/ext/recode/config9.m4
+===================================================================
+--- pkg-php.orig/ext/recode/config9.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/recode/config9.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -13,6 +13,6 @@
    fi
  
    if test -n "$recode_conflict"; then
diff --git a/debian/patches/101-sqlite_is_shared.patch b/debian/patches/101-sqlite_is_shared.patch
index 9035218..9e82d03 100644
--- a/debian/patches/101-sqlite_is_shared.patch
+++ b/debian/patches/101-sqlite_is_shared.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/sqlite/config.m4
-+++ php/ext/sqlite/config.m4
-@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
+Index: pkg-php/ext/sqlite/config.m4
+===================================================================
+--- pkg-php.orig/ext/sqlite/config.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/sqlite/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -84,7 +84,7 @@
      ])
      SQLITE_MODULE_TYPE=external
      PHP_SQLITE_CFLAGS=$pdo_inc_path
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index 38bfd07..08c9405 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -1,5 +1,7 @@
---- php.orig/ext/standard/datetime.c
-+++ php/ext/standard/datetime.c
+Index: pkg-php/ext/standard/datetime.c
+===================================================================
+--- pkg-php.orig/ext/standard/datetime.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/datetime.c	2009-08-25 15:44:03.000000000 +0200
 @@ -20,6 +20,9 @@
  
  /* $Id: datetime.c,v 1.134.2.2.2.4.2.3 2008/12/31 11:15:44 sebastian Exp $ */
diff --git a/debian/patches/112-proc_open.patch b/debian/patches/112-proc_open.patch
index bcbe70e..f18cae7 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,5 +1,7 @@
---- php.orig/ext/standard/proc_open.c
-+++ php/ext/standard/proc_open.c
+Index: pkg-php/ext/standard/proc_open.c
+===================================================================
+--- pkg-php.orig/ext/standard/proc_open.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/standard/proc_open.c	2009-08-25 15:44:03.000000000 +0200
 @@ -61,7 +61,7 @@
   * */
  #ifdef PHP_CAN_SUPPORT_PROC_OPEN
diff --git a/debian/patches/113-php.ini_securitynotes.patch b/debian/patches/113-php.ini_securitynotes.patch
index f5e0a3b..11021f2 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -1,6 +1,8 @@
---- php.orig/php.ini-development
-+++ php/php.ini-development
-@@ -335,6 +335,11 @@ allow_call_time_pass_reference = Off
+Index: pkg-php/php.ini-development
+===================================================================
+--- pkg-php.orig/php.ini-development	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/php.ini-development	2009-08-25 15:44:03.000000000 +0200
+@@ -335,6 +335,11 @@
  
  ; Safe Mode
  ; http://php.net/safe-mode
@@ -12,7 +14,7 @@
  safe_mode = Off
  
  ; By default, Safe Mode does a UID compare check when
-@@ -376,6 +381,12 @@ safe_mode_protected_env_vars = LD_LIBRAR
+@@ -376,6 +381,12 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -25,7 +27,7 @@
  ;open_basedir =
  
  ; This directive allows you to disable certain functions for security reasons.
-@@ -692,6 +703,11 @@ request_order = "GP"
+@@ -692,6 +703,11 @@
  ; register_globals to be on;  Using form variables as globals can easily lead
  ; to possible security problems, if the code is not very well thought of.
  ; http://php.net/register-globals
diff --git a/debian/patches/114-php_gd_segfault.patch b/debian/patches/114-php_gd_segfault.patch
index bf2b95e..d59a391 100644
--- a/debian/patches/114-php_gd_segfault.patch
+++ b/debian/patches/114-php_gd_segfault.patch
@@ -1,8 +1,8 @@
-diff --git a/ext/gd/libgd/gd_compat.c b/ext/gd/libgd/gd_compat.c
-index bba6234..473ea20 100644
---- a/ext/gd/libgd/gd_compat.c
-+++ b/ext/gd/libgd/gd_compat.c
-@@ -14,7 +14,7 @@ int gdJpegGetVersionInt()
+Index: pkg-php/ext/gd/libgd/gd_compat.c
+===================================================================
+--- pkg-php.orig/ext/gd/libgd/gd_compat.c	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/gd/libgd/gd_compat.c	2009-08-25 15:44:03.000000000 +0200
+@@ -14,7 +14,7 @@
  	return JPEG_LIB_VERSION;
  }
  
@@ -11,10 +11,10 @@ index bba6234..473ea20 100644
  {
  	switch(JPEG_LIB_VERSION) {
  		case 62:
-diff --git a/ext/gd/libgd/gd_compat.h b/ext/gd/libgd/gd_compat.h
-index 022d0a8..c084a00 100644
---- a/ext/gd/libgd/gd_compat.h
-+++ b/ext/gd/libgd/gd_compat.h
+Index: pkg-php/ext/gd/libgd/gd_compat.h
+===================================================================
+--- pkg-php.orig/ext/gd/libgd/gd_compat.h	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/ext/gd/libgd/gd_compat.h	2009-08-25 15:44:03.000000000 +0200
 @@ -8,7 +8,7 @@
  #endif
  
diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index bb132cd..31dcefe 100644
--- a/debian/patches/115-autoconf_ftbfs.patch
+++ b/debian/patches/115-autoconf_ftbfs.patch
@@ -1,7 +1,7 @@
 Index: pkg-php/configure.in
 ===================================================================
---- pkg-php.orig/configure.in	2009-08-25 15:39:10.000000000 +0200
-+++ pkg-php/configure.in	2009-08-25 15:39:21.000000000 +0200
+--- pkg-php.orig/configure.in	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:28.000000000 +0200
 @@ -1,7 +1,7 @@
  ## $Id: configure.in,v 1.579.2.52.2.77.2.58 2009/06/26 15:44:18 johannes Exp $ -*- autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
@@ -70,8 +70,8 @@ Index: pkg-php/configure.in
  dnl ## All of these are normally in the extension directories.
 Index: pkg-php/ext/standard/config.m4
 ===================================================================
---- pkg-php.orig/ext/standard/config.m4	2009-08-25 15:39:10.000000000 +0200
-+++ pkg-php/ext/standard/config.m4	2009-08-25 15:39:23.000000000 +0200
+--- pkg-php.orig/ext/standard/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/standard/config.m4	2009-08-25 15:44:03.000000000 +0200
 @@ -1,6 +1,6 @@
  dnl $Id: config.m4,v 1.80.2.3.2.3.2.8 2009/01/11 23:37:16 scottmac Exp $ -*- autoconf -*-
  
@@ -91,8 +91,8 @@ Index: pkg-php/ext/standard/config.m4
  dnl Check if there is a support means of creating a new process
 Index: pkg-php/scripts/phpize.m4
 ===================================================================
---- pkg-php.orig/scripts/phpize.m4	2009-08-25 15:39:10.000000000 +0200
-+++ pkg-php/scripts/phpize.m4	2009-08-25 15:39:23.000000000 +0200
+--- pkg-php.orig/scripts/phpize.m4	2009-08-25 15:43:41.000000000 +0200
++++ pkg-php/scripts/phpize.m4	2009-08-25 15:44:03.000000000 +0200
 @@ -1,6 +1,6 @@
  dnl This file becomes configure.in for self-contained extensions.
  
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index 7ec62f7..4c28e70 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,5 +1,7 @@
---- php.orig/sapi/cli/php.1.in
-+++ php/sapi/cli/php.1.in
+Index: pkg-php/sapi/cli/php.1.in
+===================================================================
+--- pkg-php.orig/sapi/cli/php.1.in	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/sapi/cli/php.1.in	2009-08-25 15:44:03.000000000 +0200
 @@ -1,6 +1,5 @@
  .TH PHP 1 "2009" "The PHP Group" "Scripting Language"
  .SH NAME
@@ -7,8 +9,10 @@
  php \- PHP Command Line Interface 'CLI'
  .SH SYNOPSIS
  .B php
---- php.orig/scripts/man1/php-config.1.in
-+++ php/scripts/man1/php-config.1.in
+Index: pkg-php/scripts/man1/php-config.1.in
+===================================================================
+--- pkg-php.orig/scripts/man1/php-config.1.in	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/scripts/man1/php-config.1.in	2009-08-25 15:44:03.000000000 +0200
 @@ -1,6 +1,5 @@
  .TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
  .SH NAME
@@ -16,8 +20,10 @@
  php\-config \- get information about PHP configuration and compile options
  .SH SYNOPSIS
  .B php\-config
---- php.orig/scripts/man1/phpize.1.in
-+++ php/scripts/man1/phpize.1.in
+Index: pkg-php/scripts/man1/phpize.1.in
+===================================================================
+--- pkg-php.orig/scripts/man1/phpize.1.in	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/scripts/man1/phpize.1.in	2009-08-25 15:44:03.000000000 +0200
 @@ -1,7 +1,6 @@
  .TH phpize 1 "2006" "The PHP Group" "Scripting Language"
  .SH NAME
diff --git a/debian/patches/fix_broken_upstream_tests.patch b/debian/patches/fix_broken_upstream_tests.patch
index cdf4da1..0fa0c72 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/soap/tests/server009.phpt
-+++ php/ext/soap/tests/server009.phpt
-@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
+Index: pkg-php/ext/soap/tests/server009.phpt
+===================================================================
+--- pkg-php.orig/ext/soap/tests/server009.phpt	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/soap/tests/server009.phpt	2009-08-25 15:44:03.000000000 +0200
+@@ -7,6 +7,10 @@
  		die('skip this test needs session extension');
  	}
  ?>
@@ -11,8 +13,10 @@
  --FILE--
  <?php
  class foo {
---- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php/ext/standard/tests/general_functions/phpinfo.phpt
+Index: pkg-php/ext/standard/tests/general_functions/phpinfo.phpt
+===================================================================
+--- pkg-php.orig/ext/standard/tests/general_functions/phpinfo.phpt	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/ext/standard/tests/general_functions/phpinfo.phpt	2009-08-25 15:44:03.000000000 +0200
 @@ -1,5 +1,7 @@
  --TEST--
  phpinfo()
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index d67dd33..e5c4452 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/mysql/config.m4
-+++ php/ext/mysql/config.m4
-@@ -90,7 +90,7 @@ elif test "$PHP_MYSQL" != "no"; then
+Index: pkg-php/ext/mysql/config.m4
+===================================================================
+--- pkg-php.orig/ext/mysql/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/mysql/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -90,7 +90,7 @@
  Note that the MySQL client library is not bundled anymore!])
    fi
  
@@ -9,9 +11,11 @@
      MYSQL_LIBNAME=mysqlclient_r
    else
      MYSQL_LIBNAME=mysqlclient
---- php.orig/ext/mysqli/config.m4
-+++ php/ext/mysqli/config.m4
-@@ -29,7 +29,7 @@ elif test "$PHP_MYSQLI" != "no"; then
+Index: pkg-php/ext/mysqli/config.m4
+===================================================================
+--- pkg-php.orig/ext/mysqli/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/mysqli/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -29,7 +29,7 @@
      MYSQL_LIB_CFG='--libmysqld-libs'
      dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
      mysqli_extra_sources="mysqli_embedded.c"
@@ -20,9 +24,11 @@
      MYSQL_LIB_CFG='--libs_r'
      MYSQL_LIB_NAME='mysqlclient_r'
    else
---- php.orig/ext/pdo_mysql/config.m4
-+++ php/ext/pdo_mysql/config.m4
-@@ -68,7 +68,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
+Index: pkg-php/ext/pdo_mysql/config.m4
+===================================================================
+--- pkg-php.orig/ext/pdo_mysql/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/pdo_mysql/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -68,7 +68,7 @@
          AC_PATH_PROG(SED, sed)
        fi
  
diff --git a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
index d3d5850..f8fae59 100644
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
@@ -3,9 +3,11 @@ PHP_5_2
 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.42&r2=1.62.2.14.2.43&diff_format=u
 http://bugs.php.net/bug.php?id=47616
 Fixed bug #47616 (curl keeps crashing)
---- php.orig/ext/curl/interface.c
-+++ php/ext/curl/interface.c
-@@ -1850,6 +1850,7 @@ static int _php_curl_setopt(php_curl *ch
+Index: pkg-php/ext/curl/interface.c
+===================================================================
+--- pkg-php.orig/ext/curl/interface.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/curl/interface.c	2009-08-25 15:44:03.000000000 +0200
+@@ -1850,6 +1850,7 @@
  #if LIBCURL_VERSION_NUM >= 0x071101
  				convert_to_string_ex(zvalue);
  				/* with curl 7.17.0 and later, we can use COPYPOSTFIELDS, but we have to provide size before */
diff --git a/debian/patches/gentoo/009_ob-memory-leaks.patch b/debian/patches/gentoo/009_ob-memory-leaks.patch
index 2792ef0..3682cdb 100644
--- a/debian/patches/gentoo/009_ob-memory-leaks.patch
+++ b/debian/patches/gentoo/009_ob-memory-leaks.patch
@@ -3,9 +3,11 @@ PHP_5_2
 http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.8&r2=1.167.2.3.2.9&diff_format=u
 Fixed memory leak in ob_get_clean/ob_get_flush.
 
---- php.orig/main/output.c
-+++ php/main/output.c
-@@ -818,10 +818,12 @@ PHP_FUNCTION(ob_end_flush)
+Index: pkg-php/main/output.c
+===================================================================
+--- pkg-php.orig/main/output.c	2009-08-25 15:43:39.000000000 +0200
++++ pkg-php/main/output.c	2009-08-25 15:44:03.000000000 +0200
+@@ -818,10 +818,12 @@
  	
  	if (!OG(ob_nesting_level)) {
  		php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush.");
@@ -18,7 +20,7 @@ Fixed memory leak in ob_get_clean/ob_get_flush.
  		RETURN_FALSE;
  	}
  	
-@@ -840,10 +842,12 @@ PHP_FUNCTION(ob_end_clean)
+@@ -840,10 +842,12 @@
  		
  	if (!OG(ob_nesting_level)) {
  		php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete.");
diff --git a/debian/patches/libdb_is_-ldb b/debian/patches/libdb_is_-ldb
index 3001d86..a50f1cd 100644
--- a/debian/patches/libdb_is_-ldb
+++ b/debian/patches/libdb_is_-ldb
@@ -1,6 +1,8 @@
---- php.orig/ext/dba/config.m4
-+++ php/ext/dba/config.m4
-@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
+Index: pkg-php/ext/dba/config.m4
+===================================================================
+--- pkg-php.orig/ext/dba/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/dba/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -306,7 +306,7 @@
        break
      fi
    done
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index b08e6dc..81292b9 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,6 +1,8 @@
---- php.orig/ext/readline/config.m4
-+++ php/ext/readline/config.m4
-@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+Index: pkg-php/ext/readline/config.m4
+===================================================================
+--- pkg-php.orig/ext/readline/config.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/readline/config.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -55,7 +55,7 @@
  elif test "$PHP_LIBEDIT" != "no"; then
  
    for i in $PHP_LIBEDIT /usr/local /usr; do
@@ -9,8 +11,10 @@
    done
  
    if test -z "$LIBEDIT_DIR"; then
---- php.orig/ext/readline/readline.c
-+++ php/ext/readline/readline.c
+Index: pkg-php/ext/readline/readline.c
+===================================================================
+--- pkg-php.orig/ext/readline/readline.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/readline/readline.c	2009-08-25 15:44:03.000000000 +0200
 @@ -33,8 +33,10 @@
  #define rl_completion_matches completion_matches
  #endif
diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
index 8a7b938..bc4a1c4 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,6 +1,8 @@
---- php.orig/scripts/phpize.in
-+++ php/scripts/phpize.in
-@@ -5,10 +5,16 @@ prefix='@prefix@'
+Index: pkg-php/scripts/phpize.in
+===================================================================
+--- pkg-php.orig/scripts/phpize.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/scripts/phpize.in	2009-08-25 15:44:02.000000000 +0200
+@@ -5,10 +5,16 @@
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="$prefix/lib/php5/build"
  includedir="$prefix/include/php5"
@@ -18,7 +20,7 @@
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
  CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
  	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
-@@ -144,8 +150,9 @@ phpize_copy_files()
+@@ -144,8 +150,9 @@
    test -d build || mkdir build
   
    (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
diff --git a/debian/patches/manpage_spelling.patch b/debian/patches/manpage_spelling.patch
index 0f69d17..e32def1 100644
--- a/debian/patches/manpage_spelling.patch
+++ b/debian/patches/manpage_spelling.patch
@@ -1,6 +1,8 @@
---- php.orig/sapi/cli/php.1.in
-+++ php/sapi/cli/php.1.in
-@@ -69,7 +69,7 @@ specified by \-F to be executed.
+Index: pkg-php/sapi/cli/php.1.in
+===================================================================
+--- pkg-php.orig/sapi/cli/php.1.in	2009-08-25 15:44:02.000000000 +0200
++++ pkg-php/sapi/cli/php.1.in	2009-08-25 15:44:23.000000000 +0200
+@@ -69,7 +69,7 @@
  You can access the input line by \fB$argn\fP. While processing the input lines
  .B $argi 
  contains the number of the actual line being processed. Further more
@@ -9,7 +11,7 @@
  .IR code
  (see \-r) before and
  after all input lines have been processed respectively. Notice that the
-@@ -316,7 +316,7 @@ The configuration file for the CGI versi
+@@ -316,7 +316,7 @@
  The configuration file for the version of PHP that apache2 uses.
  .SH EXAMPLES
  .TP 5
@@ -18,7 +20,7 @@
  This command simply writes the text "Hello World" to standard out.
  .TP
  \fIphp \-r 'print_r(gd_info());'\fP
-@@ -340,7 +340,7 @@ configuration information. If you then c
+@@ -340,7 +340,7 @@
  Using this PHP command you can count the lines being input.
  .TP
  \fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index 09c913e..29e7f22 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -10,8 +10,8 @@ the following modifications have been made:
  * "quilt refresh" has been run to clean up the offsets, etc
 Index: pkg-php/Zend/Makefile.am
 ===================================================================
---- pkg-php.orig/Zend/Makefile.am	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/Makefile.am	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/Makefile.am	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/Makefile.am	2009-08-25 15:44:03.000000000 +0200
 @@ -17,7 +17,7 @@
  	zend_objects_API.c zend_ts_hash.c zend_stream.c \
  	zend_default_classes.c \
@@ -23,8 +23,8 @@ Index: pkg-php/Zend/Makefile.am
  libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
 Index: pkg-php/Zend/Zend.dsp
 ===================================================================
---- pkg-php.orig/Zend/Zend.dsp	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/Zend.dsp	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/Zend.dsp	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/Zend.dsp	2009-08-25 15:44:03.000000000 +0200
 @@ -247,6 +247,14 @@
  # End Source File
  # Begin Source File
@@ -42,8 +42,8 @@ Index: pkg-php/Zend/Zend.dsp
  # Begin Source File
 Index: pkg-php/Zend/ZendTS.dsp
 ===================================================================
---- pkg-php.orig/Zend/ZendTS.dsp	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/ZendTS.dsp	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/ZendTS.dsp	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/ZendTS.dsp	2009-08-25 15:44:03.000000000 +0200
 @@ -277,6 +277,14 @@
  # End Source File
  # Begin Source File
@@ -61,8 +61,8 @@ Index: pkg-php/Zend/ZendTS.dsp
  # Begin Source File
 Index: pkg-php/Zend/zend.c
 ===================================================================
---- pkg-php.orig/Zend/zend.c	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend.c	2009-08-25 15:44:03.000000000 +0200
 @@ -60,6 +60,10 @@
  ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
  ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC);
@@ -151,8 +151,8 @@ Index: pkg-php/Zend/zend.c
  	STD_ZEND_INI_BOOLEAN("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled,      gc_enabled,     zend_gc_globals,        gc_globals)
 Index: pkg-php/Zend/zend.h
 ===================================================================
---- pkg-php.orig/Zend/zend.h	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend.h	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend.h	2009-08-25 15:44:03.000000000 +0200
 @@ -645,6 +645,9 @@
  extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
  extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -180,8 +180,8 @@ Index: pkg-php/Zend/zend.h
  /*
 Index: pkg-php/Zend/zend_alloc.c
 ===================================================================
---- pkg-php.orig/Zend/zend_alloc.c	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend_alloc.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_alloc.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_alloc.c	2009-08-25 15:44:03.000000000 +0200
 @@ -32,6 +32,10 @@
  # include <unistd.h>
  #endif
@@ -897,8 +897,8 @@ Index: pkg-php/Zend/zend_alloc.c
   * Local variables:
 Index: pkg-php/Zend/zend_alloc.h
 ===================================================================
---- pkg-php.orig/Zend/zend_alloc.h	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend_alloc.h	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_alloc.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_alloc.h	2009-08-25 15:44:03.000000000 +0200
 @@ -189,6 +189,8 @@
  
  /* Heap functions */
@@ -911,7 +911,7 @@ Index: pkg-php/Zend/zend_alloc.h
 Index: pkg-php/Zend/zend_alloc_canary.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/Zend/zend_alloc_canary.c	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/Zend/zend_alloc_canary.c	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,2441 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -3357,7 +3357,7 @@ Index: pkg-php/Zend/zend_alloc_canary.c
 Index: pkg-php/Zend/zend_canary.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/Zend/zend_canary.c	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/Zend/zend_canary.c	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,64 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -3425,8 +3425,8 @@ Index: pkg-php/Zend/zend_canary.c
 + */
 Index: pkg-php/Zend/zend_compile.c
 ===================================================================
---- pkg-php.orig/Zend/zend_compile.c	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend_compile.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_compile.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_compile.c	2009-08-25 15:44:03.000000000 +0200
 @@ -69,6 +69,11 @@
  	free(property_info->name);
  }
@@ -3441,8 +3441,8 @@ Index: pkg-php/Zend/zend_compile.c
  	char char_pos_buf[32];
 Index: pkg-php/Zend/zend_compile.h
 ===================================================================
---- pkg-php.orig/Zend/zend_compile.h	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend_compile.h	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_compile.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_compile.h	2009-08-25 15:44:03.000000000 +0200
 @@ -606,6 +606,11 @@
  ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC);
  ZEND_API size_t zend_dirname(char *path, size_t len);
@@ -3457,8 +3457,8 @@ Index: pkg-php/Zend/zend_compile.h
  /* BEGIN: OPCODES */
 Index: pkg-php/Zend/zend_constants.c
 ===================================================================
---- pkg-php.orig/Zend/zend_constants.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend_constants.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_constants.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_constants.c	2009-08-25 15:44:03.000000000 +0200
 @@ -113,6 +113,76 @@
  
  	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
@@ -3538,8 +3538,8 @@ Index: pkg-php/Zend/zend_constants.c
  		zend_constant c;
 Index: pkg-php/Zend/zend_errors.h
 ===================================================================
---- pkg-php.orig/Zend/zend_errors.h	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend_errors.h	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_errors.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_errors.h	2009-08-25 15:44:03.000000000 +0200
 @@ -41,6 +41,20 @@
  #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED)
  #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
@@ -3563,8 +3563,8 @@ Index: pkg-php/Zend/zend_errors.h
  /*
 Index: pkg-php/Zend/zend_hash.c
 ===================================================================
---- pkg-php.orig/Zend/zend_hash.c	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend_hash.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_hash.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_hash.c	2009-08-25 15:44:03.000000000 +0200
 @@ -20,6 +20,7 @@
  /* $Id: zend_hash.c,v 1.121.2.4.2.8.2.9 2009/06/07 19:28:15 mattwil Exp $ */
  
@@ -3831,8 +3831,8 @@ Index: pkg-php/Zend/zend_hash.c
  	}
 Index: pkg-php/Zend/zend_llist.c
 ===================================================================
---- pkg-php.orig/Zend/zend_llist.c	2009-08-25 15:11:47.000000000 +0200
-+++ pkg-php/Zend/zend_llist.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_llist.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_llist.c	2009-08-25 15:44:03.000000000 +0200
 @@ -23,6 +23,186 @@
  #include "zend_llist.h"
  #include "zend_qsort.h"
@@ -4054,8 +4054,8 @@ Index: pkg-php/Zend/zend_llist.c
  			old_tail->prev->next = NULL;
 Index: pkg-php/Zend/zend_operators.c
 ===================================================================
---- pkg-php.orig/Zend/zend_operators.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend_operators.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_operators.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_operators.c	2009-08-25 15:44:03.000000000 +0200
 @@ -152,9 +152,14 @@
  		case IS_STRING:
  			{
@@ -4145,8 +4145,8 @@ Index: pkg-php/Zend/zend_operators.c
  			ALLOC_HASHTABLE(Z_ARRVAL_P(op));
 Index: pkg-php/Zend/zend_variables.c
 ===================================================================
---- pkg-php.orig/Zend/zend_variables.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/Zend/zend_variables.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/Zend/zend_variables.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/Zend/zend_variables.c	2009-08-25 15:44:03.000000000 +0200
 @@ -34,6 +34,9 @@
  		case IS_CONSTANT:
  			CHECK_ZVAL_STRING_REL(zvalue);
@@ -4169,15 +4169,15 @@ Index: pkg-php/Zend/zend_variables.c
  		case IS_CONSTANT_ARRAY:
 Index: pkg-php/configure.in
 ===================================================================
---- pkg-php.orig/configure.in	2009-08-25 15:13:09.000000000 +0200
-+++ pkg-php/configure.in	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/configure.in	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/configure.in	2009-08-25 15:44:03.000000000 +0200
 @@ -307,6 +307,7 @@
  sinclude(TSRM/threads.m4)
  sinclude(TSRM/tsrm.m4)
  
 +sinclude(main/suhosin_patch.m4)
  
- divert(2)
+ dnl divert(2)
  
 @@ -1422,7 +1423,7 @@
         php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
@@ -4199,8 +4199,8 @@ Index: pkg-php/configure.in
    PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
 Index: pkg-php/ext/standard/dl.c
 ===================================================================
---- pkg-php.orig/ext/standard/dl.c	2009-08-25 15:13:09.000000000 +0200
-+++ pkg-php/ext/standard/dl.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/ext/standard/dl.c	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/ext/standard/dl.c	2009-08-25 15:44:03.000000000 +0200
 @@ -239,6 +239,23 @@
  			return FAILURE;
  		}
@@ -4227,8 +4227,8 @@ Index: pkg-php/ext/standard/dl.c
  /* }}} */
 Index: pkg-php/ext/standard/info.c
 ===================================================================
---- pkg-php.orig/ext/standard/info.c	2009-08-25 15:13:09.000000000 +0200
-+++ pkg-php/ext/standard/info.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/ext/standard/info.c	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/ext/standard/info.c	2009-08-25 15:44:03.000000000 +0200
 @@ -842,6 +842,33 @@
  		
  		php_info_print_table_end();
@@ -4265,8 +4265,8 @@ Index: pkg-php/ext/standard/info.c
  		if (expose_php && !sapi_module.phpinfo_as_text) {
 Index: pkg-php/ext/standard/syslog.c
 ===================================================================
---- pkg-php.orig/ext/standard/syslog.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/ext/standard/syslog.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/ext/standard/syslog.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/standard/syslog.c	2009-08-25 15:44:03.000000000 +0200
 @@ -42,6 +42,7 @@
   */
  PHP_MINIT_FUNCTION(syslog)
@@ -4285,8 +4285,8 @@ Index: pkg-php/ext/standard/syslog.c
  	return SUCCESS;
 Index: pkg-php/main/fopen_wrappers.c
 ===================================================================
---- pkg-php.orig/main/fopen_wrappers.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/fopen_wrappers.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/fopen_wrappers.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/fopen_wrappers.c	2009-08-25 15:44:03.000000000 +0200
 @@ -85,15 +85,10 @@
  PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
  {
@@ -4307,8 +4307,8 @@ Index: pkg-php/main/fopen_wrappers.c
  		return SUCCESS;
 Index: pkg-php/main/main.c
 ===================================================================
---- pkg-php.orig/main/main.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/main.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/main.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/main.c	2009-08-25 15:44:03.000000000 +0200
 @@ -90,6 +90,9 @@
  
  #include "SAPI.h"
@@ -4365,8 +4365,8 @@ Index: pkg-php/main/main.c
  
 Index: pkg-php/main/php.h
 ===================================================================
---- pkg-php.orig/main/php.h	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/php.h	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/php.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/php.h	2009-08-25 15:44:03.000000000 +0200
 @@ -450,6 +450,10 @@
  #endif
  #endif /* !XtOffsetOf */
@@ -4380,8 +4380,8 @@ Index: pkg-php/main/php.h
  /*
 Index: pkg-php/main/php_config.h.in
 ===================================================================
---- pkg-php.orig/main/php_config.h.in	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/php_config.h.in	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/php_config.h.in	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/php_config.h.in	2009-08-25 15:44:03.000000000 +0200
 @@ -836,6 +836,9 @@
  /* Define if the target system has /dev/urandom device */
  #undef HAVE_DEV_URANDOM
@@ -4394,8 +4394,8 @@ Index: pkg-php/main/php_config.h.in
  
 Index: pkg-php/main/php_logos.c
 ===================================================================
---- pkg-php.orig/main/php_logos.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/php_logos.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/php_logos.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/php_logos.c	2009-08-25 15:44:03.000000000 +0200
 @@ -50,6 +50,10 @@
  	return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
  }
@@ -4420,8 +4420,8 @@ Index: pkg-php/main/php_logos.c
  
 Index: pkg-php/main/snprintf.c
 ===================================================================
---- pkg-php.orig/main/snprintf.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/snprintf.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/snprintf.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/snprintf.c	2009-08-25 15:44:03.000000000 +0200
 @@ -1091,7 +1091,11 @@
  
  
@@ -4436,8 +4436,8 @@ Index: pkg-php/main/snprintf.c
  					/*
 Index: pkg-php/main/spprintf.c
 ===================================================================
---- pkg-php.orig/main/spprintf.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/main/spprintf.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/main/spprintf.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/main/spprintf.c	2009-08-25 15:44:03.000000000 +0200
 @@ -698,7 +698,11 @@
  
  
@@ -4453,7 +4453,7 @@ Index: pkg-php/main/spprintf.c
 Index: pkg-php/main/suhosin_globals.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/main/suhosin_globals.h	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/main/suhosin_globals.h	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,61 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -4519,7 +4519,7 @@ Index: pkg-php/main/suhosin_globals.h
 Index: pkg-php/main/suhosin_logo.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/main/suhosin_logo.h	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/main/suhosin_logo.h	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,178 @@
 +static unsigned char suhosin_logo[] =
 +	"\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
@@ -4702,7 +4702,7 @@ Index: pkg-php/main/suhosin_logo.h
 Index: pkg-php/main/suhosin_patch.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/main/suhosin_patch.c	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/main/suhosin_patch.c	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,455 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -5162,7 +5162,7 @@ Index: pkg-php/main/suhosin_patch.c
 Index: pkg-php/main/suhosin_patch.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/main/suhosin_patch.h	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/main/suhosin_patch.h	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,61 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -5228,7 +5228,7 @@ Index: pkg-php/main/suhosin_patch.h
 Index: pkg-php/main/suhosin_patch.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pkg-php/main/suhosin_patch.m4	2009-08-25 15:13:09.000000000 +0200
++++ pkg-php/main/suhosin_patch.m4	2009-08-25 15:44:03.000000000 +0200
 @@ -0,0 +1,8 @@
 +dnl
 +dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
@@ -5240,8 +5240,8 @@ Index: pkg-php/main/suhosin_patch.m4
 +
 Index: pkg-php/sapi/apache/mod_php5.c
 ===================================================================
---- pkg-php.orig/sapi/apache/mod_php5.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/apache/mod_php5.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/apache/mod_php5.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/apache/mod_php5.c	2009-08-25 15:44:03.000000000 +0200
 @@ -967,7 +967,11 @@
  	{
  		TSRMLS_FETCH();
@@ -5256,8 +5256,8 @@ Index: pkg-php/sapi/apache/mod_php5.c
  #endif
 Index: pkg-php/sapi/apache2filter/sapi_apache2.c
 ===================================================================
---- pkg-php.orig/sapi/apache2filter/sapi_apache2.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/apache2filter/sapi_apache2.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/apache2filter/sapi_apache2.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/apache2filter/sapi_apache2.c	2009-08-25 15:44:03.000000000 +0200
 @@ -581,7 +581,11 @@
  {
  	TSRMLS_FETCH();
@@ -5272,8 +5272,8 @@ Index: pkg-php/sapi/apache2filter/sapi_apache2.c
  
 Index: pkg-php/sapi/apache2handler/sapi_apache2.c
 ===================================================================
---- pkg-php.orig/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:13:09.000000000 +0200
-+++ pkg-php/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:44:03.000000000 +0200
++++ pkg-php/sapi/apache2handler/sapi_apache2.c	2009-08-25 15:44:03.000000000 +0200
 @@ -386,7 +386,11 @@
  {
  	TSRMLS_FETCH();
@@ -5288,8 +5288,8 @@ Index: pkg-php/sapi/apache2handler/sapi_apache2.c
  
 Index: pkg-php/sapi/apache_hooks/mod_php5.c
 ===================================================================
---- pkg-php.orig/sapi/apache_hooks/mod_php5.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/apache_hooks/mod_php5.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/apache_hooks/mod_php5.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/apache_hooks/mod_php5.c	2009-08-25 15:44:03.000000000 +0200
 @@ -1256,7 +1256,11 @@
  	{
  		TSRMLS_FETCH();
@@ -5304,8 +5304,8 @@ Index: pkg-php/sapi/apache_hooks/mod_php5.c
  #endif
 Index: pkg-php/sapi/cgi/cgi_main.c
 ===================================================================
---- pkg-php.orig/sapi/cgi/cgi_main.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/cgi/cgi_main.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/cgi/cgi_main.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/cgi/cgi_main.c	2009-08-25 15:44:03.000000000 +0200
 @@ -1907,11 +1907,19 @@
  								SG(headers_sent) = 1;
  								SG(request_info).no_headers = 1;
@@ -5328,8 +5328,8 @@ Index: pkg-php/sapi/cgi/cgi_main.c
  							goto out;
 Index: pkg-php/sapi/cli/php_cli.c
 ===================================================================
---- pkg-php.orig/sapi/cli/php_cli.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/cli/php_cli.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/cli/php_cli.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/cli/php_cli.c	2009-08-25 15:44:03.000000000 +0200
 @@ -827,7 +827,11 @@
  				}
  
@@ -5345,8 +5345,8 @@ Index: pkg-php/sapi/cli/php_cli.c
  					"(DEBUG GCOV)",
 Index: pkg-php/sapi/litespeed/lsapi_main.c
 ===================================================================
---- pkg-php.orig/sapi/litespeed/lsapi_main.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/litespeed/lsapi_main.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/litespeed/lsapi_main.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/litespeed/lsapi_main.c	2009-08-25 15:44:03.000000000 +0200
 @@ -545,11 +545,19 @@
  				break;
  			case 'v':
@@ -5369,8 +5369,8 @@ Index: pkg-php/sapi/litespeed/lsapi_main.c
  #else
 Index: pkg-php/sapi/milter/php_milter.c
 ===================================================================
---- pkg-php.orig/sapi/milter/php_milter.c	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/sapi/milter/php_milter.c	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/sapi/milter/php_milter.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/sapi/milter/php_milter.c	2009-08-25 15:44:03.000000000 +0200
 @@ -1102,7 +1102,11 @@
  				}
  				SG(headers_sent) = 1;
@@ -5385,8 +5385,8 @@ Index: pkg-php/sapi/milter/php_milter.c
  				break;
 Index: pkg-php/win32/build/config.w32
 ===================================================================
---- pkg-php.orig/win32/build/config.w32	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/win32/build/config.w32	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/win32/build/config.w32	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/win32/build/config.w32	2009-08-25 15:44:03.000000000 +0200
 @@ -322,7 +322,7 @@
  	zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
  	zend_object_handlers.c zend_objects_API.c \
@@ -5406,8 +5406,8 @@ Index: pkg-php/win32/build/config.w32
   * files that make up the snapshot template? */
 Index: pkg-php/win32/build/config.w32.h.in
 ===================================================================
---- pkg-php.orig/win32/build/config.w32.h.in	2009-08-25 15:11:46.000000000 +0200
-+++ pkg-php/win32/build/config.w32.h.in	2009-08-25 15:13:09.000000000 +0200
+--- pkg-php.orig/win32/build/config.w32.h.in	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/win32/build/config.w32.h.in	2009-08-25 15:44:03.000000000 +0200
 @@ -149,6 +149,9 @@
  /* Win32 supports strcoll */
  #define HAVE_STRCOLL 1
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index 2bbdb38..1c199fc 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -8,8 +8,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
---- php.orig/ext/date/lib/parse_tz.c
-+++ php/ext/date/lib/parse_tz.c
+Index: pkg-php/ext/date/lib/parse_tz.c
+===================================================================
+--- pkg-php.orig/ext/date/lib/parse_tz.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/date/lib/parse_tz.c	2009-08-25 15:44:03.000000000 +0200
 @@ -20,6 +20,16 @@
  
  #include "timelib.h"
@@ -38,7 +40,7 @@ r1: initial revision
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -253,6 +266,211 @@ void timelib_dump_tzinfo(timelib_tzinfo 
+@@ -253,6 +266,211 @@
  	}
  }
  
@@ -250,7 +252,7 @@ r1: initial revision
  static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
  {
  	int left = 0, right = tzdb->index_size - 1;
-@@ -328,6 +546,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+@@ -328,6 +546,7 @@
  
  	return tmp;
  }
@@ -258,8 +260,10 @@ r1: initial revision
  
  static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
  {
---- php.orig/ext/date/lib/timelib.h
-+++ php/ext/date/lib/timelib.h
+Index: pkg-php/ext/date/lib/timelib.h
+===================================================================
+--- pkg-php.orig/ext/date/lib/timelib.h	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/date/lib/timelib.h	2009-08-25 15:44:03.000000000 +0200
 @@ -34,6 +34,10 @@
  #define TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH      0x02
  #define TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH 0x03
@@ -271,9 +275,11 @@ r1: initial revision
  #ifndef LONG_MAX
  #define LONG_MAX 2147483647L
  #endif
---- php.orig/ext/date/lib/timelib.m4
-+++ php/ext/date/lib/timelib.m4
-@@ -78,3 +78,17 @@ stdlib.h
+Index: pkg-php/ext/date/lib/timelib.m4
+===================================================================
+--- pkg-php.orig/ext/date/lib/timelib.m4	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/date/lib/timelib.m4	2009-08-25 15:44:03.000000000 +0200
+@@ -78,3 +78,17 @@
  
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll strftime)
@@ -291,9 +297,11 @@ r1: initial revision
 +   fi
 +fi
 +
---- php.orig/ext/date/php_date.c
-+++ php/ext/date/php_date.c
-@@ -852,6 +852,11 @@ static char* guess_timezone(const timeli
+Index: pkg-php/ext/date/php_date.c
+===================================================================
+--- pkg-php.orig/ext/date/php_date.c	2009-08-25 15:43:40.000000000 +0200
++++ pkg-php/ext/date/php_date.c	2009-08-25 15:44:03.000000000 +0200
+@@ -852,6 +852,11 @@
  	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
  		return DATEG(default_timezone);
  	}
-- 
1.5.6.5

More information about the Pkg-php-commits mailing list