[Pkg-php-commits] [php/debian-sid] quilt refresh 31 files in debian/patches

Sean Finney seanius at debian.org
Sun Feb 7 23:17:14 UTC 2010 

---
 debian/patches/001-libtool_fixes.patch         |   10 +-
 debian/patches/002-static_openssl.patch        |    4 +-
 debian/patches/004-ldap_fix.patch              |    8 +-
 debian/patches/006-debian_quirks.patch         |   48 ++--
 debian/patches/013-force_getaddrinfo.patch     |    6 +-
 debian/patches/017-pread_pwrite_disable.patch  |    4 +-
 debian/patches/019-z_off_t_as_long.patch       |    4 +-
 debian/patches/029-php.ini_paranoid.patch      |    2 +-
 debian/patches/033-we_WANT_libtool.patch       |    4 +-
 debian/patches/034-apache2_umask_fix.patch     |   10 +-
 debian/patches/036-fd_setsize_fix.patch        |   12 +-
 debian/patches/043-recode_size_t.patch         |    6 +-
 debian/patches/044-strtod_arm_fix.patch        |    4 +-
 debian/patches/045-exif_nesting_level.patch    |    6 +-
 debian/patches/047-zts_with_dl.patch           |    4 +-
 debian/patches/052-phpinfo_no_configure.patch  |   16 +-
 debian/patches/053-extension_api.patch         |   12 +-
 debian/patches/057-no_apache_installed.patch   |   16 +-
 debian/patches/100-recode_is_shared.patch      |    8 +-
 debian/patches/101-sqlite_is_shared.patch      |    4 +-
 debian/patches/108-64_bit_datetime.patch       |    6 +-
 debian/patches/112-proc_open.patch             |    4 +-
 debian/patches/113-php.ini_securitynotes.patch |    6 +-
 debian/patches/bad_whatis_entries.patch        |   12 +-
 debian/patches/fix_broken_upstream_tests.patch |    8 +-
 debian/patches/force_libmysqlclient_r.patch    |   14 +-
 debian/patches/libdb_is_-ldb                   |    4 +-
 debian/patches/libedit_is_editline.patch       |    8 +-
 debian/patches/manpage_spelling.patch          |    4 +-
 debian/patches/suhosin.patch                   |  291 ++++++++++++------------
 debian/patches/use_embedded_timezonedb.patch   |   28 ++--
 31 files changed, 284 insertions(+), 289 deletions(-)

diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index 234d24a..38f83c7 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/TSRM/configure.in
-+++ php5-5.2.9.dfsg.1/TSRM/configure.in
+--- php.orig/TSRM/configure.in
++++ php/TSRM/configure.in
 @@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
  TSRM_THREADS_CHECKS
  	
@@ -10,9 +10,9 @@
  
  dnl TSRM_PTHREAD
  
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -1314,9 +1314,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+--- php.orig/configure.in
++++ php/configure.in
+@@ -1362,9 +1362,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
  ])
  AC_PROG_LIBTOOL
  
diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 77829ce..5b21dae 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/acinclude.m4
-+++ php5-5.2.9.dfsg.1/acinclude.m4
+--- php.orig/acinclude.m4
++++ php/acinclude.m4
 @@ -2370,9 +2370,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
  
      PHP_ADD_INCLUDE($OPENSSL_INCDIR)
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index 28bd72f..c5d5714 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/ldap/ldap.c
-+++ php5-5.2.9.dfsg.1/ext/ldap/ldap.c
-@@ -1334,7 +1334,7 @@ PHP_FUNCTION(ldap_explode_dn)
+--- php.orig/ext/ldap/ldap.c
++++ php/ext/ldap/ldap.c
+@@ -1236,7 +1236,7 @@ PHP_FUNCTION(ldap_explode_dn)
  	}
  
  	i=0;
@@ -9,7 +9,7 @@
  	count = i;
  
  	array_init(return_value);
-@@ -1344,7 +1344,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1246,7 +1246,8 @@ PHP_FUNCTION(ldap_explode_dn)
  		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 8f27b77..05c4823 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -977,7 +977,7 @@ if test "$PHP_CLI" = "no"; then
+--- php.orig/configure.in
++++ php/configure.in
+@@ -1029,7 +1029,7 @@ if test "$PHP_CLI" = "no"; then
  fi
  
  PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -9,7 +9,7 @@
    --without-pear          Do not install PEAR], DEFAULT, yes)
  
  if test "$PHP_PEAR" != "no"; then
-@@ -1011,7 +1011,7 @@ dnl
+@@ -1059,7 +1059,7 @@ dnl
    if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
      case $PHP_LAYOUT in
        GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -18,7 +18,7 @@
      esac
    fi
  
-@@ -1066,12 +1066,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1114,12 +1114,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -33,7 +33,7 @@
      ;;
  esac
  
-@@ -1136,7 +1136,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1184,7 +1184,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
  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,8 +42,8 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
---- php5-5.2.9.dfsg.1.orig/ext/ext_skel
-+++ php5-5.2.9.dfsg.1/ext/ext_skel
+--- php.orig/ext/ext_skel
++++ php/ext/ext_skel
 @@ -70,7 +70,7 @@ if test -d "$extname" ; then
  fi
  
@@ -53,9 +53,9 @@
  fi
  
  ## convert skel_dir to full path
---- php5-5.2.9.dfsg.1.orig/php.ini-development
-+++ php5-5.2.9.dfsg.1/php.ini-development
-@@ -471,7 +471,7 @@ default_mimetype = "text/html"
+--- php.orig/php.ini-development
++++ php/php.ini-development
+@@ -779,7 +779,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -64,9 +64,9 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
---- php5-5.2.9.dfsg.1.orig/php.ini-production
-+++ php5-5.2.9.dfsg.1/php.ini-production
-@@ -522,7 +522,7 @@ default_mimetype = "text/html"
+--- php.orig/php.ini-production
++++ php/php.ini-production
+@@ -779,7 +779,7 @@ default_mimetype = "text/html"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -137,8 +137,8 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
---- php5-5.2.9.dfsg.1.orig/sapi/caudium/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/caudium/config.m4
+--- php.orig/sapi/caudium/config.m4
++++ php/sapi/caudium/config.m4
 @@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then
      AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/])
    fi
@@ -161,8 +161,8 @@
    RESULT="  *** Pike binary used:         $PIKE
    *** Pike include dir(s) used: $PIKE_INCLUDE_DIR
    *** Pike version:             $PIKE_VERSION"
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
-+++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
+--- php.orig/sapi/cli/php.1.in
++++ php/sapi/cli/php.1.in
 @@ -306,13 +306,14 @@ Shows configuration for extension
  .B name
  .SH FILES
@@ -183,8 +183,8 @@
  .SH EXAMPLES
  .TP 5
  \fIphp -r 'echo "Hello World\\n";'\fP
---- php5-5.2.9.dfsg.1.orig/scripts/Makefile.frag
-+++ php5-5.2.9.dfsg.1/scripts/Makefile.frag
+--- php.orig/scripts/Makefile.frag
++++ php/scripts/Makefile.frag
 @@ -3,8 +3,8 @@
  # Build environment install
  #
@@ -196,8 +196,8 @@
  
  BUILD_FILES = \
  	scripts/phpize.m4 \
---- php5-5.2.9.dfsg.1.orig/scripts/php-config.in
-+++ php5-5.2.9.dfsg.1/scripts/php-config.in
+--- php.orig/scripts/php-config.in
++++ php/scripts/php-config.in
 @@ -5,8 +5,8 @@ prefix="@prefix@"
  exec_prefix="@exec_prefix@"
  version="@PHP_VERSION@"
@@ -209,8 +209,8 @@
  ldflags="@PHP_LDFLAGS@"
  libs="@EXTRA_LIBS@"
  extension_dir='@EXTENSION_DIR@'
---- php5-5.2.9.dfsg.1.orig/scripts/phpize.in
-+++ php5-5.2.9.dfsg.1/scripts/phpize.in
+--- php.orig/scripts/phpize.in
++++ php/scripts/phpize.in
 @@ -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 534cd6b..408f1d4 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -596,50 +596,50 @@ vsnprintf \
+--- php.orig/configure.in
++++ php/configure.in
+@@ -639,50 +639,50 @@ asprintf \
  
  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 b07f11e..757c676 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/acinclude.m4
-+++ php5-5.2.9.dfsg.1/acinclude.m4
+--- php.orig/acinclude.m4
++++ php/acinclude.m4
 @@ -1216,7 +1216,7 @@ $1
      }
  
diff --git a/debian/patches/019-z_off_t_as_long.patch b/debian/patches/019-z_off_t_as_long.patch
index 0697a8a..5980221 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/ext/zlib/zconf.h
++++ php/ext/zlib/zconf.h
 @@ -0,0 +1,326 @@
 +/* zconf.h -- configuration of the zlib compression library
 + * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -328,7 +328,7 @@
 +
 +#endif /* ZCONF_H */
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/ext/zlib/zlib.h
++++ php/ext/zlib/zlib.h
 @@ -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 4f3ca89..157d190 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/php.ini-paranoid
++++ php/php.ini-paranoid
 @@ -0,0 +1,1504 @@
 +[PHP]
 +
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index 70b7922..63dcbe3 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/build/build2.mk
-+++ php5-5.2.9.dfsg.1/build/build2.mk
+--- php.orig/build/build2.mk
++++ php/build/build2.mk
 @@ -52,6 +52,15 @@ $(TOUCH_FILES):
  
  aclocal.m4: configure.in acinclude.m4
diff --git a/debian/patches/034-apache2_umask_fix.patch b/debian/patches/034-apache2_umask_fix.patch
index 212aec0..4a3bf34 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,9 +1,9 @@
 
 Save and restore umask across requests correctly.
 
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
-@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
+--- 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
  	return APR_SUCCESS;
  }
  
@@ -23,7 +23,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;
-@@ -623,6 +636,8 @@ zend_first_try {
+@@ -639,6 +652,8 @@ zend_first_try {
  	} else {
  		zend_file_handle zfd;
  
@@ -32,7 +32,7 @@ Save and restore umask across requests correctly.
  		zfd.type = ZEND_HANDLE_FILENAME;
  		zfd.filename = (char *) r->filename;
  		zfd.free_filename = 0;
-@@ -634,6 +649,9 @@ zend_first_try {
+@@ -650,6 +665,9 @@ zend_first_try {
  			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 41be315..aa13ee9 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/sockets/sockets.c
-+++ php5-5.2.9.dfsg.1/ext/sockets/sockets.c
-@@ -569,6 +569,7 @@ static int php_sock_array_to_fd_set(zval
+--- php.orig/ext/sockets/sockets.c
++++ php/ext/sockets/sockets.c
+@@ -705,6 +705,7 @@ static int php_sock_array_to_fd_set(zval
  
  		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 +8,9 @@
  
  		PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
  		if (php_sock->bsd_socket > *max_fd) {
---- php5-5.2.9.dfsg.1.orig/ext/standard/streamsfuncs.c
-+++ php5-5.2.9.dfsg.1/ext/standard/streamsfuncs.c
-@@ -596,6 +596,9 @@ static int stream_array_to_fd_set(zval *
+--- php.orig/ext/standard/streamsfuncs.c
++++ php/ext/standard/streamsfuncs.c
+@@ -605,6 +605,9 @@ static int stream_array_to_fd_set(zval *
  		 * 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 2268202..d443cd0 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/recode/recode.c
-+++ php5-5.2.9.dfsg.1/ext/recode/recode.c
-@@ -136,7 +136,7 @@ PHP_FUNCTION(recode_string)
+--- php.orig/ext/recode/recode.c
++++ php/ext/recode/recode.c
+@@ -149,7 +149,7 @@ PHP_FUNCTION(recode_string)
  	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 0753f0d..ea3fe35 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/Zend/zend_strtod.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_strtod.c
+--- php.orig/Zend/zend_strtod.c
++++ php/Zend/zend_strtod.c
 @@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
  #define IEEE_LITTLE_ENDIAN
  #endif
diff --git a/debian/patches/045-exif_nesting_level.patch b/debian/patches/045-exif_nesting_level.patch
index a074ce2..1910d42 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/exif/exif.c
-+++ php5-5.2.9.dfsg.1/ext/exif/exif.c
+--- php.orig/ext/exif/exif.c
++++ php/ext/exif/exif.c
 @@ -99,7 +99,7 @@ typedef unsigned char uchar;
  
  #define EFREE_IF(ptr)	if (ptr) efree(ptr)
@@ -8,4 +8,4 @@
 +#define MAX_IFD_NESTING_LEVEL 250
  
  /* {{{ arginfo */
- static
+ ZEND_BEGIN_ARG_INFO(arginfo_exif_tagname, 0)
diff --git a/debian/patches/047-zts_with_dl.patch b/debian/patches/047-zts_with_dl.patch
index 7717039..e040e03 100644
--- a/debian/patches/047-zts_with_dl.patch
+++ b/debian/patches/047-zts_with_dl.patch
@@ -1,5 +1,5 @@
---- a/ext/standard/dl.c
-+++ b/ext/standard/dl.c
+--- php.orig/ext/standard/dl.c
++++ php/ext/standard/dl.c
 @@ -77,12 +77,7 @@ PHPAPI PHP_FUNCTION(dl)
  		(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 290c359..c806c27 100644
--- a/debian/patches/052-phpinfo_no_configure.patch
+++ b/debian/patches/052-phpinfo_no_configure.patch
@@ -1,8 +1,6 @@
-Index: php5/ext/standard/info.c
-===================================================================
---- php5.orig/ext/standard/info.c	2009-03-25 22:14:29.000000000 -0400
-+++ php5/ext/standard/info.c	2009-03-25 22:18:15.000000000 -0400
-@@ -668,7 +668,7 @@
+--- php.orig/ext/standard/info.c
++++ php/ext/standard/info.c
+@@ -668,7 +668,7 @@ PHPAPI void php_print_info(int flag TSRM
  #ifdef ARCHITECTURE
  		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
  #endif
@@ -11,11 +9,9 @@ Index: php5/ext/standard/info.c
  		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
  #endif
  
-Index: php5/ext/standard/tests/general_functions/phpinfo.phpt
-===================================================================
---- php5.orig/ext/standard/tests/general_functions/phpinfo.phpt	2009-03-25 22:15:07.000000000 -0400
-+++ php5/ext/standard/tests/general_functions/phpinfo.phpt	2009-03-25 22:17:58.000000000 -0400
-@@ -20,7 +20,6 @@
+--- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php/ext/standard/tests/general_functions/phpinfo.phpt
+@@ -20,7 +20,6 @@ PHP Version => %s
  
  System => %s
  Build Date => %s%a
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index 00499e9..ac73fae 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -1090,8 +1090,13 @@ dnl Build extension directory path
+--- php.orig/configure.in
++++ php/configure.in
+@@ -1138,8 +1138,13 @@ dnl Build extension directory path
  
  ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
  
@@ -15,7 +15,7 @@
    if test "$oldstyleextdir" = "yes"; then
      if test "$PHP_DEBUG" = "1"; then
        part1=debug
-@@ -1236,6 +1241,7 @@ PHP_SUBST(CXX)
+@@ -1284,6 +1289,7 @@ PHP_SUBST(CXX)
  PHP_SUBST(CXXFLAGS)
  PHP_SUBST(CXXFLAGS_CLEAN)
  PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -23,8 +23,8 @@
  PHP_SUBST_OLD(EXTENSION_DIR)
  PHP_SUBST_OLD(EXTRA_LDFLAGS)
  PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
---- php5-5.2.9.dfsg.1.orig/scripts/php-config.in
-+++ php5-5.2.9.dfsg.1/scripts/php-config.in
+--- php.orig/scripts/php-config.in
++++ php/scripts/php-config.in
 @@ -17,6 +17,7 @@ php_cli_binary=NONE
  php_cgi_binary=NONE
  configure_options="@CONFIGURE_OPTIONS@"
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 0e00d5a..3e48664 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/config.m4
+--- php.orig/sapi/apache2handler/config.m4
++++ php/sapi/apache2handler/config.m4
 @@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -21,8 +21,8 @@
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- php5-5.2.9.dfsg.1.orig/sapi/apache/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache/config.m4
+--- php.orig/sapi/apache/config.m4
++++ php/sapi/apache/config.m4
 @@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -40,8 +40,8 @@
  
    for flag in $APXS_CFLAGS; do
      case $flag in
---- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache2filter/config.m4
+--- php.orig/sapi/apache2filter/config.m4
++++ php/sapi/apache2filter/config.m4
 @@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -63,8 +63,8 @@
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- php5-5.2.9.dfsg.1.orig/sapi/apache_hooks/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache_hooks/config.m4
+--- php.orig/sapi/apache_hooks/config.m4
++++ php/sapi/apache_hooks/config.m4
 @@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
    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 6ca9d08..4a3340d 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -1,7 +1,7 @@
---- php5-5.2.9.dfsg.1.orig/ext/recode/config9.m4
-+++ php5-5.2.9.dfsg.1/ext/recode/config9.m4
-@@ -8,6 +8,6 @@ if test "$PHP_RECODE" != "no"; then
-   test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
+--- php.orig/ext/recode/config9.m4
++++ php/ext/recode/config9.m4
+@@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
+   fi
  
    if test -n "$recode_conflict"; then
 -    AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
diff --git a/debian/patches/101-sqlite_is_shared.patch b/debian/patches/101-sqlite_is_shared.patch
index 6af4d29..9035218 100644
--- a/debian/patches/101-sqlite_is_shared.patch
+++ b/debian/patches/101-sqlite_is_shared.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/sqlite/config.m4
-+++ php5-5.2.9.dfsg.1/ext/sqlite/config.m4
+--- php.orig/ext/sqlite/config.m4
++++ php/ext/sqlite/config.m4
 @@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
      ])
      SQLITE_MODULE_TYPE=external
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index 59f38d1..38bfd07 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -1,8 +1,8 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/datetime.c
-+++ php5-5.2.9.dfsg.1/ext/standard/datetime.c
+--- php.orig/ext/standard/datetime.c
++++ php/ext/standard/datetime.c
 @@ -20,6 +20,9 @@
  
- /* $Id: datetime.c,v 1.134.2.2.2.6 2008/12/31 11:17:44 sebastian Exp $ */
+ /* $Id: datetime.c,v 1.134.2.2.2.4.2.3 2008/12/31 11:15:44 sebastian Exp $ */
  
 +#define _XOPEN_SOURCE	/* needed to get strptime() declared */
 +#define _BSD_SOURCE		/* needed to get ulong declared */
diff --git a/debian/patches/112-proc_open.patch b/debian/patches/112-proc_open.patch
index 999c05b..bcbe70e 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/proc_open.c
-+++ php5-5.2.9.dfsg.1/ext/standard/proc_open.c
+--- php.orig/ext/standard/proc_open.c
++++ php/ext/standard/proc_open.c
 @@ -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 19746f2..a5f841a 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -1,5 +1,5 @@
---- a/php.ini-development
-+++ b/php.ini-development
+--- php.orig/php.ini-development
++++ php/php.ini-development
 @@ -333,6 +333,11 @@ allow_call_time_pass_reference = Off
  
  ; Safe Mode
@@ -12,7 +12,7 @@
  safe_mode = Off
  
  ; By default, Safe Mode does a UID compare check when
-@@ -374,6 +379,12 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH
+@@ -374,6 +379,12 @@ safe_mode_protected_env_vars = LD_LIBRAR
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://www.php.net/manual/en/ini.sect.safe-mode.php#ini.open-basedir
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index d05f281..d651e01 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
-+++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
+--- php.orig/sapi/cli/php.1.in
++++ php/sapi/cli/php.1.in
 @@ -1,6 +1,5 @@
  .TH PHP 1 "2008" "The PHP Group" "Scripting Language"
  .SH NAME
@@ -7,8 +7,8 @@
  php \- PHP Command Line Interface 'CLI'
  .SH SYNOPSIS
  .B php
---- php5-5.2.9.dfsg.1.orig/scripts/man1/php-config.1.in
-+++ php5-5.2.9.dfsg.1/scripts/man1/php-config.1.in
+--- php.orig/scripts/man1/php-config.1.in
++++ php/scripts/man1/php-config.1.in
 @@ -1,6 +1,5 @@
  .TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
  .SH NAME
@@ -16,8 +16,8 @@
  php\-config \- get information about PHP configuration and compile options
  .SH SYNOPSIS
  .B php\-config
---- php5-5.2.9.dfsg.1.orig/scripts/man1/phpize.1.in
-+++ php5-5.2.9.dfsg.1/scripts/man1/phpize.1.in
+--- php.orig/scripts/man1/phpize.1.in
++++ php/scripts/man1/phpize.1.in
 @@ -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 ef81f47..cdf4da1 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/soap/tests/server009.phpt
-+++ php5-5.2.9.dfsg.1/ext/soap/tests/server009.phpt
+--- php.orig/ext/soap/tests/server009.phpt
++++ php/ext/soap/tests/server009.phpt
 @@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
  		die('skip this test needs session extension');
  	}
@@ -11,8 +11,8 @@
  --FILE--
  <?php
  class foo {
---- php5-5.2.9.dfsg.1.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5-5.2.9.dfsg.1/ext/standard/tests/general_functions/phpinfo.phpt
+--- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php/ext/standard/tests/general_functions/phpinfo.phpt
 @@ -1,5 +1,7 @@
  --TEST--
  phpinfo()
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index 6029cb3..d67dd33 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/mysql/config.m4
-+++ php5-5.2.9.dfsg.1/ext/mysql/config.m4
-@@ -86,7 +86,7 @@ if test "$PHP_MYSQL" != "no"; then
+--- php.orig/ext/mysql/config.m4
++++ php/ext/mysql/config.m4
+@@ -90,7 +90,7 @@ elif test "$PHP_MYSQL" != "no"; then
  Note that the MySQL client library is not bundled anymore!])
    fi
  
@@ -9,8 +9,8 @@
      MYSQL_LIBNAME=mysqlclient_r
    else
      MYSQL_LIBNAME=mysqlclient
---- a/ext/mysqli/config.m4
-+++ b/ext/mysqli/config.m4
+--- php.orig/ext/mysqli/config.m4
++++ php/ext/mysqli/config.m4
 @@ -29,7 +29,7 @@ elif test "$PHP_MYSQLI" != "no"; then
      MYSQL_LIB_CFG='--libmysqld-libs'
      dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
@@ -20,8 +20,8 @@
      MYSQL_LIB_CFG='--libs_r'
      MYSQL_LIB_NAME='mysqlclient_r'
    else
---- a/ext/pdo_mysql/config.m4
-+++ b/ext/pdo_mysql/config.m4
+--- php.orig/ext/pdo_mysql/config.m4
++++ php/ext/pdo_mysql/config.m4
 @@ -68,7 +68,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
          AC_PATH_PROG(SED, sed)
        fi
diff --git a/debian/patches/libdb_is_-ldb b/debian/patches/libdb_is_-ldb
index efe6222..3001d86 100644
--- a/debian/patches/libdb_is_-ldb
+++ b/debian/patches/libdb_is_-ldb
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/dba/config.m4
-+++ php5-5.2.9.dfsg.1/ext/dba/config.m4
+--- php.orig/ext/dba/config.m4
++++ php/ext/dba/config.m4
 @@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
        break
      fi
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index bc6ec8d..f34c39b 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/readline/config.m4
-+++ php5-5.2.9.dfsg.1/ext/readline/config.m4
+--- php.orig/ext/readline/config.m4
++++ php/ext/readline/config.m4
 @@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
  elif test "$PHP_LIBEDIT" != "no"; then
  
@@ -9,8 +9,8 @@
    done
  
    if test -z "$LIBEDIT_DIR"; then
---- php5-5.2.9.dfsg.1.orig/ext/readline/readline.c
-+++ php5-5.2.9.dfsg.1/ext/readline/readline.c
+--- php.orig/ext/readline/readline.c
++++ php/ext/readline/readline.c
 @@ -33,8 +33,10 @@
  #define rl_completion_matches completion_matches
  #endif
diff --git a/debian/patches/manpage_spelling.patch b/debian/patches/manpage_spelling.patch
index bdcaf2d..0f69d17 100644
--- a/debian/patches/manpage_spelling.patch
+++ b/debian/patches/manpage_spelling.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
-+++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
+--- php.orig/sapi/cli/php.1.in
++++ php/sapi/cli/php.1.in
 @@ -69,7 +69,7 @@ specified by \-F to be executed.
  You can access the input line by \fB$argn\fP. While processing the input lines
  .B $argi 
diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index c56d8ee..8726927 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/TSRM/TSRM.h
-+++ php5-5.2.9.dfsg.1/TSRM/TSRM.h
-@@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
+--- php.orig/TSRM/TSRM.h
++++ php/TSRM/TSRM.h
+@@ -40,6 +40,13 @@ typedef long tsrm_intptr_t;
  typedef unsigned long tsrm_uintptr_t;
  #endif
  
@@ -14,7 +14,7 @@
  /* Only compile multi-threading functions if we're in ZTS mode */
  #ifdef ZTS
  
-@@ -93,6 +100,7 @@ typedef void (*ts_allocate_dtor)(void *,
+@@ -95,6 +102,7 @@ typedef void (*ts_allocate_dtor)(void *,
  
  #define THREAD_HASH_OF(thr,ts)  (unsigned long)thr%(unsigned long)ts
  
@@ -22,9 +22,9 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
---- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.c
-+++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.c
-@@ -273,6 +273,191 @@ static char *tsrm_strndup(const char *s,
+--- php.orig/TSRM/tsrm_virtual_cwd.c
++++ php/TSRM/tsrm_virtual_cwd.c
+@@ -279,6 +279,191 @@ static void cwd_globals_dtor(virtual_cwd
  }
  /* }}} */
  
@@ -216,9 +216,9 @@
  CWD_API void virtual_cwd_startup(void) /* {{{ */
  {
  	char cwd[MAXPATHLEN];
---- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.h
-+++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.h
-@@ -139,6 +139,22 @@ typedef struct _cwd_state {
+--- php.orig/TSRM/tsrm_virtual_cwd.h
++++ php/TSRM/tsrm_virtual_cwd.h
+@@ -141,6 +141,22 @@ typedef struct _cwd_state {
  
  typedef int (*verify_path_func)(const cwd_state *);
  
@@ -241,21 +241,20 @@
  CWD_API void virtual_cwd_startup(void);
  CWD_API void virtual_cwd_shutdown(void);
  CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
---- a/Zend/Makefile.am
-+++ b/Zend/Makefile.am
-@@ -16,8 +16,8 @@ libZend_la_SOURCES=\
- 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
+--- php.orig/Zend/Makefile.am
++++ php/Zend/Makefile.am
+@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
  	zend_objects_API.c zend_ts_hash.c zend_stream.c \
  	zend_default_classes.c \
-	zend_iterators.c zend_interfaces.c zend_exceptions.c \
+ 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
 -	zend_strtod.c zend_closures.c zend_float.c
 +	zend_strtod.c zend_closures.c zend_float.c zend_canary.c
  
  libZend_la_LDFLAGS =
  libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
---- a/Zend/zend.c
-+++ b/Zend/zend.c
-@@ -60,6 +60,9 @@ int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list a
+--- php.orig/Zend/zend.c
++++ php/Zend/zend.c
+@@ -60,6 +60,9 @@ int (*zend_vspprintf)(char **pbuf, size_
  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);
  
@@ -265,7 +264,7 @@
  void (*zend_on_timeout)(int seconds TSRMLS_DC);
  
  static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC);
-@@ -88,8 +91,88 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */
+@@ -88,8 +91,88 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /*
  }
  /* }}} */
  
@@ -354,9 +353,9 @@
  	STD_ZEND_INI_BOOLEAN("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled,      gc_enabled,     zend_gc_globals,        gc_globals)
  #ifdef ZEND_MULTIBYTE
   	STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
---- a/Zend/zend.h
-+++ b/Zend/zend.h
-@@ -634,6 +634,9 @@
+--- php.orig/Zend/zend.h
++++ php/Zend/zend.h
+@@ -634,6 +634,9 @@ extern ZEND_API int (*zend_stream_open_f
  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);
  extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC);
@@ -365,10 +364,10 @@
 +#endif
  
  ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-
-@@ -663,6 +666,13 @@
- #include "zend_operators.h"
- #include "zend_variables.h"
+ 
+@@ -773,6 +776,13 @@ ZEND_API void zend_save_error_handling(z
+ ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current TSRMLS_DC);
+ ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC);
  
 +#if SUHOSIN_PATCH
 +#include "suhosin_globals.h"
@@ -380,9 +379,9 @@
  #endif /* ZEND_H */
  
  /*
---- php5-5.2.9.dfsg.1.orig/Zend/zend_alloc.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_alloc.c
-@@ -311,13 +311,26 @@ static const zend_mm_mem_handlers mem_ha
+--- php.orig/Zend/zend_alloc.c
++++ php/Zend/zend_alloc.c
+@@ -319,13 +319,26 @@ static const zend_mm_mem_handlers mem_ha
  #define	MEM_BLOCK_GUARD  0x2A8FCC84
  #define	MEM_BLOCK_LEAK   0x6C5E8F2D
  
@@ -411,7 +410,7 @@
  } zend_mm_block_info;
  
  #if ZEND_DEBUG
-@@ -423,6 +436,9 @@ struct _zend_mm_heap {
+@@ -434,6 +447,9 @@ struct _zend_mm_heap {
  		int miss;
  	} cache_stat[ZEND_MM_NUM_BUCKETS+1];
  #endif
@@ -421,7 +420,7 @@
  };
  
  #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,15 +528,15 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -523,15 +539,15 @@ static unsigned int _zend_mm_cookie = 0;
  #define ZEND_MM_ALIGNED_SIZE(size)			((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
  #define ZEND_MM_ALIGNED_HEADER_SIZE			ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
  #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE	ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
@@ -440,7 +439,7 @@
  
  #define ZEND_MM_BUCKET_INDEX(true_size)		((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
  
-@@ -582,6 +598,48 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -593,6 +609,48 @@ static unsigned int _zend_mm_cookie = 0;
  
  #endif
  
@@ -489,7 +488,7 @@
  
  #if ZEND_MM_HEAP_PROTECTION
  
-@@ -790,6 +848,12 @@ static inline void zend_mm_remove_from_f
+@@ -801,6 +859,12 @@ static inline void zend_mm_remove_from_f
  	if (EXPECTED(prev == mm_block)) {
  		zend_mm_free_block **rp, **cp;
  
@@ -502,7 +501,7 @@
  #if ZEND_MM_SAFE_UNLINKING
  		if (UNEXPECTED(next != mm_block)) {
  			zend_mm_panic("zend_mm_heap corrupted");
-@@ -828,6 +892,12 @@ subst_block:
+@@ -839,6 +903,12 @@ subst_block:
  		}
  	} else {
  
@@ -515,7 +514,7 @@
  #if ZEND_MM_SAFE_UNLINKING
  		if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
  			zend_mm_panic("zend_mm_heap corrupted");
-@@ -875,6 +945,11 @@ static inline void zend_mm_init(zend_mm_
+@@ -886,6 +956,11 @@ static inline void zend_mm_init(zend_mm_
  		heap->large_free_buckets[i] = NULL;
  	}
  	heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
@@ -527,7 +526,7 @@
  }
  
  static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1779,6 +1854,11 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1785,6 +1860,11 @@ static void *_zend_mm_alloc_int(zend_mm_
  			best_fit = heap->cache[index];
  			heap->cache[index] = best_fit->prev_free_block;
  			heap->cached -= true_size;
@@ -539,7 +538,7 @@
  			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
  			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
  			return ZEND_MM_DATA_OF(best_fit);
-@@ -1918,6 +1998,12 @@ zend_mm_finished_searching_for_block:
+@@ -1924,6 +2004,12 @@ zend_mm_finished_searching_for_block:
  
  	ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
  
@@ -552,7 +551,7 @@
  	heap->size += true_size;
  	if (heap->peak < heap->size) {
  		heap->peak = heap->size;
-@@ -1941,6 +2027,9 @@ static void _zend_mm_free_int(zend_mm_he
+@@ -1947,6 +2033,9 @@ static void _zend_mm_free_int(zend_mm_he
  
  	mm_block = ZEND_MM_HEADER_OF(p);
  	size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -562,7 +561,7 @@
  	ZEND_MM_CHECK_PROTECTION(mm_block);
  
  #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
-@@ -2003,6 +2092,9 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2009,6 +2098,9 @@ static void *_zend_mm_realloc_int(zend_m
  	mm_block = ZEND_MM_HEADER_OF(p);
  	true_size = ZEND_MM_TRUE_SIZE(size);
  	orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -572,7 +571,7 @@
  	ZEND_MM_CHECK_PROTECTION(mm_block);
  
  	if (UNEXPECTED(true_size < size)) {
-@@ -2034,6 +2126,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2040,6 +2132,11 @@ static void *_zend_mm_realloc_int(zend_m
  			HANDLE_UNBLOCK_INTERRUPTIONS();
  		}
  		ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -584,7 +583,7 @@
  		return p;
  	}
  
-@@ -2053,13 +2150,18 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2059,13 +2156,18 @@ static void *_zend_mm_realloc_int(zend_m
  			heap->cache[index] = best_fit->prev_free_block;
  			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
  			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
@@ -604,7 +603,7 @@
  #endif
  
  			heap->cached -= true_size - orig_size;
-@@ -2117,6 +2219,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2123,6 +2225,11 @@ static void *_zend_mm_realloc_int(zend_m
  			if (heap->peak < heap->size) {
  				heap->peak = heap->size;
  			}
@@ -616,7 +615,7 @@
  			HANDLE_UNBLOCK_INTERRUPTIONS();
  			return p;
  		} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
-@@ -2220,6 +2327,11 @@ out_of_memory:
+@@ -2226,6 +2333,11 @@ out_of_memory:
  		}
  
  		HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -628,7 +627,7 @@
  		return ZEND_MM_DATA_OF(mm_block);
  	}
  
-@@ -2227,7 +2339,7 @@ out_of_memory:
+@@ -2233,7 +2345,7 @@ out_of_memory:
  #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
  	memcpy(ptr, p, mm_block->debug.size);
  #else
@@ -637,8 +636,8 @@
  #endif
  	_zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
  	return ptr;
-@@ -2490,6 +2602,17 @@ ZEND_API void shutdown_memory_manager(in
- 	zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
+@@ -2509,6 +2621,17 @@ ZEND_API void shutdown_memory_manager(in
+ 	zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC);
  }
  
 +#if SUHOSIN_PATCH
@@ -655,8 +654,8 @@
  static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
  {
  	char *tmp;
---- php5-5.2.9.dfsg.1.orig/Zend/zend_alloc.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_alloc.h
+--- php.orig/Zend/zend_alloc.h
++++ php/Zend/zend_alloc.h
 @@ -129,6 +129,9 @@ ZEND_API int zend_set_memory_limit(size_
  
  ZEND_API void start_memory_manager(TSRMLS_D);
@@ -668,7 +667,7 @@
  
  #if ZEND_DEBUG
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/Zend/zend_canary.c
++++ php/Zend/zend_canary.c
 @@ -0,0 +1,64 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -734,8 +733,8 @@
 + * vim600: sw=4 ts=4 fdm=marker
 + * vim<600: sw=4 ts=4
 + */
---- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_compile.c
+--- php.orig/Zend/zend_compile.c
++++ php/Zend/zend_compile.c
 @@ -54,7 +54,6 @@ static void zend_duplicate_property_info
  	property_info->name = zend_strndup(property_info->name, property_info->name_length);
  }
@@ -753,11 +752,11 @@
 +void *suhosin_zend_destroy_property_info = zend_destroy_property_info;
 +#endif
  
- static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
+ static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC)
  {
---- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_compile.h
-@@ -564,6 +564,11 @@ ZEND_API int zend_auto_global_disable_ji
+--- php.orig/Zend/zend_compile.h
++++ php/Zend/zend_compile.h
+@@ -608,6 +608,11 @@ ZEND_API size_t zend_dirname(char *path,
  
  int zendlex(znode *zendlval TSRMLS_DC);
  
@@ -769,7 +768,7 @@
  /* BEGIN: OPCODES */
  
  #include "zend_vm_opcodes.h"
-@@ -689,6 +694,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
+@@ -732,6 +737,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
  #define ZEND_RETURNS_FUNCTION 1<<0
  #define ZEND_RETURNS_NEW      1<<1
  
@@ -777,10 +776,10 @@
  END_EXTERN_C()
  
  #define ZEND_CLONE_FUNC_NAME		"__clone"
---- php5-5.2.9.dfsg.1.orig/Zend/zend_constants.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_constants.c
-@@ -110,6 +110,75 @@ void zend_register_standard_constants(TS
- 	REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
+--- php.orig/Zend/zend_constants.c
++++ php/Zend/zend_constants.c
+@@ -112,6 +112,75 @@ void zend_register_standard_constants(TS
+ 	REGISTER_MAIN_LONG_CONSTANT("E_USER_DEPRECATED", E_USER_DEPRECATED, CONST_PERSISTENT | CONST_CS);
  
  	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
 +#if SUHOSIN_PATCH
@@ -855,10 +854,10 @@
  
  	/* true/false constants */
  	{
---- php5-5.2.9.dfsg.1.orig/Zend/zend_errors.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_errors.h
-@@ -39,6 +39,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)
+--- php.orig/Zend/zend_errors.h
++++ php/Zend/zend_errors.h
+@@ -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)
  
 +#if SUHOSIN_PATCH
@@ -878,17 +877,17 @@
  #endif /* ZEND_ERRORS_H */
  
  /*
---- php5-5.2.9.dfsg.1.orig/Zend/zend_hash.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_hash.c
+--- php.orig/Zend/zend_hash.c
++++ php/Zend/zend_hash.c
 @@ -20,6 +20,7 @@
- /* $Id: zend_hash.c,v 1.121.2.4.2.10 2008/12/31 11:17:33 sebastian Exp $ */
+ /* $Id: zend_hash.c,v 1.121.2.4.2.8.2.8 2008/12/31 11:15:32 sebastian Exp $ */
  
  #include "zend.h"
 +#include "zend_compile.h"
  
  #define CONNECT_TO_BUCKET_DLLIST(element, list_head)		\
  	(element)->pNext = (list_head);							\
-@@ -132,7 +133,189 @@ ZEND_API ulong zend_hash_func(char *arKe
+@@ -132,7 +133,189 @@ ZEND_API ulong zend_hash_func(const char
  		(p)->pDataPtr=NULL;												\
  	}
  
@@ -1145,8 +1144,8 @@
  	if (ht->pDestructor) {
  		ht->pDestructor(p->pData);
  	}
---- php5-5.2.9.dfsg.1.orig/Zend/zend_llist.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_llist.c
+--- php.orig/Zend/zend_llist.c
++++ php/Zend/zend_llist.c
 @@ -23,6 +23,184 @@
  #include "zend_llist.h"
  #include "zend_qsort.h"
@@ -1364,9 +1363,9 @@
  	if ((old_tail = l->tail)) {
  		if (old_tail->prev) {
  			old_tail->prev->next = NULL;
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -257,6 +257,7 @@ sinclude(Zend/Zend.m4)
+--- php.orig/configure.in
++++ php/configure.in
+@@ -304,6 +304,7 @@ sinclude(Zend/Zend.m4)
  sinclude(TSRM/threads.m4)
  sinclude(TSRM/tsrm.m4)
  
@@ -1374,7 +1373,7 @@
  
  divert(2)
  
-@@ -1424,7 +1428,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
+@@ -1427,7 +1428,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c 
         php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
         strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
         network.c php_open_temporary_file.c php_logos.c \
@@ -1383,7 +1382,7 @@
  
  PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
         plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \
-@@ -1452,7 +1456,7 @@ PHP_ADD_SOURCES(Zend, \
+@@ -1455,7 +1456,7 @@ PHP_ADD_SOURCES(Zend, \
      zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
      zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
      zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
@@ -1392,9 +1391,9 @@
  
  if test -r "$abs_srcdir/Zend/zend_objects.c"; then
    PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
---- php5-5.2.9.dfsg.1.orig/ext/standard/basic_functions.c
-+++ php5-5.2.9.dfsg.1/ext/standard/basic_functions.c
-@@ -3575,7 +3575,9 @@ zend_function_entry basic_functions[] = 
+--- php.orig/ext/standard/basic_functions.c
++++ php/ext/standard/basic_functions.c
+@@ -3127,7 +3127,9 @@ const zend_function_entry basic_function
  	PHP_FALIAS(socket_get_status, stream_get_meta_data,						arginfo_stream_get_meta_data)
  
  #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1405,9 +1404,9 @@
  #endif
  
  #ifdef HAVE_FNMATCH
---- php5-5.2.9.dfsg.1.orig/ext/standard/dl.c
-+++ php5-5.2.9.dfsg.1/ext/standard/dl.c
-@@ -241,6 +241,19 @@ void php_dl(zval *file, int type, zval *
+--- php.orig/ext/standard/dl.c
++++ php/ext/standard/dl.c
+@@ -239,6 +239,19 @@ PHPAPI int php_load_extension(char *file
  			return FAILURE;
  		}
  	}
@@ -1427,19 +1426,19 @@
  	return SUCCESS;
  }
  /* }}} */
---- php5-5.2.9.dfsg.1.orig/ext/standard/file.c
-+++ php5-5.2.9.dfsg.1/ext/standard/file.c
-@@ -2387,7 +2387,7 @@ out:
+--- php.orig/ext/standard/file.c
++++ php/ext/standard/file.c
+@@ -2352,7 +2352,7 @@ out:
  #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
  /* {{{ proto string realpath(string path)
     Return the resolved path */
 -PHP_FUNCTION(realpath)
 +PHP_FUNCTION(real_path)
  {
- 	zval **path;
- 	char resolved_path_buff[MAXPATHLEN];
---- php5-5.2.9.dfsg.1.orig/ext/standard/file.h
-+++ php5-5.2.9.dfsg.1/ext/standard/file.h
+ 	char *filename;
+ 	int filename_len;
+--- php.orig/ext/standard/file.h
++++ php/ext/standard/file.h
 @@ -61,7 +61,7 @@ PHP_FUNCTION(flock);
  PHP_FUNCTION(fd_set);
  PHP_FUNCTION(fd_isset);
@@ -1449,9 +1448,9 @@
  #endif
  #ifdef HAVE_FNMATCH
  PHP_FUNCTION(fnmatch);
---- php5-5.2.9.dfsg.1.orig/ext/standard/info.c
-+++ php5-5.2.9.dfsg.1/ext/standard/info.c
-@@ -648,6 +648,31 @@ PHPAPI void php_print_info(int flag TSRM
+--- php.orig/ext/standard/info.c
++++ php/ext/standard/info.c
+@@ -842,6 +842,31 @@ PHPAPI void php_print_info(int flag TSRM
  		
  		php_info_print_table_end();
  
@@ -1483,8 +1482,8 @@
  		/* Zend Engine */
  		php_info_print_box_start(0);
  		if (expose_php && !sapi_module.phpinfo_as_text) {
---- php5-5.2.9.dfsg.1.orig/ext/standard/syslog.c
-+++ php5-5.2.9.dfsg.1/ext/standard/syslog.c
+--- php.orig/ext/standard/syslog.c
++++ php/ext/standard/syslog.c
 @@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
   */
  PHP_MINIT_FUNCTION(syslog)
@@ -1501,9 +1500,9 @@
  	BG(syslog_device)=NULL;
  
  	return SUCCESS;
---- php5-5.2.9.dfsg.1.orig/main/fopen_wrappers.c
-+++ php5-5.2.9.dfsg.1/main/fopen_wrappers.c
-@@ -110,7 +110,7 @@ PHPAPI int php_check_specific_open_based
+--- php.orig/main/fopen_wrappers.c
++++ php/main/fopen_wrappers.c
+@@ -166,7 +166,7 @@ PHPAPI int php_check_specific_open_based
  
  	/* normalize and expand path */
  	if (expand_filepath(path, resolved_name TSRMLS_CC) == NULL) {
@@ -1512,7 +1511,7 @@
  	}
  
  	path_len = strlen(resolved_name);
-@@ -182,6 +182,12 @@ PHPAPI int php_check_specific_open_based
+@@ -238,6 +238,12 @@ PHPAPI int php_check_specific_open_based
  			}
  		}
  
@@ -1525,7 +1524,7 @@
  		/* Check the path */
  #if defined(PHP_WIN32) || defined(NETWARE)
  		if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
-@@ -205,7 +211,7 @@ PHPAPI int php_check_specific_open_based
+@@ -261,7 +267,7 @@ PHPAPI int php_check_specific_open_based
  		}
  	} else {
  		/* Unable to resolve the real path, return -1 */
@@ -1534,7 +1533,7 @@
  	}
  }
  /* }}} */
-@@ -224,22 +230,44 @@ PHPAPI int php_check_open_basedir_ex(con
+@@ -280,22 +286,44 @@ PHPAPI int php_check_open_basedir_ex(con
  		char *pathbuf;
  		char *ptr;
  		char *end;
@@ -1580,8 +1579,8 @@
  
  			ptr = end;
  		}
---- php5-5.2.9.dfsg.1.orig/main/main.c
-+++ php5-5.2.9.dfsg.1/main/main.c
+--- php.orig/main/main.c
++++ php/main/main.c
 @@ -89,6 +89,9 @@
  
  #include "SAPI.h"
@@ -1591,8 +1590,8 @@
 +#endif
  /* }}} */
  
- #ifndef ZTS
-@@ -1374,7 +1377,7 @@ void php_request_shutdown_for_exec(void 
+ PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
+@@ -1439,7 +1442,7 @@ void php_request_shutdown_for_exec(void 
  
  	/* used to close fd's in the 3..255 range here, but it's problematic
  	 */
@@ -1601,7 +1600,7 @@
  }
  /* }}} */
  
-@@ -1415,6 +1418,9 @@ void php_request_shutdown_for_hook(void 
+@@ -1480,6 +1483,9 @@ void php_request_shutdown_for_hook(void 
  
  	zend_try {
  		shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1611,7 +1610,7 @@
  	} zend_end_try();
  
  	zend_try {
-@@ -1509,6 +1515,9 @@ void php_request_shutdown(void *dummy)
+@@ -1579,6 +1585,9 @@ void php_request_shutdown(void *dummy)
  	/* 11. Free Willy (here be crashes) */
  	zend_try {
  		shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0 TSRMLS_CC);
@@ -1621,7 +1620,7 @@
  	} zend_end_try();
  
  	/* 12. Reset max_execution_time */
-@@ -1668,6 +1677,9 @@ int php_module_startup(sapi_module_struc
+@@ -1746,6 +1755,9 @@ int php_module_startup(sapi_module_struc
  #ifdef ZTS
  	tsrm_ls = ts_resource(0);
  #endif
@@ -1631,7 +1630,7 @@
  
  	module_shutdown = 0;
  	module_startup = 1;
-@@ -1809,6 +1821,10 @@ int php_module_startup(sapi_module_struc
+@@ -1863,6 +1875,10 @@ int php_module_startup(sapi_module_struc
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | CONST_CS);
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
@@ -1640,9 +1639,9 @@
 +	REGISTER_MAIN_STRINGL_CONSTANT("SUHOSIN_PATCH_VERSION", SUHOSIN_PATCH_VERSION, sizeof(SUHOSIN_PATCH_VERSION)-1, CONST_PERSISTENT | CONST_CS);
 +#endif
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
+ 	REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
  	REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
- 	REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
-@@ -1858,7 +1874,9 @@ int php_module_startup(sapi_module_struc
+@@ -1990,7 +2006,9 @@ int php_module_startup(sapi_module_struc
  	module_startup = 0;
  
  	shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1653,7 +1652,7 @@
  	/* we're done */
  	return SUCCESS;
  }
-@@ -1917,6 +1935,9 @@ void php_module_shutdown(TSRMLS_D)
+@@ -2049,6 +2067,9 @@ void php_module_shutdown(TSRMLS_D)
  #ifndef ZTS
  	zend_ini_shutdown(TSRMLS_C);
  	shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1661,10 +1660,10 @@
 +	suhosin_clear_mm_canaries(TSRMLS_C);
 +#endif
  	core_globals_dtor(&core_globals TSRMLS_CC);
+ 	gc_globals_dtor(TSRMLS_C);
  #else
- 	zend_ini_global_shutdown(TSRMLS_C);
---- php5-5.2.9.dfsg.1.orig/main/php.h
-+++ php5-5.2.9.dfsg.1/main/php.h
+--- php.orig/main/php.h
++++ php/main/php.h
 @@ -40,6 +40,13 @@
  #undef sprintf
  #define sprintf php_sprintf
@@ -1679,7 +1678,7 @@
  /* PHP's DEBUG value must match Zend's ZEND_DEBUG value */
  #undef PHP_DEBUG
  #define PHP_DEBUG ZEND_DEBUG
-@@ -448,6 +455,10 @@ END_EXTERN_C()
+@@ -450,6 +457,10 @@ END_EXTERN_C()
  #endif
  #endif /* !XtOffsetOf */
  
@@ -1690,8 +1689,8 @@
  #endif
  
  /*
---- php5-5.2.9.dfsg.1.orig/main/php_logos.c
-+++ php5-5.2.9.dfsg.1/main/php_logos.c
+--- php.orig/main/php_logos.c
++++ php/main/php_logos.c
 @@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
  	return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
  }
@@ -1713,9 +1712,9 @@
  
  	return SUCCESS;
  }
---- php5-5.2.9.dfsg.1.orig/main/snprintf.c
-+++ php5-5.2.9.dfsg.1/main/snprintf.c
-@@ -1077,7 +1077,11 @@ static int format_converter(register buf
+--- php.orig/main/snprintf.c
++++ php/main/snprintf.c
+@@ -1091,7 +1091,11 @@ static int format_converter(register buf
  
  
  				case 'n':
@@ -1727,9 +1726,9 @@
  					goto skip_output;
  
  					/*
---- php5-5.2.9.dfsg.1.orig/main/spprintf.c
-+++ php5-5.2.9.dfsg.1/main/spprintf.c
-@@ -682,7 +682,11 @@ static void xbuf_format_converter(smart_
+--- php.orig/main/spprintf.c
++++ php/main/spprintf.c
+@@ -698,7 +698,11 @@ static void xbuf_format_converter(smart_
  
  
  				case 'n':
@@ -1742,7 +1741,7 @@
  
  					/*
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_globals.h
++++ php/main/suhosin_globals.h
 @@ -0,0 +1,61 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -1806,7 +1805,7 @@
 + * End:
 + */
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_logo.h
++++ php/main/suhosin_logo.h
 @@ -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"
@@ -1987,7 +1986,7 @@
 +	"\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
 +	;
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.c
++++ php/main/suhosin_patch.c
 @@ -0,0 +1,380 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -2370,7 +2369,7 @@
 + * vim<600: sw=4 ts=4
 + */
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.h
++++ php/main/suhosin_patch.h
 @@ -0,0 +1,40 @@
 +/*
 +   +----------------------------------------------------------------------+
@@ -2413,7 +2412,7 @@
 + * End:
 + */
 --- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.m4
++++ php/main/suhosin_patch.m4
 @@ -0,0 +1,8 @@
 +dnl
 +dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
@@ -2423,9 +2422,9 @@
 +
 +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
 +
---- php5-5.2.9.dfsg.1.orig/sapi/apache/mod_php5.c
-+++ php5-5.2.9.dfsg.1/sapi/apache/mod_php5.c
-@@ -951,7 +951,11 @@ static void php_init_handler(server_rec 
+--- php.orig/sapi/apache/mod_php5.c
++++ php/sapi/apache/mod_php5.c
+@@ -967,7 +967,11 @@ static void php_init_handler(server_rec 
  	{
  		TSRMLS_FETCH();
  		if (PG(expose_php)) {
@@ -2437,9 +2436,9 @@
  		}
  	}
  #endif
---- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2filter/sapi_apache2.c
-@@ -566,7 +566,11 @@ static void php_apache_add_version(apr_p
+--- php.orig/sapi/apache2filter/sapi_apache2.c
++++ php/sapi/apache2filter/sapi_apache2.c
+@@ -581,7 +581,11 @@ static void php_apache_add_version(apr_p
  {
  	TSRMLS_FETCH();
  	if (PG(expose_php)) {
@@ -2451,9 +2450,9 @@
  	}
  }
  
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
-@@ -370,7 +370,11 @@ static void php_apache_add_version(apr_p
+--- php.orig/sapi/apache2handler/sapi_apache2.c
++++ php/sapi/apache2handler/sapi_apache2.c
+@@ -386,7 +386,11 @@ static void php_apache_add_version(apr_p
  {
  	TSRMLS_FETCH();
  	if (PG(expose_php)) {
@@ -2465,9 +2464,9 @@
  	}
  }
  
---- php5-5.2.9.dfsg.1.orig/sapi/cgi/cgi_main.c
-+++ php5-5.2.9.dfsg.1/sapi/cgi/cgi_main.c
-@@ -1859,10 +1859,18 @@ consult the installation file that came with this distribution, or visit \n\
+--- php.orig/sapi/cgi/cgi_main.c
++++ php/sapi/cgi/cgi_main.c
+@@ -1859,10 +1859,18 @@ consult the installation file that came 
  								SG(headers_sent) = 1;
  								SG(request_info).no_headers = 1;
  							}
@@ -2488,9 +2487,9 @@
  #endif
  							php_request_shutdown((void *) 0);
  							exit_status = 0;
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php_cli.c
-+++ php5-5.2.9.dfsg.1/sapi/cli/php_cli.c
-@@ -772,8 +772,14 @@ int main(int argc, char *argv[])
+--- php.orig/sapi/cli/php_cli.c
++++ php/sapi/cli/php_cli.c
+@@ -798,8 +798,14 @@ int main(int argc, char *argv[])
  				}
  
  				request_started = 1;
@@ -2507,9 +2506,9 @@
  #if ZEND_DEBUG && defined(HAVE_GCOV)
  					"(DEBUG GCOV)",
  #elif ZEND_DEBUG
---- a/win32/build/config.w32
-+++ b/win32/build/config.w32
-@@ -312,7 +312,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
+--- php.orig/win32/build/config.w32
++++ php/win32/build/config.w32
+@@ -312,7 +312,7 @@ ADD_SOURCES("Zend", "zend_language_parse
  	zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
  	zend_object_handlers.c zend_objects_API.c \
  	zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
@@ -2518,7 +2517,7 @@
  
  ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c getopt.c fopen_wrappers.c \
  	php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
-@@ -350,6 +350,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
+@@ -364,6 +364,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
  AC_DEFINE('HAVE_USLEEP', 1);
  AC_DEFINE('HAVE_STRCOLL', 1);
  
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index f8ef8a7..275b54b 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -8,8 +8,8 @@ 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
 
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/parse_tz.c
-+++ php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c
+--- php.orig/ext/date/lib/parse_tz.c
++++ php/ext/date/lib/parse_tz.c
 @@ -20,6 +20,16 @@
  
  #include "timelib.h"
@@ -38,7 +38,7 @@ r1: initial revision
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -212,6 +225,211 @@ void timelib_dump_tzinfo(timelib_tzinfo 
+@@ -253,6 +266,211 @@ void timelib_dump_tzinfo(timelib_tzinfo 
  	}
  }
  
@@ -250,7 +250,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;
-@@ -285,6 +503,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+@@ -328,6 +546,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
  
  	return tmp;
  }
@@ -258,11 +258,11 @@ r1: initial revision
  
  static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
  {
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.h
-+++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.h
-@@ -32,6 +32,10 @@
- 
- #define TIMELIB_SPECIAL_WEEKDAY  0x01
+--- php.orig/ext/date/lib/timelib.h
++++ php/ext/date/lib/timelib.h
+@@ -34,6 +34,10 @@
+ #define TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH      0x02
+ #define TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH 0x03
  
 +#ifdef HAVE_SYSTEM_TZDATA
 +#define TIMELIB_SYSTEM_TZID "System/Localtime"
@@ -271,8 +271,8 @@ r1: initial revision
  #ifndef LONG_MAX
  #define LONG_MAX 2147483647L
  #endif
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.m4
-+++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.m4
+--- php.orig/ext/date/lib/timelib.m4
++++ php/ext/date/lib/timelib.m4
 @@ -78,3 +78,17 @@ stdlib.h
  
  dnl Check for strtoll, atoll
@@ -291,9 +291,9 @@ r1: initial revision
 +   fi
 +fi
 +
---- php5-5.2.9.dfsg.1.orig/ext/date/php_date.c
-+++ php5-5.2.9.dfsg.1/ext/date/php_date.c
-@@ -584,6 +584,11 @@ static char* guess_timezone(const timeli
+--- php.orig/ext/date/php_date.c
++++ php/ext/date/php_date.c
+@@ -829,6 +829,11 @@ static char* guess_timezone(const timeli
  	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
  		return DATEG(default_timezone);
  	}
-- 
1.6.3.3

More information about the Pkg-php-commits mailing list