[Pkg-php-commits] [php/debian-sid] refreshed all patches in series with following quilt settings:
Ondrej Sury
ondrej at howl.office.nic.cz
Sun Feb 7 23:19:41 UTC 2010
QUILT_PATCHES=debian/patches
QUILT_NO_DIFF_TIMESTAMPS=1
QUILT_DIFF_OPTS=-p
QUILT_NO_DIFF_INDEX=1
---
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 | 14 +-
debian/patches/115-autoconf_ftbfs.patch | 30 +-
debian/patches/116-posixness_fix.patch | 30 +-
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 | 466 ++++++++------------
debian/patches/use_embedded_timezonedb.patch | 18 +-
37 files changed, 397 insertions(+), 609 deletions(-)
diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index fa34537..38da4f7 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/TSRM/configure.in
++++ pkg-php/TSRM/configure.in
+@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
AM_PROG_LIBTOOL
@@ -12,11 +10,9 @@ Index: pkg-php/TSRM/configure.in
dnl TSRM_PTHREAD
-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 @@
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
+@@ -1357,9 +1357,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 4caf9a5..7f73851 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/acinclude.m4
++++ pkg-php/acinclude.m4
+@@ -2373,9 +2373,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 5545d6b..ca8aef1 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/ldap/ldap.c
++++ pkg-php/ext/ldap/ldap.c
+@@ -1239,7 +1239,7 @@ PHP_FUNCTION(ldap_explode_dn)
}
i=0;
@@ -11,7 +9,7 @@ Index: pkg-php/ext/ldap/ldap.c
count = i;
array_init(return_value);
-@@ -1249,7 +1249,8 @@
+@@ -1249,7 +1249,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 fcac040..6e5784c 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
+@@ -1032,7 +1032,7 @@ if test "$PHP_CLI" = "no"; then
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -11,7 +9,7 @@ Index: pkg-php/configure.in
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
-@@ -1062,7 +1062,7 @@
+@@ -1062,7 +1062,7 @@ dnl
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -20,7 +18,7 @@ Index: pkg-php/configure.in
esac
fi
-@@ -1117,12 +1117,12 @@
+@@ -1117,12 +1117,12 @@ test "$program_suffix" = "NONE" && progr
case $libdir in
'${exec_prefix}/lib')
@@ -35,7 +33,7 @@ Index: pkg-php/configure.in
;;
esac
-@@ -1187,7 +1187,7 @@
+@@ -1187,7 +1187,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"`
@@ -44,11 +42,9 @@ Index: pkg-php/configure.in
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-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 @@
+--- pkg-php.orig/ext/ext_skel
++++ pkg-php/ext/ext_skel
+@@ -70,7 +70,7 @@ if test -d "$extname" ; then
fi
if test -z "$skel_dir"; then
@@ -57,11 +53,9 @@ Index: pkg-php/ext/ext_skel
fi
## convert skel_dir to full path
-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 @@
+--- pkg-php.orig/php.ini-development
++++ pkg-php/php.ini-development
+@@ -785,7 +785,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -70,11 +64,9 @@ Index: pkg-php/php.ini-development
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-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 @@
+--- pkg-php.orig/php.ini-production
++++ pkg-php/php.ini-production
+@@ -785,7 +785,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -83,7 +75,7 @@ Index: pkg-php/php.ini-production
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -939,53 +939,6 @@
+@@ -939,53 +939,6 @@ default_socket_timeout = 60
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -137,11 +129,9 @@ Index: pkg-php/php.ini-production
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
-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 @@
+--- pkg-php.orig/sapi/caudium/config.m4
++++ pkg-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
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
@@ -152,7 +142,7 @@ Index: pkg-php/sapi/caudium/config.m4
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 @@
+@@ -84,7 +84,9 @@ if test "$PHP_CAUDIUM" != "no"; then
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)
@@ -163,11 +153,9 @@ Index: pkg-php/sapi/caudium/config.m4
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
-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 @@
+--- pkg-php.orig/sapi/cli/php.1.in
++++ pkg-php/sapi/cli/php.1.in
+@@ -306,13 +306,14 @@ Shows configuration for extension
.B name
.SH FILES
.TP 15
@@ -187,10 +175,8 @@ Index: pkg-php/sapi/cli/php.1.in
.SH EXAMPLES
.TP 5
\fIphp -r 'echo "Hello World\\n";'\fP
-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
+--- pkg-php.orig/scripts/Makefile.frag
++++ pkg-php/scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -202,11 +188,9 @@ Index: pkg-php/scripts/Makefile.frag
BUILD_FILES = \
scripts/phpize.m4 \
-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 @@
+--- pkg-php.orig/scripts/php-config.in
++++ pkg-php/scripts/php-config.in
+@@ -5,8 +5,8 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
@@ -217,10 +201,8 @@ Index: pkg-php/scripts/php-config.in
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
-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
+--- pkg-php.orig/scripts/phpize.in
++++ pkg-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 99a314a..e4b7209 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
+@@ -642,50 +642,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 f0c1f28..051e5fa 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/acinclude.m4
++++ pkg-php/acinclude.m4
+@@ -1219,7 +1219,7 @@ $1
}
],[
@@ -11,7 +9,7 @@ Index: pkg-php/acinclude.m4
],[
ac_cv_pwrite=no
],[
-@@ -1248,7 +1248,7 @@
+@@ -1248,7 +1248,7 @@ $1
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 204ae72..3b4c2b3 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -1,7 +1,5 @@
-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
+--- /dev/null
++++ pkg-php/ext/zlib/zconf.h
@@ -0,0 +1,326 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -329,10 +327,8 @@ Index: pkg-php/ext/zlib/zconf.h
+#endif
+
+#endif /* ZCONF_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
+--- /dev/null
++++ pkg-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 e2c231c..23335df 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -1,7 +1,5 @@
-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
+--- /dev/null
++++ pkg-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 e38541e..25a27ad 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -6,11 +6,9 @@ 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.
-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 @@
+--- pkg-php.orig/build/build2.mk
++++ pkg-php/build/build2.mk
+@@ -52,7 +52,8 @@ $(TOUCH_FILES):
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 02ca990..7cc639b 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,11 +1,9 @@
Save and restore umask across requests correctly.
-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 @@
+--- pkg-php.orig/sapi/apache2handler/sapi_apache2.c
++++ pkg-php/sapi/apache2handler/sapi_apache2.c
+@@ -448,6 +448,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
@@ -25,7 +23,7 @@ Index: pkg-php/sapi/apache2handler/sapi_apache2.c
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_length;
-@@ -639,6 +652,8 @@
+@@ -639,6 +652,8 @@ zend_first_try {
} else {
zend_file_handle zfd;
@@ -34,7 +32,7 @@ Index: pkg-php/sapi/apache2handler/sapi_apache2.c
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
-@@ -650,6 +665,9 @@
+@@ -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 22c0b26..a89b93b 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/sockets/sockets.c
++++ pkg-php/ext/sockets/sockets.c
+@@ -708,6 +708,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 */
@@ -10,11 +8,9 @@ Index: pkg-php/ext/sockets/sockets.c
PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
if (php_sock->bsd_socket > *max_fd) {
-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 @@
+--- pkg-php.orig/ext/standard/streamsfuncs.c
++++ pkg-php/ext/standard/streamsfuncs.c
+@@ -612,6 +612,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 4d0139b..eb57353 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/recode/recode.c
++++ pkg-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 c949b6a..81669d3 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/Zend/zend_strtod.c
++++ pkg-php/Zend/zend_strtod.c
+@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
#define IEEE_LITTLE_ENDIAN
#endif
@@ -35,7 +33,7 @@ Index: pkg-php/Zend/zend_strtod.c
#endif
#ifdef __vax__
-@@ -266,8 +277,7 @@
+@@ -266,8 +277,7 @@ BEGIN_EXTERN_C()
#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
defined(IBM) != 1
@@ -45,7 +43,7 @@ Index: pkg-php/Zend/zend_strtod.c
#endif
typedef union {
-@@ -287,7 +297,7 @@
+@@ -287,7 +297,7 @@ BEGIN_EXTERN_C()
* 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 f30ddf0..5e06edd 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/exif/exif.c
++++ pkg-php/ext/exif/exif.c
+@@ -99,7 +99,7 @@ typedef unsigned char uchar;
#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 e5688b4..6efca32 100644
--- a/debian/patches/047-zts_with_dl.patch
+++ b/debian/patches/047-zts_with_dl.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/standard/dl.c
++++ pkg-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 ada2f63..89b37e8 100644
--- a/debian/patches/052-phpinfo_no_configure.patch
+++ b/debian/patches/052-phpinfo_no_configure.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/standard/info.c
++++ pkg-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: pkg-php/ext/standard/info.c
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
-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 @@
+--- pkg-php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ pkg-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 7ea699f..ab542d9 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
+@@ -1141,8 +1141,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 //'`
@@ -17,7 +15,7 @@ Index: pkg-php/configure.in
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1287,6 +1292,7 @@
+@@ -1287,6 +1292,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -25,11 +23,9 @@ Index: pkg-php/configure.in
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
-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 @@
+--- pkg-php.orig/scripts/php-config.in
++++ pkg-php/scripts/php-config.in
+@@ -17,6 +17,7 @@ php_cli_binary=NONE
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
php_sapis="@PHP_INSTALLED_SAPIS@"
@@ -37,7 +33,7 @@ Index: pkg-php/scripts/php-config.in
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
-@@ -55,6 +56,8 @@
+@@ -55,6 +56,8 @@ case "$1" in
echo $include_dir;;
--php-binary)
echo $php_binary;;
@@ -46,7 +42,7 @@ Index: pkg-php/scripts/php-config.in
--php-sapis)
echo $php_sapis;;
--configure-options)
-@@ -75,6 +78,7 @@
+@@ -75,6 +78,7 @@ Options:
--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 845d71e..ef8d60e 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/sapi/apache2handler/config.m4
++++ pkg-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"
@@ -23,11 +21,9 @@ Index: pkg-php/sapi/apache2handler/config.m4
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; 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 @@
+--- pkg-php.orig/sapi/apache/config.m4
++++ pkg-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
@@ -44,11 +40,9 @@ Index: pkg-php/sapi/apache/config.m4
for flag in $APXS_CFLAGS; do
case $flag in
-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 @@
+--- pkg-php.orig/sapi/apache2filter/config.m4
++++ pkg-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"
@@ -69,11 +63,9 @@ Index: pkg-php/sapi/apache2filter/config.m4
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-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 @@
+--- pkg-php.orig/sapi/apache_hooks/config.m4
++++ pkg-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 72168e4..234481e 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/recode/config9.m4
++++ pkg-php/ext/recode/config9.m4
+@@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
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 9e82d03..d9db8c0 100644
--- a/debian/patches/101-sqlite_is_shared.patch
+++ b/debian/patches/101-sqlite_is_shared.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/sqlite/config.m4
++++ pkg-php/ext/sqlite/config.m4
+@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
])
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 08c9405..f8c5847 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -1,7 +1,5 @@
-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
+--- pkg-php.orig/ext/standard/datetime.c
++++ pkg-php/ext/standard/datetime.c
@@ -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 f18cae7..b3758a0 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,7 +1,5 @@
-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
+--- pkg-php.orig/ext/standard/proc_open.c
++++ pkg-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 11021f2..656417d 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/php.ini-development
++++ pkg-php/php.ini-development
+@@ -335,6 +335,11 @@ allow_call_time_pass_reference = Off
; Safe Mode
; http://php.net/safe-mode
@@ -14,7 +12,7 @@ Index: pkg-php/php.ini-development
safe_mode = Off
; By default, Safe Mode does a UID compare check when
-@@ -376,6 +381,12 @@
+@@ -376,6 +381,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://php.net/open-basedir
@@ -27,7 +25,7 @@ Index: pkg-php/php.ini-development
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
-@@ -692,6 +703,11 @@
+@@ -692,6 +703,11 @@ request_order = "GP"
; 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 d59a391..5198dc7 100644
--- a/debian/patches/114-php_gd_segfault.patch
+++ b/debian/patches/114-php_gd_segfault.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/gd/libgd/gd_compat.c
++++ pkg-php/ext/gd/libgd/gd_compat.c
+@@ -14,7 +14,7 @@ int gdJpegGetVersionInt()
return JPEG_LIB_VERSION;
}
@@ -11,10 +9,8 @@ Index: pkg-php/ext/gd/libgd/gd_compat.c
{
switch(JPEG_LIB_VERSION) {
case 62:
-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
+--- pkg-php.orig/ext/gd/libgd/gd_compat.h
++++ pkg-php/ext/gd/libgd/gd_compat.h
@@ -8,7 +8,7 @@
#endif
diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index 31dcefe..b67df8d 100644
--- a/debian/patches/115-autoconf_ftbfs.patch
+++ b/debian/patches/115-autoconf_ftbfs.patch
@@ -1,7 +1,5 @@
-Index: pkg-php/configure.in
-===================================================================
---- 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
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
@@ -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.
@@ -11,7 +9,7 @@ Index: pkg-php/configure.in
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
-@@ -23,16 +23,16 @@
+@@ -23,16 +23,16 @@ dnl ## In diversion 5 we check which ext
dnl ## All of these are normally in the extension directories.
dnl ## Diversion 5 is the last one. Here we generate files and clean up.
@@ -32,7 +30,7 @@ Index: pkg-php/configure.in
PHP_CONFIG_NICE(config.nice)
PHP_CANONICAL_HOST_TARGET
-@@ -308,7 +308,7 @@
+@@ -308,7 +308,7 @@ sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -41,7 +39,7 @@ Index: pkg-php/configure.in
dnl ## Diversion 2 is where we set PHP-specific options and come up
dnl ## with reasonable default values for them. We check for pthreads here
-@@ -347,7 +347,7 @@
+@@ -347,7 +347,7 @@ if test "$enable_maintainer_zts" = "yes"
PTHREADS_FLAGS
fi
@@ -50,7 +48,7 @@ Index: pkg-php/configure.in
dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ if test "x$php_crypt_r" = "x1"; then
PHP_CRYPT_R_STYLE
fi
@@ -59,7 +57,7 @@ Index: pkg-php/configure.in
dnl ## In diversion 4 we check user-configurable general settings.
-@@ -943,7 +943,7 @@
+@@ -943,7 +943,7 @@ else
AC_MSG_RESULT([using system default])
fi
@@ -68,10 +66,8 @@ Index: pkg-php/configure.in
dnl ## In diversion 5 we check which extensions should be compiled.
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:43:40.000000000 +0200
-+++ pkg-php/ext/standard/config.m4 2009-08-25 15:44:03.000000000 +0200
+--- pkg-php.orig/ext/standard/config.m4
++++ pkg-php/ext/standard/config.m4
@@ -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 -*-
@@ -80,7 +76,7 @@ Index: pkg-php/ext/standard/config.m4
dnl
dnl Check if flush should be called explicitly after buffered io
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ dnl
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
AC_FUNC_FNMATCH
@@ -89,10 +85,8 @@ Index: pkg-php/ext/standard/config.m4
dnl
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:43:41.000000000 +0200
-+++ pkg-php/scripts/phpize.m4 2009-08-25 15:44:03.000000000 +0200
+--- pkg-php.orig/scripts/phpize.m4
++++ pkg-php/scripts/phpize.m4
@@ -1,6 +1,6 @@
dnl This file becomes configure.in for self-contained extensions.
diff --git a/debian/patches/116-posixness_fix.patch b/debian/patches/116-posixness_fix.patch
index ae894b8..8c91796 100644
--- a/debian/patches/116-posixness_fix.patch
+++ b/debian/patches/116-posixness_fix.patch
@@ -1,7 +1,5 @@
-Index: php5-5.2.9.dfsg.1/TSRM/tsrm_config_common.h
-===================================================================
---- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_config_common.h 2009-05-23 09:51:20.000000000 +0200
-+++ php5-5.2.9.dfsg.1/TSRM/tsrm_config_common.h 2009-05-23 10:00:07.000000000 +0200
+--- pkg-php.orig/TSRM/tsrm_config_common.h
++++ pkg-php/TSRM/tsrm_config_common.h
@@ -1,6 +1,10 @@
#ifndef TSRM_CONFIG_COMMON_H
#define TSRM_CONFIG_COMMON_H
@@ -13,13 +11,11 @@ Index: php5-5.2.9.dfsg.1/TSRM/tsrm_config_common.h
#ifndef __CYGWIN__
# if WINNT|WIN32
# define TSRM_WIN32
-Index: php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c
-===================================================================
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/parse_tz.c 2009-05-23 10:00:02.000000000 +0200
-+++ php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c 2009-05-23 10:00:07.000000000 +0200
+--- pkg-php.orig/ext/date/lib/parse_tz.c
++++ pkg-php/ext/date/lib/parse_tz.c
@@ -18,6 +18,10 @@
- /* $Id: parse_tz.c,v 1.20.2.6.2.18 2008/12/31 11:17:36 sebastian Exp $ */
+ /* $Id: parse_tz.c,v 1.20.2.6.2.13.2.6 2009/04/25 16:33:41 nlopess Exp $ */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
@@ -27,11 +23,9 @@ Index: php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c
+
#include "timelib.h"
- #ifdef HAVE_SYSTEM_TZDATA
-Index: php5-5.2.9.dfsg.1/ext/standard/proc_open.c
-===================================================================
---- php5-5.2.9.dfsg.1.orig/ext/standard/proc_open.c 2009-05-23 09:51:19.000000000 +0200
-+++ php5-5.2.9.dfsg.1/ext/standard/proc_open.c 2009-05-23 10:00:07.000000000 +0200
+ #include <stdio.h>
+--- pkg-php.orig/ext/standard/proc_open.c
++++ pkg-php/ext/standard/proc_open.c
@@ -24,6 +24,10 @@
# define __EXTENSIONS__ 1 /* Solaris: uint */
#endif
@@ -43,11 +37,9 @@ Index: php5-5.2.9.dfsg.1/ext/standard/proc_open.c
#include "php.h"
#include <stdio.h>
#include <ctype.h>
-Index: php5-5.2.9.dfsg.1/main/php.h
-===================================================================
---- php5-5.2.9.dfsg.1.orig/main/php.h 2009-05-23 10:10:40.000000000 +0200
-+++ php5-5.2.9.dfsg.1/main/php.h 2009-05-23 10:10:43.000000000 +0200
-@@ -249,6 +249,10 @@
+--- pkg-php.orig/main/php.h
++++ pkg-php/main/php.h
+@@ -248,6 +248,10 @@ END_EXTERN_C()
/* macros */
#define STR_PRINT(str) ((str)?(str):"")
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index 4c28e70..b40e78a 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,7 +1,5 @@
-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
+--- pkg-php.orig/sapi/cli/php.1.in
++++ pkg-php/sapi/cli/php.1.in
@@ -1,6 +1,5 @@
.TH PHP 1 "2009" "The PHP Group" "Scripting Language"
.SH NAME
@@ -9,10 +7,8 @@ Index: pkg-php/sapi/cli/php.1.in
php \- PHP Command Line Interface 'CLI'
.SH SYNOPSIS
.B php
-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
+--- pkg-php.orig/scripts/man1/php-config.1.in
++++ pkg-php/scripts/man1/php-config.1.in
@@ -1,6 +1,5 @@
.TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
@@ -20,10 +16,8 @@ Index: pkg-php/scripts/man1/php-config.1.in
php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS
.B php\-config
-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
+--- pkg-php.orig/scripts/man1/phpize.1.in
++++ pkg-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 0fa0c72..737b0d7 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/soap/tests/server009.phpt
++++ pkg-php/ext/soap/tests/server009.phpt
+@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
die('skip this test needs session extension');
}
?>
@@ -13,10 +11,8 @@ Index: pkg-php/ext/soap/tests/server009.phpt
--FILE--
<?php
class foo {
-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
+--- pkg-php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ pkg-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 e5c4452..ce80f28 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/mysql/config.m4
++++ pkg-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
@@ -11,11 +9,9 @@ Index: pkg-php/ext/mysql/config.m4
MYSQL_LIBNAME=mysqlclient_r
else
MYSQL_LIBNAME=mysqlclient
-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 @@
+--- pkg-php.orig/ext/mysqli/config.m4
++++ pkg-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
mysqli_extra_sources="mysqli_embedded.c"
@@ -24,11 +20,9 @@ Index: pkg-php/ext/mysqli/config.m4
MYSQL_LIB_CFG='--libs_r'
MYSQL_LIB_NAME='mysqlclient_r'
else
-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 @@
+--- pkg-php.orig/ext/pdo_mysql/config.m4
++++ pkg-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/gentoo/006_ext-curl-set_opt-crash.patch b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
index f8fae59..e3775e7 100644
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
@@ -3,11 +3,9 @@ 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)
-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 @@
+--- pkg-php.orig/ext/curl/interface.c
++++ pkg-php/ext/curl/interface.c
+@@ -1850,6 +1850,7 @@ static int _php_curl_setopt(php_curl *ch
#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 3682cdb..716f5e3 100644
--- a/debian/patches/gentoo/009_ob-memory-leaks.patch
+++ b/debian/patches/gentoo/009_ob-memory-leaks.patch
@@ -3,11 +3,9 @@ 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.
-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 @@
+--- pkg-php.orig/main/output.c
++++ pkg-php/main/output.c
+@@ -818,10 +818,12 @@ PHP_FUNCTION(ob_end_flush)
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.");
@@ -20,7 +18,7 @@ Index: pkg-php/main/output.c
RETURN_FALSE;
}
-@@ -840,10 +842,12 @@
+@@ -840,10 +842,12 @@ PHP_FUNCTION(ob_end_clean)
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 a50f1cd..b158557 100644
--- a/debian/patches/libdb_is_-ldb
+++ b/debian/patches/libdb_is_-ldb
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/dba/config.m4
++++ pkg-php/ext/dba/config.m4
+@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
done
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index 81292b9..bfefdda 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/ext/readline/config.m4
++++ pkg-php/ext/readline/config.m4
+@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
elif test "$PHP_LIBEDIT" != "no"; then
for i in $PHP_LIBEDIT /usr/local /usr; do
@@ -11,10 +9,8 @@ Index: pkg-php/ext/readline/config.m4
done
if test -z "$LIBEDIT_DIR"; then
-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
+--- pkg-php.orig/ext/readline/readline.c
++++ pkg-php/ext/readline/readline.c
@@ -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 bc4a1c4..f471b20 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/scripts/phpize.in
++++ pkg-php/scripts/phpize.in
+@@ -5,10 +5,16 @@ prefix='@prefix@'
exec_prefix="`eval echo @exec_prefix@`"
phpdir="$prefix/lib/php5/build"
includedir="$prefix/include/php5"
@@ -20,7 +18,7 @@ Index: pkg-php/scripts/phpize.in
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 @@
+@@ -144,8 +150,9 @@ phpize_copy_files()
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 e32def1..656c3f9 100644
--- a/debian/patches/manpage_spelling.patch
+++ b/debian/patches/manpage_spelling.patch
@@ -1,8 +1,6 @@
-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 @@
+--- pkg-php.orig/sapi/cli/php.1.in
++++ pkg-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
contains the number of the actual line being processed. Further more
@@ -11,7 +9,7 @@ Index: pkg-php/sapi/cli/php.1.in
.IR code
(see \-r) before and
after all input lines have been processed respectively. Notice that the
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ The configuration file for the CGI versi
The configuration file for the version of PHP that apache2 uses.
.SH EXAMPLES
.TP 5
@@ -20,7 +18,7 @@ Index: pkg-php/sapi/cli/php.1.in
This command simply writes the text "Hello World" to standard out.
.TP
\fIphp \-r 'print_r(gd_info());'\fP
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ configuration information. If you then c
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 29e7f22..ef662ec 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -8,11 +8,9 @@ the following modifications have been made:
* removed changes to ./configure since this file is autogenerated
* "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:43:40.000000000 +0200
-+++ pkg-php/Zend/Makefile.am 2009-08-25 15:44:03.000000000 +0200
-@@ -17,7 +17,7 @@
+--- pkg-php.orig/Zend/Makefile.am
++++ pkg-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 \
@@ -21,11 +19,9 @@ Index: pkg-php/Zend/Makefile.am
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-Index: pkg-php/Zend/Zend.dsp
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/Zend.dsp
++++ pkg-php/Zend/Zend.dsp
+@@ -247,6 +247,14 @@ SOURCE=.\zend_strtod.c
# End Source File
# Begin Source File
@@ -40,11 +36,9 @@ Index: pkg-php/Zend/Zend.dsp
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-Index: pkg-php/Zend/ZendTS.dsp
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/ZendTS.dsp
++++ pkg-php/Zend/ZendTS.dsp
+@@ -277,6 +277,14 @@ SOURCE=.\zend_strtod.c
# End Source File
# Begin Source File
@@ -59,11 +53,9 @@ Index: pkg-php/Zend/ZendTS.dsp
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-Index: pkg-php/Zend/zend.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend.c
++++ pkg-php/Zend/zend.c
+@@ -60,6 +60,10 @@ 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);
@@ -74,7 +66,7 @@ Index: pkg-php/Zend/zend.c
void (*zend_on_timeout)(int seconds TSRMLS_DC);
static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC);
-@@ -88,6 +92,74 @@
+@@ -88,6 +92,74 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /*
}
/* }}} */
@@ -149,11 +141,9 @@ Index: pkg-php/Zend/zend.c
ZEND_INI_BEGIN()
ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
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:43:40.000000000 +0200
-+++ pkg-php/Zend/zend.h 2009-08-25 15:44:03.000000000 +0200
-@@ -645,6 +645,9 @@
+--- pkg-php.orig/Zend/zend.h
++++ pkg-php/Zend/zend.h
+@@ -645,6 +645,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);
@@ -163,7 +153,7 @@ Index: pkg-php/Zend/zend.h
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -784,6 +787,14 @@
+@@ -784,6 +787,14 @@ 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);
@@ -178,10 +168,8 @@ Index: pkg-php/Zend/zend.h
#endif /* ZEND_H */
/*
-Index: pkg-php/Zend/zend_alloc.c
-===================================================================
---- 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
+--- pkg-php.orig/Zend/zend_alloc.c
++++ pkg-php/Zend/zend_alloc.c
@@ -32,6 +32,10 @@
# include <unistd.h>
#endif
@@ -201,7 +189,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if ZEND_DEBUG
void zend_debug_alloc_output(char *format, ...)
{
-@@ -76,6 +81,7 @@
+@@ -76,6 +81,7 @@ void zend_debug_alloc_output(char *forma
#endif
}
#endif
@@ -209,7 +197,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
static void zend_mm_panic(const char *message) __attribute__ ((noreturn));
-@@ -324,13 +330,28 @@
+@@ -324,13 +330,28 @@ static const zend_mm_mem_handlers mem_ha
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -240,7 +228,7 @@ Index: pkg-php/Zend/zend_alloc.c
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -404,7 +425,7 @@
+@@ -404,7 +425,7 @@ typedef struct _zend_mm_free_block {
# define ZEND_MM_CACHE_STAT 0
#endif
@@ -249,7 +237,7 @@ Index: pkg-php/Zend/zend_alloc.c
int use_zend_alloc;
void *(*_malloc)(size_t);
void (*_free)(void*);
-@@ -439,6 +460,9 @@
+@@ -439,6 +460,9 @@ struct _zend_mm_heap {
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
@@ -259,7 +247,7 @@ Index: pkg-php/Zend/zend_alloc.c
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -528,15 +552,15 @@
+@@ -528,15 +552,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))
@@ -278,7 +266,7 @@ Index: pkg-php/Zend/zend_alloc.c
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -598,6 +622,44 @@
+@@ -598,6 +622,44 @@ static unsigned int _zend_mm_cookie = 0;
#endif
@@ -323,7 +311,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if ZEND_MM_HEAP_PROTECTION
-@@ -718,7 +780,7 @@
+@@ -718,7 +780,7 @@ static inline unsigned int zend_mm_low_b
#endif
}
@@ -332,7 +320,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
zend_mm_free_block *prev, *next;
-@@ -735,7 +797,7 @@
+@@ -735,7 +797,7 @@ static inline void zend_mm_add_to_rest_l
prev->next_free_block = next->prev_free_block = mm_block;
}
@@ -341,7 +329,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
size_t size;
size_t index;
-@@ -796,7 +858,7 @@
+@@ -796,7 +858,7 @@ static inline void zend_mm_add_to_free_l
}
}
@@ -350,7 +338,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
zend_mm_free_block *prev = mm_block->prev_free_block;
zend_mm_free_block *next = mm_block->next_free_block;
-@@ -806,6 +868,12 @@
+@@ -806,6 +868,12 @@ static inline void zend_mm_remove_from_f
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
@@ -363,7 +351,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -844,6 +912,13 @@
+@@ -844,6 +912,13 @@ subst_block:
}
} else {
@@ -377,7 +365,7 @@ Index: pkg-php/Zend/zend_alloc.c
#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");
-@@ -867,7 +942,7 @@
+@@ -867,7 +942,7 @@ subst_block:
}
}
@@ -386,7 +374,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
zend_mm_free_block* p;
int i;
-@@ -891,6 +966,13 @@
+@@ -891,6 +966,13 @@ 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);
@@ -400,7 +388,7 @@ Index: pkg-php/Zend/zend_alloc.c
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -999,11 +1081,16 @@
+@@ -999,11 +1081,16 @@ static void zend_mm_random(unsigned char
}
#endif
@@ -418,7 +406,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
zend_mm_storage *storage;
zend_mm_heap *heap;
-@@ -1073,12 +1160,12 @@
+@@ -1073,12 +1160,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
heap->reserve = NULL;
heap->reserve_size = reserve_size;
if (reserve_size > 0) {
@@ -433,7 +421,7 @@ Index: pkg-php/Zend/zend_alloc.c
*mm_heap = *heap;
-@@ -1109,7 +1196,11 @@
+@@ -1109,7 +1196,11 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
return heap;
}
@@ -446,7 +434,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
int i;
size_t seg_size;
-@@ -1163,6 +1254,27 @@
+@@ -1163,6 +1254,27 @@ ZEND_API zend_mm_heap *zend_mm_startup(v
return heap;
}
@@ -474,7 +462,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if ZEND_DEBUG
static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b)
{
-@@ -1531,7 +1643,11 @@
+@@ -1531,7 +1643,11 @@ static int zend_mm_check_heap(zend_mm_he
}
#endif
@@ -487,7 +475,7 @@ Index: pkg-php/Zend/zend_alloc.c
{
zend_mm_storage *storage;
zend_mm_segment *segment;
-@@ -1541,7 +1657,7 @@
+@@ -1541,7 +1657,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
if (heap->reserve) {
#if ZEND_DEBUG
if (!silent) {
@@ -496,7 +484,7 @@ Index: pkg-php/Zend/zend_alloc.c
}
#endif
heap->reserve = NULL;
-@@ -1624,12 +1740,23 @@
+@@ -1624,12 +1740,23 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
heap->size = 0;
heap->peak = 0;
if (heap->reserve_size) {
@@ -521,7 +509,7 @@ Index: pkg-php/Zend/zend_alloc.c
static void zend_mm_safe_error(zend_mm_heap *heap,
const char *format,
size_t limit,
-@@ -1640,7 +1767,11 @@
+@@ -1640,7 +1767,11 @@ static void zend_mm_safe_error(zend_mm_h
size_t size)
{
if (heap->reserve) {
@@ -533,7 +521,7 @@ Index: pkg-php/Zend/zend_alloc.c
heap->reserve = NULL;
}
if (heap->overflow == 0) {
-@@ -1763,6 +1894,9 @@
+@@ -1763,6 +1894,9 @@ static zend_mm_free_block *zend_mm_searc
return best_fit->next_free_block;
}
@@ -543,7 +531,7 @@ Index: pkg-php/Zend/zend_alloc.c
static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
zend_mm_free_block *best_fit;
-@@ -1772,7 +1906,7 @@
+@@ -1772,7 +1906,7 @@ static void *_zend_mm_alloc_int(zend_mm_
size_t segment_size;
zend_mm_segment *segment;
int keep_rest = 0;
@@ -552,7 +540,7 @@ Index: pkg-php/Zend/zend_alloc.c
if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) {
size_t index = ZEND_MM_BUCKET_INDEX(true_size);
size_t bitmap;
-@@ -1790,6 +1924,11 @@
+@@ -1790,6 +1924,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;
@@ -564,7 +552,7 @@ Index: pkg-php/Zend/zend_alloc.c
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);
-@@ -1929,13 +2068,19 @@
+@@ -1929,13 +2068,19 @@ zend_mm_finished_searching_for_block:
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -585,7 +573,7 @@ Index: pkg-php/Zend/zend_alloc.c
return ZEND_MM_DATA_OF(best_fit);
}
-@@ -1952,12 +2097,19 @@
+@@ -1952,12 +2097,19 @@ static void _zend_mm_free_int(zend_mm_he
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -606,7 +594,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if ZEND_MM_CACHE
if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) {
size_t index = ZEND_MM_BUCKET_INDEX(size);
-@@ -2000,6 +2152,9 @@
+@@ -2000,6 +2152,9 @@ static void _zend_mm_free_int(zend_mm_he
HANDLE_UNBLOCK_INTERRUPTIONS();
}
@@ -616,7 +604,7 @@ Index: pkg-php/Zend/zend_alloc.c
static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p);
-@@ -2009,11 +2164,18 @@
+@@ -2009,11 +2164,18 @@ static void *_zend_mm_realloc_int(zend_m
void *ptr;
if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
@@ -635,7 +623,7 @@ Index: pkg-php/Zend/zend_alloc.c
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2045,6 +2207,11 @@
+@@ -2045,6 +2207,11 @@ static void *_zend_mm_realloc_int(zend_m
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -647,7 +635,7 @@ Index: pkg-php/Zend/zend_alloc.c
return p;
}
-@@ -2063,14 +2230,19 @@
+@@ -2063,14 +2230,19 @@ static void *_zend_mm_realloc_int(zend_m
best_fit = heap->cache[index];
heap->cache[index] = best_fit->prev_free_block;
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
@@ -670,7 +658,7 @@ Index: pkg-php/Zend/zend_alloc.c
#endif
heap->cached -= true_size - orig_size;
-@@ -2086,7 +2258,6 @@
+@@ -2086,7 +2258,6 @@ static void *_zend_mm_realloc_int(zend_m
heap->cache_stat[index].max_count = heap->cache_stat[index].count;
}
#endif
@@ -678,7 +666,7 @@ Index: pkg-php/Zend/zend_alloc.c
return ptr;
}
}
-@@ -2129,6 +2300,11 @@
+@@ -2129,6 +2300,11 @@ static void *_zend_mm_realloc_int(zend_m
heap->peak = heap->size;
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -690,7 +678,7 @@ Index: pkg-php/Zend/zend_alloc.c
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) {
-@@ -2231,38 +2407,90 @@
+@@ -2231,38 +2407,90 @@ out_of_memory:
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -785,7 +773,7 @@ Index: pkg-php/Zend/zend_alloc.c
if (!ZEND_MM_VALID_PTR(p)) {
return 0;
}
-@@ -2275,6 +2503,8 @@
+@@ -2275,6 +2503,8 @@ ZEND_API size_t _zend_mm_block_size(zend
#endif
}
@@ -794,7 +782,7 @@ Index: pkg-php/Zend/zend_alloc.c
/**********************/
/* Allocation Manager */
/**********************/
-@@ -2291,6 +2521,7 @@
+@@ -2291,6 +2521,7 @@ static int alloc_globals_id;
static zend_alloc_globals alloc_globals;
#endif
@@ -802,7 +790,7 @@ Index: pkg-php/Zend/zend_alloc.c
ZEND_API int is_zend_mm(TSRMLS_D)
{
return AG(mm_heap)->use_zend_alloc;
-@@ -2303,7 +2534,13 @@
+@@ -2303,7 +2534,13 @@ ZEND_API void *_emalloc(size_t size ZEND
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return AG(mm_heap)->_malloc(size);
}
@@ -816,7 +804,7 @@ Index: pkg-php/Zend/zend_alloc.c
}
ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2314,7 +2551,13 @@
+@@ -2314,7 +2551,13 @@ ZEND_API void _efree(void *ptr ZEND_FILE
AG(mm_heap)->_free(ptr);
return;
}
@@ -831,7 +819,7 @@ Index: pkg-php/Zend/zend_alloc.c
}
ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2324,7 +2567,13 @@
+@@ -2324,7 +2567,13 @@ ZEND_API void *_erealloc(void *ptr, size
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return AG(mm_heap)->_realloc(ptr, size);
}
@@ -845,7 +833,7 @@ Index: pkg-php/Zend/zend_alloc.c
}
ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2332,8 +2581,15 @@
+@@ -2332,8 +2581,15 @@ ZEND_API size_t _zend_mem_block_size(voi
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return 0;
}
@@ -862,7 +850,7 @@ Index: pkg-php/Zend/zend_alloc.c
#if defined(__GNUC__) && defined(i386)
-@@ -2404,7 +2660,7 @@
+@@ -2404,7 +2660,7 @@ static inline size_t safe_address(size_t
}
#endif
@@ -871,7 +859,7 @@ Index: pkg-php/Zend/zend_alloc.c
ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
return emalloc_rel(safe_address(nmemb, size, offset));
-@@ -2517,6 +2773,7 @@
+@@ -2517,6 +2773,7 @@ ZEND_API void shutdown_memory_manager(in
{
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC);
}
@@ -879,7 +867,7 @@ Index: pkg-php/Zend/zend_alloc.c
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
-@@ -2541,6 +2798,7 @@
+@@ -2541,6 +2798,7 @@ static void alloc_globals_dtor(zend_allo
}
#endif
@@ -887,7 +875,7 @@ Index: pkg-php/Zend/zend_alloc.c
ZEND_API void start_memory_manager(TSRMLS_D)
{
#ifdef ZTS
-@@ -2605,6 +2863,7 @@
+@@ -2605,6 +2863,7 @@ ZEND_API void _full_mem_check(int silent
zend_debug_alloc_output("------------------------------------------------\n");
}
#endif
@@ -895,11 +883,9 @@ 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:43:40.000000000 +0200
-+++ pkg-php/Zend/zend_alloc.h 2009-08-25 15:44:03.000000000 +0200
-@@ -189,6 +189,8 @@
+--- pkg-php.orig/Zend/zend_alloc.h
++++ pkg-php/Zend/zend_alloc.h
+@@ -189,6 +189,8 @@ END_EXTERN_C()
/* Heap functions */
typedef struct _zend_mm_heap zend_mm_heap;
@@ -908,10 +894,8 @@ Index: pkg-php/Zend/zend_alloc.h
ZEND_API zend_mm_heap *zend_mm_startup(void);
ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC);
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-php/Zend/zend_alloc_canary.c
@@ -0,0 +1,2441 @@
+/*
+ +----------------------------------------------------------------------+
@@ -3354,10 +3338,8 @@ Index: pkg-php/Zend/zend_alloc_canary.c
+ * End:
+ */
+
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-php/Zend/zend_canary.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -3423,11 +3405,9 @@ Index: pkg-php/Zend/zend_canary.c
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: pkg-php/Zend/zend_compile.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend_compile.c
++++ pkg-php/Zend/zend_compile.c
+@@ -69,6 +69,11 @@ static void zend_destroy_property_info_i
free(property_info->name);
}
@@ -3439,11 +3419,9 @@ Index: pkg-php/Zend/zend_compile.c
static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC)
{
char char_pos_buf[32];
-Index: pkg-php/Zend/zend_compile.h
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend_compile.h
++++ pkg-php/Zend/zend_compile.h
+@@ -606,6 +606,11 @@ ZEND_API zend_bool zend_is_auto_global(c
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);
@@ -3455,11 +3433,9 @@ Index: pkg-php/Zend/zend_compile.h
int zendlex(znode *zendlval TSRMLS_DC);
/* BEGIN: OPCODES */
-Index: pkg-php/Zend/zend_constants.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend_constants.c
++++ pkg-php/Zend/zend_constants.c
+@@ -113,6 +113,76 @@ void zend_register_standard_constants(TS
REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
@@ -3536,10 +3512,8 @@ Index: pkg-php/Zend/zend_constants.c
/* true/false constants */
{
zend_constant c;
-Index: pkg-php/Zend/zend_errors.h
-===================================================================
---- 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
+--- pkg-php.orig/Zend/zend_errors.h
++++ pkg-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)
@@ -3561,10 +3535,8 @@ Index: pkg-php/Zend/zend_errors.h
#endif /* ZEND_ERRORS_H */
/*
-Index: pkg-php/Zend/zend_hash.c
-===================================================================
---- 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
+--- pkg-php.orig/Zend/zend_hash.c
++++ pkg-php/Zend/zend_hash.c
@@ -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 $ */
@@ -3573,7 +3545,7 @@ Index: pkg-php/Zend/zend_hash.c
#define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
(element)->pNext = (list_head); \
-@@ -133,6 +134,191 @@
+@@ -133,6 +134,191 @@ ZEND_API ulong zend_hash_func(const char
}
@@ -3765,7 +3737,7 @@ Index: pkg-php/Zend/zend_hash.c
ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
{
-@@ -153,6 +339,7 @@
+@@ -153,6 +339,7 @@ ZEND_API int _zend_hash_init(HashTable *
ht->nTableMask = ht->nTableSize - 1;
ht->pDestructor = pDestructor;
@@ -3773,7 +3745,7 @@ Index: pkg-php/Zend/zend_hash.c
ht->arBuckets = NULL;
ht->pListHead = NULL;
ht->pListTail = NULL;
-@@ -230,6 +417,7 @@
+@@ -230,6 +417,7 @@ ZEND_API int _zend_hash_add_or_update(Ha
return FAILURE;
}
#endif
@@ -3781,7 +3753,7 @@ Index: pkg-php/Zend/zend_hash.c
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -295,6 +483,7 @@
+@@ -295,6 +483,7 @@ ZEND_API int _zend_hash_quick_add_or_upd
return FAILURE;
}
#endif
@@ -3789,7 +3761,7 @@ Index: pkg-php/Zend/zend_hash.c
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -370,6 +559,7 @@
+@@ -370,6 +559,7 @@ ZEND_API int _zend_hash_index_update_or_
return FAILURE;
}
#endif
@@ -3797,7 +3769,7 @@ Index: pkg-php/Zend/zend_hash.c
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -493,6 +683,7 @@
+@@ -493,6 +683,7 @@ ZEND_API int zend_hash_del_key_or_index(
if (ht->pInternalPointer == p) {
ht->pInternalPointer = p->pListNext;
}
@@ -3805,7 +3777,7 @@ Index: pkg-php/Zend/zend_hash.c
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -519,6 +710,7 @@
+@@ -519,6 +710,7 @@ ZEND_API void zend_hash_destroy(HashTabl
SET_INCONSISTENT(HT_IS_DESTROYING);
p = ht->pListHead;
@@ -3813,7 +3785,7 @@ Index: pkg-php/Zend/zend_hash.c
while (p != NULL) {
q = p;
p = p->pListNext;
-@@ -545,6 +737,7 @@
+@@ -545,6 +737,7 @@ ZEND_API void zend_hash_clean(HashTable
SET_INCONSISTENT(HT_CLEANING);
p = ht->pListHead;
@@ -3821,7 +3793,7 @@ Index: pkg-php/Zend/zend_hash.c
while (p != NULL) {
q = p;
p = p->pListNext;
-@@ -607,6 +800,7 @@
+@@ -607,6 +800,7 @@ static Bucket *zend_hash_apply_deleter(H
ht->nNumOfElements--;
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -3829,10 +3801,8 @@ Index: pkg-php/Zend/zend_hash.c
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-Index: pkg-php/Zend/zend_llist.c
-===================================================================
---- 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
+--- pkg-php.orig/Zend/zend_llist.c
++++ pkg-php/Zend/zend_llist.c
@@ -23,6 +23,186 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -4020,7 +3990,7 @@ Index: pkg-php/Zend/zend_llist.c
ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
{
l->head = NULL;
-@@ -30,6 +210,7 @@
+@@ -30,6 +210,7 @@ ZEND_API void zend_llist_init(zend_llist
l->count = 0;
l->size = size;
l->dtor = dtor;
@@ -4028,7 +3998,7 @@ Index: pkg-php/Zend/zend_llist.c
l->persistent = persistent;
}
-@@ -81,6 +262,7 @@
+@@ -81,6 +262,7 @@ ZEND_API void zend_llist_prepend_element
} else {\
(l)->tail = (current)->prev;\
}\
@@ -4036,7 +4006,7 @@ Index: pkg-php/Zend/zend_llist.c
if ((l)->dtor) {\
(l)->dtor((current)->data);\
}\
-@@ -108,6 +290,7 @@
+@@ -108,6 +290,7 @@ ZEND_API void zend_llist_destroy(zend_ll
{
zend_llist_element *current=l->head, *next;
@@ -4044,7 +4014,7 @@ Index: pkg-php/Zend/zend_llist.c
while (current) {
next = current->next;
if (l->dtor) {
-@@ -133,6 +316,7 @@
+@@ -133,6 +316,7 @@ ZEND_API void *zend_llist_remove_tail(ze
zend_llist_element *old_tail;
void *data;
@@ -4052,11 +4022,9 @@ Index: pkg-php/Zend/zend_llist.c
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-Index: pkg-php/Zend/zend_operators.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend_operators.c
++++ pkg-php/Zend/zend_operators.c
+@@ -152,9 +152,14 @@ ZEND_API void convert_scalar_to_number(z
case IS_STRING:
{
char *strval;
@@ -4072,7 +4040,7 @@ Index: pkg-php/Zend/zend_operators.c
ZVAL_LONG(op, 0);
}
STR_FREE(strval);
-@@ -186,7 +191,8 @@
+@@ -186,7 +191,8 @@ ZEND_API void convert_scalar_to_number(z
} else { \
switch (Z_TYPE_P(op)) { \
case IS_STRING: \
@@ -4082,7 +4050,7 @@ Index: pkg-php/Zend/zend_operators.c
if ((Z_TYPE(holder)=is_numeric_string(Z_STRVAL_P(op), Z_STRLEN_P(op), &Z_LVAL(holder), &Z_DVAL(holder), 1)) == 0) { \
ZVAL_LONG(&(holder), 0); \
} \
-@@ -228,6 +234,7 @@
+@@ -228,6 +234,7 @@ ZEND_API void convert_scalar_to_number(z
Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \
break; \
case IS_STRING: \
@@ -4090,7 +4058,7 @@ Index: pkg-php/Zend/zend_operators.c
Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \
break; \
case IS_ARRAY: \
-@@ -270,6 +277,7 @@
+@@ -270,6 +277,7 @@ ZEND_API void convert_scalar_to_number(z
Z_LVAL(holder) = (Z_DVAL_P(op) ? 1 : 0); \
break; \
case IS_STRING: \
@@ -4098,7 +4066,7 @@ Index: pkg-php/Zend/zend_operators.c
if (Z_STRLEN_P(op) == 0 \
|| (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { \
Z_LVAL(holder) = 0; \
-@@ -355,6 +363,9 @@
+@@ -355,6 +363,9 @@ ZEND_API void convert_to_long_base(zval
{
char *strval = Z_STRVAL_P(op);
@@ -4108,7 +4076,7 @@ Index: pkg-php/Zend/zend_operators.c
Z_LVAL_P(op) = strtol(strval, NULL, base);
STR_FREE(strval);
}
-@@ -415,6 +426,9 @@
+@@ -415,6 +426,9 @@ ZEND_API void convert_to_double(zval *op
{
char *strval = Z_STRVAL_P(op);
@@ -4118,7 +4086,7 @@ Index: pkg-php/Zend/zend_operators.c
Z_DVAL_P(op) = zend_strtod(strval, NULL);
STR_FREE(strval);
}
-@@ -501,8 +515,14 @@
+@@ -501,8 +515,14 @@ ZEND_API void convert_to_boolean(zval *o
if (Z_STRLEN_P(op) == 0
|| (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) {
@@ -4133,7 +4101,7 @@ Index: pkg-php/Zend/zend_operators.c
Z_LVAL_P(op) = 1;
}
STR_FREE(strval);
-@@ -616,6 +636,9 @@
+@@ -616,6 +636,9 @@ static void convert_scalar_to_array(zval
*entry = *op;
INIT_PZVAL(entry);
@@ -4143,11 +4111,9 @@ Index: pkg-php/Zend/zend_operators.c
switch (type) {
case IS_ARRAY:
ALLOC_HASHTABLE(Z_ARRVAL_P(op));
-Index: pkg-php/Zend/zend_variables.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/Zend/zend_variables.c
++++ pkg-php/Zend/zend_variables.c
+@@ -34,6 +34,9 @@ ZEND_API void _zval_dtor_func(zval *zval
case IS_CONSTANT:
CHECK_ZVAL_STRING_REL(zvalue);
STR_FREE_REL(zvalue->value.str.val);
@@ -4157,7 +4123,7 @@ Index: pkg-php/Zend/zend_variables.c
break;
case IS_ARRAY:
case IS_CONSTANT_ARRAY: {
-@@ -78,6 +81,9 @@
+@@ -78,6 +81,9 @@ ZEND_API void _zval_internal_dtor(zval *
case IS_CONSTANT:
CHECK_ZVAL_STRING_REL(zvalue);
free(zvalue->value.str.val);
@@ -4167,11 +4133,9 @@ Index: pkg-php/Zend/zend_variables.c
break;
case IS_ARRAY:
case IS_CONSTANT_ARRAY:
-Index: pkg-php/configure.in
-===================================================================
---- 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 @@
+--- pkg-php.orig/configure.in
++++ pkg-php/configure.in
+@@ -307,6 +307,7 @@ sinclude(Zend/Zend.m4)
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -4179,7 +4143,7 @@ Index: pkg-php/configure.in
dnl divert(2)
-@@ -1422,7 +1423,7 @@
+@@ -1422,7 +1423,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 \
@@ -4188,7 +4152,7 @@ Index: pkg-php/configure.in
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 \
-@@ -1450,7 +1451,7 @@
+@@ -1450,7 +1451,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 \
@@ -4197,11 +4161,9 @@ Index: pkg-php/configure.in
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)
-Index: pkg-php/ext/standard/dl.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/ext/standard/dl.c
++++ pkg-php/ext/standard/dl.c
+@@ -239,6 +239,23 @@ PHPAPI int php_load_extension(char *file
return FAILURE;
}
}
@@ -4225,11 +4187,9 @@ Index: pkg-php/ext/standard/dl.c
return SUCCESS;
}
/* }}} */
-Index: pkg-php/ext/standard/info.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/ext/standard/info.c
++++ pkg-php/ext/standard/info.c
+@@ -842,6 +842,33 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_end();
@@ -4263,11 +4223,9 @@ Index: pkg-php/ext/standard/info.c
/* Zend Engine */
php_info_print_box_start(0);
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:43:40.000000000 +0200
-+++ pkg-php/ext/standard/syslog.c 2009-08-25 15:44:03.000000000 +0200
-@@ -42,6 +42,7 @@
+--- pkg-php.orig/ext/standard/syslog.c
++++ pkg-php/ext/standard/syslog.c
+@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
*/
PHP_MINIT_FUNCTION(syslog)
{
@@ -4275,7 +4233,7 @@ Index: pkg-php/ext/standard/syslog.c
/* error levels */
REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
-@@ -97,6 +98,7 @@
+@@ -97,6 +98,7 @@ PHP_MINIT_FUNCTION(syslog)
/* AIX doesn't have LOG_PERROR */
REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
#endif
@@ -4283,11 +4241,9 @@ Index: pkg-php/ext/standard/syslog.c
BG(syslog_device)=NULL;
return SUCCESS;
-Index: pkg-php/main/fopen_wrappers.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/main/fopen_wrappers.c
++++ pkg-php/main/fopen_wrappers.c
+@@ -85,15 +85,10 @@ or a tightening during activation/runtim
PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
{
char **p, *pathbuf, *ptr, *end;
@@ -4305,10 +4261,8 @@ Index: pkg-php/main/fopen_wrappers.c
/* We're in a PHP_INI_SYSTEM context, no restrictions */
*p = new_value;
return SUCCESS;
-Index: pkg-php/main/main.c
-===================================================================
---- 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
+--- pkg-php.orig/main/main.c
++++ pkg-php/main/main.c
@@ -90,6 +90,9 @@
#include "SAPI.h"
@@ -4319,7 +4273,7 @@ Index: pkg-php/main/main.c
#if HAVE_SYS_MMAN_H
# include <sys/mman.h>
-@@ -468,7 +471,7 @@
+@@ -468,7 +471,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout)
@@ -4328,7 +4282,7 @@ Index: pkg-php/main/main.c
STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR, PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals)
-@@ -1721,6 +1724,10 @@
+@@ -1721,6 +1724,10 @@ void dummy_invalid_parameter_handler(
}
#endif
@@ -4339,7 +4293,7 @@ Index: pkg-php/main/main.c
/* {{{ php_module_startup
*/
int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules)
-@@ -1765,6 +1772,10 @@
+@@ -1765,6 +1772,10 @@ int php_module_startup(sapi_module_struc
tsrm_ls = ts_resource(0);
#endif
@@ -4350,7 +4304,7 @@ Index: pkg-php/main/main.c
module_shutdown = 0;
module_startup = 1;
sapi_initialize_empty_request(TSRMLS_C);
-@@ -1884,7 +1895,11 @@
+@@ -1884,7 +1895,11 @@ int php_module_startup(sapi_module_struc
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);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
@@ -4363,11 +4317,9 @@ Index: pkg-php/main/main.c
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);
-Index: pkg-php/main/php.h
-===================================================================
---- 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 @@
+--- pkg-php.orig/main/php.h
++++ pkg-php/main/php.h
+@@ -454,6 +454,10 @@ END_EXTERN_C()
#endif
#endif /* !XtOffsetOf */
@@ -4378,10 +4330,8 @@ Index: pkg-php/main/php.h
#endif
/*
-Index: pkg-php/main/php_config.h.in
-===================================================================
---- 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
+--- pkg-php.orig/main/php_config.h.in
++++ pkg-php/main/php_config.h.in
@@ -836,6 +836,9 @@
/* Define if the target system has /dev/urandom device */
#undef HAVE_DEV_URANDOM
@@ -4392,11 +4342,9 @@ Index: pkg-php/main/php_config.h.in
/* Whether you have AOLserver */
#undef HAVE_AOLSERVER
-Index: pkg-php/main/php_logos.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/main/php_logos.c
++++ pkg-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));
}
@@ -4407,7 +4355,7 @@ Index: pkg-php/main/php_logos.c
int php_init_info_logos(void)
{
if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
-@@ -58,7 +62,9 @@
+@@ -58,7 +62,9 @@ int php_init_info_logos(void)
php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
@@ -4418,11 +4366,9 @@ Index: pkg-php/main/php_logos.c
return SUCCESS;
}
-Index: pkg-php/main/snprintf.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/main/snprintf.c
++++ pkg-php/main/snprintf.c
+@@ -1091,7 +1091,11 @@ static int format_converter(register buf
case 'n':
@@ -4434,11 +4380,9 @@ Index: pkg-php/main/snprintf.c
goto skip_output;
/*
-Index: pkg-php/main/spprintf.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/main/spprintf.c
++++ pkg-php/main/spprintf.c
+@@ -698,7 +698,11 @@ static void xbuf_format_converter(smart_
case 'n':
@@ -4450,10 +4394,8 @@ Index: pkg-php/main/spprintf.c
goto skip_output;
/*
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-php/main/suhosin_globals.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -4516,10 +4458,8 @@ Index: pkg-php/main/suhosin_globals.h
+ * c-basic-offset: 4
+ * End:
+ */
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-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"
@@ -4699,10 +4639,8 @@ Index: pkg-php/main/suhosin_logo.h
+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
+ ;
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-php/main/suhosin_patch.c
@@ -0,0 +1,455 @@
+/*
+ +----------------------------------------------------------------------+
@@ -5159,10 +5097,8 @@ Index: pkg-php/main/suhosin_patch.c
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-php/main/suhosin_patch.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -5225,10 +5161,8 @@ Index: pkg-php/main/suhosin_patch.h
+ * c-basic-offset: 4
+ * End:
+ */
-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:44:03.000000000 +0200
+--- /dev/null
++++ pkg-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 $
@@ -5238,11 +5172,9 @@ Index: pkg-php/main/suhosin_patch.m4
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-Index: pkg-php/sapi/apache/mod_php5.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/sapi/apache/mod_php5.c
++++ pkg-php/sapi/apache/mod_php5.c
+@@ -967,7 +967,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -5254,11 +5186,9 @@ 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:43:40.000000000 +0200
-+++ pkg-php/sapi/apache2filter/sapi_apache2.c 2009-08-25 15:44:03.000000000 +0200
-@@ -581,7 +581,11 @@
+--- pkg-php.orig/sapi/apache2filter/sapi_apache2.c
++++ pkg-php/sapi/apache2filter/sapi_apache2.c
+@@ -581,7 +581,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -5270,11 +5200,9 @@ 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:44:03.000000000 +0200
-+++ pkg-php/sapi/apache2handler/sapi_apache2.c 2009-08-25 15:44:03.000000000 +0200
-@@ -386,7 +386,11 @@
+--- pkg-php.orig/sapi/apache2handler/sapi_apache2.c
++++ pkg-php/sapi/apache2handler/sapi_apache2.c
+@@ -386,7 +386,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -5286,11 +5214,9 @@ 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:43:40.000000000 +0200
-+++ pkg-php/sapi/apache_hooks/mod_php5.c 2009-08-25 15:44:03.000000000 +0200
-@@ -1256,7 +1256,11 @@
+--- pkg-php.orig/sapi/apache_hooks/mod_php5.c
++++ pkg-php/sapi/apache_hooks/mod_php5.c
+@@ -1256,7 +1256,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -5302,11 +5228,9 @@ 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:43:40.000000000 +0200
-+++ pkg-php/sapi/cgi/cgi_main.c 2009-08-25 15:44:03.000000000 +0200
-@@ -1907,11 +1907,19 @@
+--- pkg-php.orig/sapi/cgi/cgi_main.c
++++ pkg-php/sapi/cgi/cgi_main.c
+@@ -1907,11 +1907,19 @@ consult the installation file that came
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
@@ -5326,11 +5250,9 @@ Index: pkg-php/sapi/cgi/cgi_main.c
php_request_shutdown((void *) 0);
exit_status = 0;
goto out;
-Index: pkg-php/sapi/cli/php_cli.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/sapi/cli/php_cli.c
++++ pkg-php/sapi/cli/php_cli.c
+@@ -827,7 +827,11 @@ int main(int argc, char *argv[])
}
request_started = 1;
@@ -5343,11 +5265,9 @@ Index: pkg-php/sapi/cli/php_cli.c
PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
-Index: pkg-php/sapi/litespeed/lsapi_main.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/sapi/litespeed/lsapi_main.c
++++ pkg-php/sapi/litespeed/lsapi_main.c
+@@ -545,11 +545,19 @@ static int cli_main( int argc, char * ar
break;
case 'v':
if (php_request_startup(TSRMLS_C) != FAILURE) {
@@ -5367,11 +5287,9 @@ Index: pkg-php/sapi/litespeed/lsapi_main.c
#ifdef PHP_OUTPUT_NEWAPI
php_output_end_all(TSRMLS_C);
#else
-Index: pkg-php/sapi/milter/php_milter.c
-===================================================================
---- 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 @@
+--- pkg-php.orig/sapi/milter/php_milter.c
++++ pkg-php/sapi/milter/php_milter.c
+@@ -1102,7 +1102,11 @@ int main(int argc, char *argv[])
}
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
@@ -5383,11 +5301,9 @@ Index: pkg-php/sapi/milter/php_milter.c
php_end_ob_buffers(1 TSRMLS_CC);
exit(1);
break;
-Index: pkg-php/win32/build/config.w32
-===================================================================
---- 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 @@
+--- pkg-php.orig/win32/build/config.w32
++++ pkg-php/win32/build/config.w32
+@@ -322,7 +322,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 \
@@ -5396,7 +5312,7 @@ Index: pkg-php/win32/build/config.w32
if (VCVERS == 1200) {
AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
-@@ -377,6 +377,7 @@
+@@ -377,6 +377,7 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
@@ -5404,10 +5320,8 @@ Index: pkg-php/win32/build/config.w32
/* For snapshot builders, where can we find the additional
* 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:43:40.000000000 +0200
-+++ pkg-php/win32/build/config.w32.h.in 2009-08-25 15:44:03.000000000 +0200
+--- pkg-php.orig/win32/build/config.w32.h.in
++++ pkg-php/win32/build/config.w32.h.in
@@ -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 789a7d7..7f03a5d 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -17,9 +17,9 @@ 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-5.3.0/ext/date/lib/parse_tz.c.systzdata
-+++ php-5.3.0/ext/date/lib/parse_tz.c
-@@ -20,6 +20,16 @@
+--- pkg-php.orig/ext/date/lib/parse_tz.c
++++ pkg-php/ext/date/lib/parse_tz.c
+@@ -24,6 +24,16 @@
#include "timelib.h"
@@ -36,7 +36,7 @@ r1: initial revision
#include <stdio.h>
#ifdef HAVE_LOCALE_H
-@@ -31,7 +41,12 @@
+@@ -35,7 +45,12 @@
#else
#include <strings.h>
#endif
@@ -49,7 +49,7 @@ r1: initial revision
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
-@@ -51,6 +66,11 @@
+@@ -55,6 +70,11 @@
static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
@@ -61,7 +61,7 @@ r1: initial revision
/* skip ID */
*tzf += 4;
-@@ -253,7 +273,435 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -257,7 +277,435 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
}
@@ -498,7 +498,7 @@ r1: initial revision
{
int left = 0, right = tzdb->index_size - 1;
#ifdef HAVE_SETLOCALE
-@@ -292,36 +740,131 @@ static int seek_to_tz_position(const uns
+@@ -296,36 +744,131 @@ static int seek_to_tz_position(const uns
return 0;
}
@@ -633,8 +633,8 @@ r1: initial revision
} else {
tmp = NULL;
}
---- php-5.3.0/ext/date/lib/timelib.m4.systzdata
-+++ php-5.3.0/ext/date/lib/timelib.m4
+--- pkg-php.orig/ext/date/lib/timelib.m4
++++ pkg-php/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
dnl Check for strtoll, atoll
--
1.6.3.3
More information about the Pkg-php-commits
mailing list