[Pkg-php-commits] [php/debian-experimental] update whitespace/offsets for 37 files in debian/patches
Sean Finney
seanius at debian.org
Wed Jun 24 22:39:49 UTC 2009
the following files have been updated:
* debian/patches/001-libtool_fixes.patch
* debian/patches/002-static_openssl.patch
* debian/patches/004-ldap_fix.patch
* debian/patches/013-force_getaddrinfo.patch
* debian/patches/017-pread_pwrite_disable.patch
* debian/patches/019-z_off_t_as_long.patch
* debian/patches/029-php.ini_paranoid.patch
* debian/patches/033-we_WANT_libtool.patch
* debian/patches/034-apache2_umask_fix.patch
* debian/patches/036-fd_setsize_fix.patch
* debian/patches/043-recode_size_t.patch
* debian/patches/044-strtod_arm_fix.patch
* debian/patches/045-exif_nesting_level.patch
* debian/patches/047-zts_with_dl.patch
* debian/patches/052-phpinfo_no_configure.patch
* debian/patches/053-extension_api.patch
* debian/patches/056-mime_magic_liberal.patch
* debian/patches/057-no_apache_installed.patch
* debian/patches/100-recode_is_shared.patch
* debian/patches/101-sqlite_is_shared.patch
* debian/patches/107-reflection_is_ext.patch
* debian/patches/108-64_bit_datetime.patch
* debian/patches/112-proc_open.patch
* debian/patches/113-php.ini_securitynotes.patch
* debian/patches/bad_whatis_entries.patch
* debian/patches/curl_streams_sleep.patch
* debian/patches/disable_dl_by_default.patch
* debian/patches/fix_broken_upstream_tests.patch
* debian/patches/force_libmysqlclient_r.patch
* debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
* debian/patches/gentoo/009_ob-memory-leaks.patch
* debian/patches/libdb_is_-ldb
* debian/patches/libedit_is_editline.patch
* debian/patches/libtool2.2.patch
* debian/patches/manpage_spelling.patch
* debian/patches/suhosin.patch
* debian/patches/use_embedded_timezonedb.patch
---
debian/patches/001-libtool_fixes.patch | 10 +-
debian/patches/002-static_openssl.patch | 6 +-
debian/patches/004-ldap_fix.patch | 8 +-
debian/patches/013-force_getaddrinfo.patch | 6 +-
debian/patches/017-pread_pwrite_disable.patch | 8 +-
debian/patches/019-z_off_t_as_long.patch | 4 +-
debian/patches/029-php.ini_paranoid.patch | 2 +-
debian/patches/033-we_WANT_libtool.patch | 2 +-
debian/patches/034-apache2_umask_fix.patch | 4 +-
debian/patches/036-fd_setsize_fix.patch | 12 +-
debian/patches/043-recode_size_t.patch | 4 +-
debian/patches/044-strtod_arm_fix.patch | 4 +-
debian/patches/045-exif_nesting_level.patch | 4 +-
debian/patches/047-zts_with_dl.patch | 4 +-
debian/patches/052-phpinfo_no_configure.patch | 8 +-
debian/patches/053-extension_api.patch | 12 +-
debian/patches/056-mime_magic_liberal.patch | 4 +-
debian/patches/057-no_apache_installed.patch | 16 +-
debian/patches/100-recode_is_shared.patch | 4 +-
debian/patches/101-sqlite_is_shared.patch | 4 +-
debian/patches/107-reflection_is_ext.patch | 4 +-
debian/patches/108-64_bit_datetime.patch | 4 +-
debian/patches/112-proc_open.patch | 4 +-
debian/patches/113-php.ini_securitynotes.patch | 4 +-
debian/patches/bad_whatis_entries.patch | 12 +-
debian/patches/curl_streams_sleep.patch | 6 +-
debian/patches/disable_dl_by_default.patch | 8 +-
debian/patches/fix_broken_upstream_tests.patch | 12 +-
debian/patches/force_libmysqlclient_r.patch | 12 +-
.../gentoo/006_ext-curl-set_opt-crash.patch | 9 +-
debian/patches/gentoo/009_ob-memory-leaks.patch | 17 +-
debian/patches/libdb_is_-ldb | 4 +-
debian/patches/libedit_is_editline.patch | 10 +-
debian/patches/libtool2.2.patch | 4 +-
debian/patches/manpage_spelling.patch | 4 +-
debian/patches/suhosin.patch | 216 ++++++++++----------
debian/patches/use_embedded_timezonedb.patch | 18 +-
37 files changed, 234 insertions(+), 240 deletions(-)
diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index 234d24a..5253076 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/TSRM/configure.in
-+++ php5-5.2.9.dfsg.1/TSRM/configure.in
+--- php.orig/TSRM/configure.in
++++ php/TSRM/configure.in
@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
@@ -10,9 +10,9 @@
dnl TSRM_PTHREAD
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -1314,9 +1314,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+--- php.orig/configure.in
++++ php/configure.in
+@@ -1328,9 +1328,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
])
AC_PROG_LIBTOOL
diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 77829ce..5477aed 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/acinclude.m4
-+++ php5-5.2.9.dfsg.1/acinclude.m4
-@@ -2370,9 +2370,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+--- php.orig/acinclude.m4
++++ 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 28bd72f..d09a932 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/ldap/ldap.c
-+++ php5-5.2.9.dfsg.1/ext/ldap/ldap.c
-@@ -1334,7 +1334,7 @@ PHP_FUNCTION(ldap_explode_dn)
+--- php.orig/ext/ldap/ldap.c
++++ php/ext/ldap/ldap.c
+@@ -1335,7 +1335,7 @@ PHP_FUNCTION(ldap_explode_dn)
}
i=0;
@@ -9,7 +9,7 @@
count = i;
array_init(return_value);
-@@ -1344,7 +1344,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1345,7 +1345,8 @@ PHP_FUNCTION(ldap_explode_dn)
add_index_string(return_value, i, ldap_value[i], 1);
}
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index 534cd6b..f0b1571 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -596,50 +596,50 @@ vsnprintf \
+--- php.orig/configure.in
++++ php/configure.in
+@@ -601,50 +601,50 @@ vsnprintf \
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
diff --git a/debian/patches/017-pread_pwrite_disable.patch b/debian/patches/017-pread_pwrite_disable.patch
index b07f11e..779bf35 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/acinclude.m4
-+++ php5-5.2.9.dfsg.1/acinclude.m4
-@@ -1216,7 +1216,7 @@ $1
+--- php.orig/acinclude.m4
++++ php/acinclude.m4
+@@ -1219,7 +1219,7 @@ $1
}
],[
@@ -9,7 +9,7 @@
],[
ac_cv_pwrite=no
],[
-@@ -1245,7 +1245,7 @@ $1
+@@ -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 0697a8a..5980221 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -1,5 +1,5 @@
--- /dev/null
-+++ php5-5.2.9.dfsg.1/ext/zlib/zconf.h
++++ php/ext/zlib/zconf.h
@@ -0,0 +1,326 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -328,7 +328,7 @@
+
+#endif /* ZCONF_H */
--- /dev/null
-+++ php5-5.2.9.dfsg.1/ext/zlib/zlib.h
++++ php/ext/zlib/zlib.h
@@ -0,0 +1,1200 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.1.1, January 9th, 2004
diff --git a/debian/patches/029-php.ini_paranoid.patch b/debian/patches/029-php.ini_paranoid.patch
index 4f3ca89..157d190 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -1,5 +1,5 @@
--- /dev/null
-+++ php5-5.2.9.dfsg.1/php.ini-paranoid
++++ php/php.ini-paranoid
@@ -0,0 +1,1504 @@
+[PHP]
+
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index 5a56dbc..c7f58f1 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -8,7 +8,7 @@ gets included in the build process as part of the phpize stuff. however,
this is solved in ./debian/rules where it's overwritten with a symlink.
--- php.orig/build/build2.mk
+++ php/build/build2.mk
-@@ -52,7 +52,8 @@
+@@ -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 212aec0..ff4d479 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,8 +1,8 @@
Save and restore umask across requests correctly.
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
+--- php.orig/sapi/apache2handler/sapi_apache2.c
++++ php/sapi/apache2handler/sapi_apache2.c
@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch
index 41be315..ab4c63f 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/sockets/sockets.c
-+++ php5-5.2.9.dfsg.1/ext/sockets/sockets.c
-@@ -569,6 +569,7 @@ static int php_sock_array_to_fd_set(zval
+--- php.orig/ext/sockets/sockets.c
++++ php/ext/sockets/sockets.c
+@@ -572,6 +572,7 @@ static int php_sock_array_to_fd_set(zval
php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket);
if (!php_sock) continue; /* If element is not a resource, skip it */
@@ -8,9 +8,9 @@
PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
if (php_sock->bsd_socket > *max_fd) {
---- php5-5.2.9.dfsg.1.orig/ext/standard/streamsfuncs.c
-+++ php5-5.2.9.dfsg.1/ext/standard/streamsfuncs.c
-@@ -596,6 +596,9 @@ static int stream_array_to_fd_set(zval *
+--- php.orig/ext/standard/streamsfuncs.c
++++ php/ext/standard/streamsfuncs.c
+@@ -603,6 +603,9 @@ static int stream_array_to_fd_set(zval *
* is not displayed.
* */
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd >= 0) {
diff --git a/debian/patches/043-recode_size_t.patch b/debian/patches/043-recode_size_t.patch
index 2268202..1d05991 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/recode/recode.c
-+++ php5-5.2.9.dfsg.1/ext/recode/recode.c
+--- php.orig/ext/recode/recode.c
++++ php/ext/recode/recode.c
@@ -136,7 +136,7 @@ PHP_FUNCTION(recode_string)
int req_len, str_len;
char *req, *str;
diff --git a/debian/patches/044-strtod_arm_fix.patch b/debian/patches/044-strtod_arm_fix.patch
index 0753f0d..ea3fe35 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/Zend/zend_strtod.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_strtod.c
+--- php.orig/Zend/zend_strtod.c
++++ php/Zend/zend_strtod.c
@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
#define IEEE_LITTLE_ENDIAN
#endif
diff --git a/debian/patches/045-exif_nesting_level.patch b/debian/patches/045-exif_nesting_level.patch
index a074ce2..683e6e0 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/exif/exif.c
-+++ php5-5.2.9.dfsg.1/ext/exif/exif.c
+--- php.orig/ext/exif/exif.c
++++ php/ext/exif/exif.c
@@ -99,7 +99,7 @@ typedef unsigned char uchar;
#define EFREE_IF(ptr) if (ptr) efree(ptr)
diff --git a/debian/patches/047-zts_with_dl.patch b/debian/patches/047-zts_with_dl.patch
index e2c3c3a..ce084a1 100644
--- a/debian/patches/047-zts_with_dl.patch
+++ b/debian/patches/047-zts_with_dl.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/dl.c
-+++ php5-5.2.9.dfsg.1/ext/standard/dl.c
+--- php.orig/ext/standard/dl.c
++++ php/ext/standard/dl.c
@@ -81,12 +81,7 @@ PHP_FUNCTION(dl)
if ((strncmp(sapi_module.name, "cgi", 3)!=0) &&
(strcmp(sapi_module.name, "cli")!=0) &&
diff --git a/debian/patches/052-phpinfo_no_configure.patch b/debian/patches/052-phpinfo_no_configure.patch
index a865fda..366fc54 100644
--- a/debian/patches/052-phpinfo_no_configure.patch
+++ b/debian/patches/052-phpinfo_no_configure.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/info.c
-+++ php5-5.2.9.dfsg.1/ext/standard/info.c
+--- php.orig/ext/standard/info.c
++++ php/ext/standard/info.c
@@ -487,7 +487,7 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_start();
php_info_print_table_row(2, "System", php_uname );
@@ -9,8 +9,8 @@
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
if (sapi_module.pretty_name) {
---- php5-5.2.9.dfsg.1.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5-5.2.9.dfsg.1/ext/standard/tests/general_functions/phpinfo.phpt
+--- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php/ext/standard/tests/general_functions/phpinfo.phpt
@@ -20,7 +20,6 @@ PHP Version => %s
System => %s
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index 00499e9..6f4bfde 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -1090,8 +1090,13 @@ dnl Build extension directory path
+--- php.orig/configure.in
++++ php/configure.in
+@@ -1104,8 +1104,13 @@ dnl Build extension directory path
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
@@ -15,7 +15,7 @@
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1236,6 +1241,7 @@ PHP_SUBST(CXX)
+@@ -1250,6 +1255,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -23,8 +23,8 @@
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
---- php5-5.2.9.dfsg.1.orig/scripts/php-config.in
-+++ php5-5.2.9.dfsg.1/scripts/php-config.in
+--- php.orig/scripts/php-config.in
++++ php/scripts/php-config.in
@@ -17,6 +17,7 @@ php_cli_binary=NONE
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
diff --git a/debian/patches/056-mime_magic_liberal.patch b/debian/patches/056-mime_magic_liberal.patch
index 3e63f36..d8dcce3 100644
--- a/debian/patches/056-mime_magic_liberal.patch
+++ b/debian/patches/056-mime_magic_liberal.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/mime_magic/mime_magic.c
-+++ php5-5.2.9.dfsg.1/ext/mime_magic/mime_magic.c
+--- php.orig/ext/mime_magic/mime_magic.c
++++ php/ext/mime_magic/mime_magic.c
@@ -501,7 +501,7 @@ static int is_valid_mimetype(char *p, in
} while (*(++p) != '/');
++p;
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 0e00d5a..3e48664 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/config.m4
+--- php.orig/sapi/apache2handler/config.m4
++++ php/sapi/apache2handler/config.m4
@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -21,8 +21,8 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
---- php5-5.2.9.dfsg.1.orig/sapi/apache/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache/config.m4
+--- php.orig/sapi/apache/config.m4
++++ php/sapi/apache/config.m4
@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -40,8 +40,8 @@
for flag in $APXS_CFLAGS; do
case $flag in
---- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache2filter/config.m4
+--- php.orig/sapi/apache2filter/config.m4
++++ php/sapi/apache2filter/config.m4
@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -63,8 +63,8 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
---- php5-5.2.9.dfsg.1.orig/sapi/apache_hooks/config.m4
-+++ php5-5.2.9.dfsg.1/sapi/apache_hooks/config.m4
+--- php.orig/sapi/apache_hooks/config.m4
++++ php/sapi/apache_hooks/config.m4
@@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
diff --git a/debian/patches/100-recode_is_shared.patch b/debian/patches/100-recode_is_shared.patch
index 6ca9d08..3d73714 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/recode/config9.m4
-+++ php5-5.2.9.dfsg.1/ext/recode/config9.m4
+--- php.orig/ext/recode/config9.m4
++++ php/ext/recode/config9.m4
@@ -8,6 +8,6 @@ if test "$PHP_RECODE" != "no"; then
test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
diff --git a/debian/patches/101-sqlite_is_shared.patch b/debian/patches/101-sqlite_is_shared.patch
index 6af4d29..9035218 100644
--- a/debian/patches/101-sqlite_is_shared.patch
+++ b/debian/patches/101-sqlite_is_shared.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/sqlite/config.m4
-+++ php5-5.2.9.dfsg.1/ext/sqlite/config.m4
+--- php.orig/ext/sqlite/config.m4
++++ php/ext/sqlite/config.m4
@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
])
SQLITE_MODULE_TYPE=external
diff --git a/debian/patches/107-reflection_is_ext.patch b/debian/patches/107-reflection_is_ext.patch
index f62873c..73b7307 100644
--- a/debian/patches/107-reflection_is_ext.patch
+++ b/debian/patches/107-reflection_is_ext.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/reflection/config.m4
-+++ php5-5.2.9.dfsg.1/ext/reflection/config.m4
+--- php.orig/ext/reflection/config.m4
++++ php/ext/reflection/config.m4
@@ -2,7 +2,7 @@ dnl $Id: config.m4,v 1.4.2.3.2.1 2006/08
dnl config.m4 for extension reflection
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index 59f38d1..f38aa0a 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/datetime.c
-+++ php5-5.2.9.dfsg.1/ext/standard/datetime.c
+--- php.orig/ext/standard/datetime.c
++++ php/ext/standard/datetime.c
@@ -20,6 +20,9 @@
/* $Id: datetime.c,v 1.134.2.2.2.6 2008/12/31 11:17:44 sebastian Exp $ */
diff --git a/debian/patches/112-proc_open.patch b/debian/patches/112-proc_open.patch
index 999c05b..bcbe70e 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/standard/proc_open.c
-+++ php5-5.2.9.dfsg.1/ext/standard/proc_open.c
+--- php.orig/ext/standard/proc_open.c
++++ php/ext/standard/proc_open.c
@@ -61,7 +61,7 @@
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
diff --git a/debian/patches/113-php.ini_securitynotes.patch b/debian/patches/113-php.ini_securitynotes.patch
index 5d6d5df..aa8534c 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/php.ini-dist
-+++ php5-5.2.9.dfsg.1/php.ini-dist
+--- php.orig/php.ini-dist
++++ php/php.ini-dist
@@ -166,6 +166,11 @@ allow_call_time_pass_reference = On
;
; Safe Mode
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index d05f281..d651e01 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
-+++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
+--- php.orig/sapi/cli/php.1.in
++++ php/sapi/cli/php.1.in
@@ -1,6 +1,5 @@
.TH PHP 1 "2008" "The PHP Group" "Scripting Language"
.SH NAME
@@ -7,8 +7,8 @@
php \- PHP Command Line Interface 'CLI'
.SH SYNOPSIS
.B php
---- php5-5.2.9.dfsg.1.orig/scripts/man1/php-config.1.in
-+++ php5-5.2.9.dfsg.1/scripts/man1/php-config.1.in
+--- php.orig/scripts/man1/php-config.1.in
++++ php/scripts/man1/php-config.1.in
@@ -1,6 +1,5 @@
.TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
@@ -16,8 +16,8 @@
php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS
.B php\-config
---- php5-5.2.9.dfsg.1.orig/scripts/man1/phpize.1.in
-+++ php5-5.2.9.dfsg.1/scripts/man1/phpize.1.in
+--- php.orig/scripts/man1/phpize.1.in
++++ php/scripts/man1/phpize.1.in
@@ -1,7 +1,6 @@
.TH phpize 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
diff --git a/debian/patches/curl_streams_sleep.patch b/debian/patches/curl_streams_sleep.patch
index 7bfc552..2e604a2 100644
--- a/debian/patches/curl_streams_sleep.patch
+++ b/debian/patches/curl_streams_sleep.patch
@@ -1,8 +1,6 @@
-Index: php/ext/curl/streams.c
-===================================================================
--- php.orig/ext/curl/streams.c
+++ php/ext/curl/streams.c
-@@ -166,7 +166,8 @@ static size_t php_curl_stream_read(php_s
+@@ -167,7 +167,8 @@ static size_t php_curl_stream_read(php_s
tv.tv_sec = 15; /* TODO: allow this to be configured from the script */
/* wait for data */
@@ -12,7 +10,7 @@ Index: php/ext/curl/streams.c
case -1:
/* error */
return 0;
-@@ -179,7 +180,8 @@ static size_t php_curl_stream_read(php_s
+@@ -180,7 +181,8 @@ static size_t php_curl_stream_read(php_s
curlstream->mcode = curl_multi_perform(curlstream->multi, &curlstream->pending);
} while (curlstream->mcode == CURLM_CALL_MULTI_PERFORM);
}
diff --git a/debian/patches/disable_dl_by_default.patch b/debian/patches/disable_dl_by_default.patch
index 6fc0cb6..26ab8ba 100644
--- a/debian/patches/disable_dl_by_default.patch
+++ b/debian/patches/disable_dl_by_default.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/php.ini-dist
-+++ php5-5.2.9.dfsg.1/php.ini-dist
+--- php.orig/php.ini-dist
++++ php/php.ini-dist
@@ -510,7 +510,8 @@ user_dir =
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -10,8 +10,8 @@
; cgi.force_redirect is necessary to provide security running PHP as a CGI under
; most web servers. Left undefined, PHP turns this on by default. You can
---- php5-5.2.9.dfsg.1.orig/php.ini-recommended
-+++ php5-5.2.9.dfsg.1/php.ini-recommended
+--- php.orig/php.ini-recommended
++++ php/php.ini-recommended
@@ -544,7 +544,9 @@ user_dir =
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
diff --git a/debian/patches/fix_broken_upstream_tests.patch b/debian/patches/fix_broken_upstream_tests.patch
index ea4a204..0127c13 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/soap/tests/server009.phpt
-+++ php5-5.2.9.dfsg.1/ext/soap/tests/server009.phpt
+--- php.orig/ext/soap/tests/server009.phpt
++++ php/ext/soap/tests/server009.phpt
@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
die('skip this test needs session extension');
}
@@ -11,8 +11,8 @@
--FILE--
<?php
class foo {
---- php5-5.2.9.dfsg.1.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5-5.2.9.dfsg.1/ext/standard/tests/general_functions/phpinfo.phpt
+--- php.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php/ext/standard/tests/general_functions/phpinfo.phpt
@@ -1,5 +1,7 @@
--TEST--
phpinfo()
@@ -29,8 +29,8 @@
PHP API => %d
PHP Extension => %d
Zend Extension => %d
---- php5-5.2.9.dfsg.1.orig/ext/standard/tests/strings/moneyformat.phpt
-+++ php5-5.2.9.dfsg.1/ext/standard/tests/strings/moneyformat.phpt
+--- php.orig/ext/standard/tests/strings/moneyformat.phpt
++++ php/ext/standard/tests/strings/moneyformat.phpt
@@ -5,6 +5,8 @@ money_format test
if (!function_exists('money_format') || !function_exists('setlocale')) {
die("SKIP money_format - not supported\n");
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index a697f37..5251f1c 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/mysql/config.m4
-+++ php5-5.2.9.dfsg.1/ext/mysql/config.m4
+--- php.orig/ext/mysql/config.m4
++++ php/ext/mysql/config.m4
@@ -86,7 +86,7 @@ if test "$PHP_MYSQL" != "no"; then
Note that the MySQL client library is not bundled anymore!])
fi
@@ -9,8 +9,8 @@
MYSQL_LIBNAME=mysqlclient_r
else
MYSQL_LIBNAME=mysqlclient
---- php5-5.2.9.dfsg.1.orig/ext/mysqli/config.m4
-+++ php5-5.2.9.dfsg.1/ext/mysqli/config.m4
+--- php.orig/ext/mysqli/config.m4
++++ php/ext/mysqli/config.m4
@@ -26,7 +26,7 @@ dnl fi
if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
@@ -20,8 +20,8 @@
MYSQL_LIB_CFG='--libs_r'
MYSQL_LIB_NAME='mysqlclient_r'
else
---- php5-5.2.9.dfsg.1.orig/ext/pdo_mysql/config.m4
-+++ php5-5.2.9.dfsg.1/ext/pdo_mysql/config.m4
+--- php.orig/ext/pdo_mysql/config.m4
++++ php/ext/pdo_mysql/config.m4
@@ -58,7 +58,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
if test "x$SED" = "x"; then
AC_PATH_PROG(SED, sed)
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 eb38dcc..71cc5ee 100644
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
@@ -3,12 +3,11 @@ PHP_5_2
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.42&r2=1.62.2.14.2.43&diff_format=u
http://bugs.php.net/bug.php?id=47616
Fixed bug #47616 (curl keeps crashing)
-diff -r 9db107056020 -r 85ef4c1844f0 ext/curl/interface.c
---- a/ext/curl/interface.c Fri Apr 10 11:25:01 2009 +0200
-+++ b/ext/curl/interface.c Fri Apr 10 11:29:41 2009 +0200
-@@ -1550,6 +1550,7 @@
- } else {
+--- php.orig/ext/curl/interface.c
++++ php/ext/curl/interface.c
+@@ -1626,6 +1626,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 */
+ convert_to_string_ex(zvalue);
error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
diff --git a/debian/patches/gentoo/009_ob-memory-leaks.patch b/debian/patches/gentoo/009_ob-memory-leaks.patch
index d8338ab..d1d595c 100644
--- a/debian/patches/gentoo/009_ob-memory-leaks.patch
+++ b/debian/patches/gentoo/009_ob-memory-leaks.patch
@@ -3,11 +3,10 @@ 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.
-diff -r f5a102df944d -r e2602e8d2936 main/output.c
---- a/main/output.c Fri Apr 10 11:35:06 2009 +0200
-+++ b/main/output.c Fri Apr 10 11:37:31 2009 +0200
-@@ -855,10 +855,12 @@
- /* error checks */
+--- php.orig/main/output.c
++++ php/main/output.c
+@@ -806,10 +806,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.");
+ zval_dtor(return_value);
@@ -18,9 +17,9 @@ diff -r f5a102df944d -r e2602e8d2936 main/output.c
+ zval_dtor(return_value);
RETURN_FALSE;
}
- /* flush */
-@@ -880,10 +882,12 @@
- /* error checks */
+
+@@ -828,10 +830,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.");
+ zval_dtor(return_value);
@@ -31,4 +30,4 @@ diff -r f5a102df944d -r e2602e8d2936 main/output.c
+ zval_dtor(return_value);
RETURN_FALSE;
}
- /* delete buffer */
+
diff --git a/debian/patches/libdb_is_-ldb b/debian/patches/libdb_is_-ldb
index efe6222..3001d86 100644
--- a/debian/patches/libdb_is_-ldb
+++ b/debian/patches/libdb_is_-ldb
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/ext/dba/config.m4
-+++ php5-5.2.9.dfsg.1/ext/dba/config.m4
+--- php.orig/ext/dba/config.m4
++++ php/ext/dba/config.m4
@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index bc6ec8d..b08e6dc 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,6 +1,6 @@
---- php5-5.2.9.dfsg.1.orig/ext/readline/config.m4
-+++ php5-5.2.9.dfsg.1/ext/readline/config.m4
-@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+--- php.orig/ext/readline/config.m4
++++ 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
@@ -9,8 +9,8 @@
done
if test -z "$LIBEDIT_DIR"; then
---- php5-5.2.9.dfsg.1.orig/ext/readline/readline.c
-+++ php5-5.2.9.dfsg.1/ext/readline/readline.c
+--- php.orig/ext/readline/readline.c
++++ php/ext/readline/readline.c
@@ -33,8 +33,10 @@
#define rl_completion_matches completion_matches
#endif
diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
index 7c5d6bb..8a7b938 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,5 +1,3 @@
-Index: php/scripts/phpize.in
-===================================================================
--- php.orig/scripts/phpize.in
+++ php/scripts/phpize.in
@@ -5,10 +5,16 @@ prefix='@prefix@'
@@ -20,7 +18,7 @@ Index: 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 \
-@@ -126,8 +132,9 @@ phpize_copy_files()
+@@ -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 bdcaf2d..0f69d17 100644
--- a/debian/patches/manpage_spelling.patch
+++ b/debian/patches/manpage_spelling.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
-+++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
+--- php.orig/sapi/cli/php.1.in
++++ php/sapi/cli/php.1.in
@@ -69,7 +69,7 @@ specified by \-F to be executed.
You can access the input line by \fB$argn\fP. While processing the input lines
.B $argi
diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index a4e5d45..aeb75b8 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -1,5 +1,5 @@
---- php5-5.2.9.dfsg.1.orig/TSRM/TSRM.h
-+++ php5-5.2.9.dfsg.1/TSRM/TSRM.h
+--- php.orig/TSRM/TSRM.h
++++ php/TSRM/TSRM.h
@@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
typedef unsigned long tsrm_uintptr_t;
#endif
@@ -22,8 +22,8 @@
#ifdef __cplusplus
extern "C" {
#endif
---- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.c
-+++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.c
+--- php.orig/TSRM/tsrm_virtual_cwd.c
++++ php/TSRM/tsrm_virtual_cwd.c
@@ -273,6 +273,191 @@ static char *tsrm_strndup(const char *s,
}
/* }}} */
@@ -216,8 +216,8 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
---- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.h
-+++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.h
+--- php.orig/TSRM/tsrm_virtual_cwd.h
++++ php/TSRM/tsrm_virtual_cwd.h
@@ -139,6 +139,22 @@ typedef struct _cwd_state {
typedef int (*verify_path_func)(const cwd_state *);
@@ -241,8 +241,8 @@
CWD_API void virtual_cwd_startup(void);
CWD_API void virtual_cwd_shutdown(void);
CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
---- php5-5.2.9.dfsg.1.orig/Zend/Makefile.am
-+++ php5-5.2.9.dfsg.1/Zend/Makefile.am
+--- php.orig/Zend/Makefile.am
++++ php/Zend/Makefile.am
@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
@@ -252,8 +252,8 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
---- php5-5.2.9.dfsg.1.orig/Zend/zend.c
-+++ php5-5.2.9.dfsg.1/Zend/zend.c
+--- php.orig/Zend/zend.c
++++ php/Zend/zend.c
@@ -57,7 +57,9 @@ ZEND_API void (*zend_ticks_function)(int
ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
@@ -354,9 +354,9 @@
STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals)
#ifdef ZEND_MULTIBYTE
STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
---- php5-5.2.9.dfsg.1.orig/Zend/zend.h
-+++ php5-5.2.9.dfsg.1/Zend/zend.h
-@@ -532,6 +532,9 @@ extern void (*zend_on_timeout)(int secon
+--- php.orig/Zend/zend.h
++++ php/Zend/zend.h
+@@ -550,6 +550,9 @@ extern void (*zend_on_timeout)(int secon
extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
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);
@@ -366,7 +366,7 @@
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -663,6 +666,13 @@ END_EXTERN_C()
+@@ -681,6 +684,13 @@ END_EXTERN_C()
#include "zend_operators.h"
#include "zend_variables.h"
@@ -380,9 +380,9 @@
#endif /* ZEND_H */
/*
---- php5-5.2.9.dfsg.1.orig/Zend/zend_alloc.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_alloc.c
-@@ -311,13 +311,26 @@ static const zend_mm_mem_handlers mem_ha
+--- php.orig/Zend/zend_alloc.c
++++ php/Zend/zend_alloc.c
+@@ -316,13 +316,26 @@ static const zend_mm_mem_handlers mem_ha
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -411,7 +411,7 @@
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -423,6 +436,9 @@ struct _zend_mm_heap {
+@@ -428,6 +441,9 @@ struct _zend_mm_heap {
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
@@ -421,7 +421,7 @@
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,15 +528,15 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -517,15 +533,15 @@ static unsigned int _zend_mm_cookie = 0;
#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
@@ -440,7 +440,7 @@
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -582,6 +598,48 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -587,6 +603,48 @@ static unsigned int _zend_mm_cookie = 0;
#endif
@@ -489,7 +489,7 @@
#if ZEND_MM_HEAP_PROTECTION
-@@ -790,6 +848,12 @@ static inline void zend_mm_remove_from_f
+@@ -795,6 +853,12 @@ static inline void zend_mm_remove_from_f
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
@@ -502,7 +502,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -828,6 +892,12 @@ subst_block:
+@@ -833,6 +897,12 @@ subst_block:
}
} else {
@@ -515,7 +515,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -875,6 +945,11 @@ static inline void zend_mm_init(zend_mm_
+@@ -880,6 +950,11 @@ static inline void zend_mm_init(zend_mm_
heap->large_free_buckets[i] = NULL;
}
heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
@@ -527,7 +527,7 @@
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1779,6 +1854,11 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1784,6 +1859,11 @@ static void *_zend_mm_alloc_int(zend_mm_
best_fit = heap->cache[index];
heap->cache[index] = best_fit->prev_free_block;
heap->cached -= true_size;
@@ -539,7 +539,7 @@
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
return ZEND_MM_DATA_OF(best_fit);
-@@ -1918,6 +1998,12 @@ zend_mm_finished_searching_for_block:
+@@ -1923,6 +2003,12 @@ zend_mm_finished_searching_for_block:
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -552,7 +552,7 @@
heap->size += true_size;
if (heap->peak < heap->size) {
heap->peak = heap->size;
-@@ -1941,6 +2027,9 @@ static void _zend_mm_free_int(zend_mm_he
+@@ -1946,6 +2032,9 @@ static void _zend_mm_free_int(zend_mm_he
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -562,7 +562,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
-@@ -2003,6 +2092,9 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2008,6 +2097,9 @@ static void *_zend_mm_realloc_int(zend_m
mm_block = ZEND_MM_HEADER_OF(p);
true_size = ZEND_MM_TRUE_SIZE(size);
orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -572,7 +572,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2034,6 +2126,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2039,6 +2131,11 @@ static void *_zend_mm_realloc_int(zend_m
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -584,7 +584,7 @@
return p;
}
-@@ -2053,13 +2150,18 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2058,13 +2155,18 @@ static void *_zend_mm_realloc_int(zend_m
heap->cache[index] = best_fit->prev_free_block;
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
@@ -604,7 +604,7 @@
#endif
heap->cached -= true_size - orig_size;
-@@ -2117,6 +2219,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2122,6 +2224,11 @@ static void *_zend_mm_realloc_int(zend_m
if (heap->peak < heap->size) {
heap->peak = heap->size;
}
@@ -616,7 +616,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
-@@ -2220,6 +2327,11 @@ out_of_memory:
+@@ -2225,6 +2332,11 @@ out_of_memory:
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -628,7 +628,7 @@
return ZEND_MM_DATA_OF(mm_block);
}
-@@ -2227,7 +2339,7 @@ out_of_memory:
+@@ -2232,7 +2344,7 @@ out_of_memory:
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
memcpy(ptr, p, mm_block->debug.size);
#else
@@ -637,7 +637,7 @@
#endif
_zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
return ptr;
-@@ -2490,6 +2602,17 @@ ZEND_API void shutdown_memory_manager(in
+@@ -2499,6 +2611,17 @@ ZEND_API void shutdown_memory_manager(in
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
}
@@ -655,8 +655,8 @@
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
char *tmp;
---- php5-5.2.9.dfsg.1.orig/Zend/zend_alloc.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_alloc.h
+--- php.orig/Zend/zend_alloc.h
++++ php/Zend/zend_alloc.h
@@ -129,6 +129,9 @@ ZEND_API int zend_set_memory_limit(size_
ZEND_API void start_memory_manager(TSRMLS_D);
@@ -668,7 +668,7 @@
#if ZEND_DEBUG
--- /dev/null
-+++ php5-5.2.9.dfsg.1/Zend/zend_canary.c
++++ php/Zend/zend_canary.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -734,8 +734,8 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
---- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_compile.c
+--- php.orig/Zend/zend_compile.c
++++ php/Zend/zend_compile.c
@@ -54,7 +54,6 @@ static void zend_duplicate_property_info
property_info->name = zend_strndup(property_info->name, property_info->name_length);
}
@@ -755,8 +755,8 @@
static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
{
---- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_compile.h
+--- php.orig/Zend/zend_compile.h
++++ php/Zend/zend_compile.h
@@ -564,6 +564,11 @@ ZEND_API int zend_auto_global_disable_ji
int zendlex(znode *zendlval TSRMLS_DC);
@@ -777,8 +777,8 @@
END_EXTERN_C()
#define ZEND_CLONE_FUNC_NAME "__clone"
---- php5-5.2.9.dfsg.1.orig/Zend/zend_constants.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_constants.c
+--- php.orig/Zend/zend_constants.c
++++ php/Zend/zend_constants.c
@@ -110,6 +110,75 @@ void zend_register_standard_constants(TS
REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
@@ -855,8 +855,8 @@
/* true/false constants */
{
---- php5-5.2.9.dfsg.1.orig/Zend/zend_errors.h
-+++ php5-5.2.9.dfsg.1/Zend/zend_errors.h
+--- php.orig/Zend/zend_errors.h
++++ php/Zend/zend_errors.h
@@ -39,6 +39,20 @@
#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
@@ -878,10 +878,10 @@
#endif /* ZEND_ERRORS_H */
/*
---- php5-5.2.9.dfsg.1.orig/Zend/zend_hash.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_hash.c
+--- php.orig/Zend/zend_hash.c
++++ php/Zend/zend_hash.c
@@ -20,6 +20,7 @@
- /* $Id: zend_hash.c,v 1.121.2.4.2.10 2008/12/31 11:17:33 sebastian Exp $ */
+ /* $Id: zend_hash.c,v 1.121.2.4.2.11 2009/06/07 19:28:32 mattwil Exp $ */
#include "zend.h"
+#include "zend_compile.h"
@@ -1145,8 +1145,8 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
---- php5-5.2.9.dfsg.1.orig/Zend/zend_llist.c
-+++ php5-5.2.9.dfsg.1/Zend/zend_llist.c
+--- php.orig/Zend/zend_llist.c
++++ php/Zend/zend_llist.c
@@ -23,6 +23,184 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -1364,9 +1364,9 @@
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
---- php5-5.2.9.dfsg.1.orig/configure.in
-+++ php5-5.2.9.dfsg.1/configure.in
-@@ -257,6 +257,7 @@ sinclude(Zend/Zend.m4)
+--- php.orig/configure.in
++++ php/configure.in
+@@ -262,6 +262,7 @@ sinclude(Zend/Zend.m4)
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -1374,7 +1374,7 @@
divert(2)
-@@ -1371,7 +1372,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c
+@@ -1385,7 +1386,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.c php_logos.c \
@@ -1383,7 +1383,7 @@
PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
-@@ -1397,7 +1398,7 @@ PHP_ADD_SOURCES(Zend, \
+@@ -1411,7 +1412,7 @@ PHP_ADD_SOURCES(Zend, \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
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 \
@@ -1392,8 +1392,8 @@
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
---- php5-5.2.9.dfsg.1.orig/ext/standard/basic_functions.c
-+++ php5-5.2.9.dfsg.1/ext/standard/basic_functions.c
+--- php.orig/ext/standard/basic_functions.c
++++ php/ext/standard/basic_functions.c
@@ -3575,7 +3575,9 @@ zend_function_entry basic_functions[] =
PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
@@ -1405,8 +1405,8 @@
#endif
#ifdef HAVE_FNMATCH
---- php5-5.2.9.dfsg.1.orig/ext/standard/dl.c
-+++ php5-5.2.9.dfsg.1/ext/standard/dl.c
+--- php.orig/ext/standard/dl.c
++++ php/ext/standard/dl.c
@@ -241,6 +241,19 @@ void php_dl(zval *file, int type, zval *
RETURN_FALSE;
}
@@ -1427,9 +1427,9 @@
RETURN_TRUE;
}
/* }}} */
---- php5-5.2.9.dfsg.1.orig/ext/standard/file.c
-+++ php5-5.2.9.dfsg.1/ext/standard/file.c
-@@ -2387,7 +2387,7 @@ out:
+--- php.orig/ext/standard/file.c
++++ php/ext/standard/file.c
+@@ -2403,7 +2403,7 @@ out:
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
/* {{{ proto string realpath(string path)
Return the resolved path */
@@ -1438,8 +1438,8 @@
{
zval **path;
char resolved_path_buff[MAXPATHLEN];
---- php5-5.2.9.dfsg.1.orig/ext/standard/file.h
-+++ php5-5.2.9.dfsg.1/ext/standard/file.h
+--- php.orig/ext/standard/file.h
++++ php/ext/standard/file.h
@@ -61,7 +61,7 @@ PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
@@ -1449,8 +1449,8 @@
#endif
#ifdef HAVE_FNMATCH
PHP_FUNCTION(fnmatch);
---- php5-5.2.9.dfsg.1.orig/ext/standard/info.c
-+++ php5-5.2.9.dfsg.1/ext/standard/info.c
+--- php.orig/ext/standard/info.c
++++ php/ext/standard/info.c
@@ -648,6 +648,31 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_end();
@@ -1483,8 +1483,8 @@
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
---- php5-5.2.9.dfsg.1.orig/ext/standard/syslog.c
-+++ php5-5.2.9.dfsg.1/ext/standard/syslog.c
+--- php.orig/ext/standard/syslog.c
++++ php/ext/standard/syslog.c
@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
*/
PHP_MINIT_FUNCTION(syslog)
@@ -1501,8 +1501,8 @@
BG(syslog_device)=NULL;
return SUCCESS;
---- php5-5.2.9.dfsg.1.orig/main/fopen_wrappers.c
-+++ php5-5.2.9.dfsg.1/main/fopen_wrappers.c
+--- php.orig/main/fopen_wrappers.c
++++ php/main/fopen_wrappers.c
@@ -110,7 +110,7 @@ PHPAPI int php_check_specific_open_based
/* normalize and expand path */
@@ -1580,9 +1580,9 @@
ptr = end;
}
---- php5-5.2.9.dfsg.1.orig/main/main.c
-+++ php5-5.2.9.dfsg.1/main/main.c
-@@ -89,6 +89,9 @@
+--- php.orig/main/main.c
++++ php/main/main.c
+@@ -90,6 +90,9 @@
#include "SAPI.h"
#include "rfc1867.h"
@@ -1592,7 +1592,7 @@
/* }}} */
#ifndef ZTS
-@@ -1374,7 +1377,7 @@ void php_request_shutdown_for_exec(void
+@@ -1376,7 +1379,7 @@ void php_request_shutdown_for_exec(void
/* used to close fd's in the 3..255 range here, but it's problematic
*/
@@ -1601,7 +1601,7 @@
}
/* }}} */
-@@ -1415,6 +1418,9 @@ void php_request_shutdown_for_hook(void
+@@ -1417,6 +1420,9 @@ void php_request_shutdown_for_hook(void
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1611,7 +1611,7 @@
} zend_end_try();
zend_try {
-@@ -1509,6 +1515,9 @@ void php_request_shutdown(void *dummy)
+@@ -1511,6 +1517,9 @@ void php_request_shutdown(void *dummy)
/* 11. Free Willy (here be crashes) */
zend_try {
shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0 TSRMLS_CC);
@@ -1621,7 +1621,7 @@
} zend_end_try();
/* 12. Reset max_execution_time */
-@@ -1668,6 +1677,9 @@ int php_module_startup(sapi_module_struc
+@@ -1670,6 +1679,9 @@ int php_module_startup(sapi_module_struc
#ifdef ZTS
tsrm_ls = ts_resource(0);
#endif
@@ -1631,7 +1631,7 @@
module_shutdown = 0;
module_startup = 1;
-@@ -1809,6 +1821,10 @@ int php_module_startup(sapi_module_struc
+@@ -1811,6 +1823,10 @@ int php_module_startup(sapi_module_struc
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
@@ -1642,7 +1642,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
-@@ -1858,7 +1874,9 @@ int php_module_startup(sapi_module_struc
+@@ -1860,7 +1876,9 @@ int php_module_startup(sapi_module_struc
module_startup = 0;
shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1653,7 +1653,7 @@
/* we're done */
return SUCCESS;
}
-@@ -1917,6 +1935,9 @@ void php_module_shutdown(TSRMLS_D)
+@@ -1919,6 +1937,9 @@ void php_module_shutdown(TSRMLS_D)
#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1663,8 +1663,8 @@
core_globals_dtor(&core_globals TSRMLS_CC);
#else
zend_ini_global_shutdown(TSRMLS_C);
---- php5-5.2.9.dfsg.1.orig/main/php.h
-+++ php5-5.2.9.dfsg.1/main/php.h
+--- php.orig/main/php.h
++++ php/main/php.h
@@ -40,6 +40,13 @@
#undef sprintf
#define sprintf php_sprintf
@@ -1690,8 +1690,8 @@
#endif
/*
---- php5-5.2.9.dfsg.1.orig/main/php_logos.c
-+++ php5-5.2.9.dfsg.1/main/php_logos.c
+--- php.orig/main/php_logos.c
++++ php/main/php_logos.c
@@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
}
@@ -1713,8 +1713,8 @@
return SUCCESS;
}
---- php5-5.2.9.dfsg.1.orig/main/snprintf.c
-+++ php5-5.2.9.dfsg.1/main/snprintf.c
+--- php.orig/main/snprintf.c
++++ php/main/snprintf.c
@@ -1077,7 +1077,11 @@ static int format_converter(register buf
@@ -1727,9 +1727,9 @@
goto skip_output;
/*
---- php5-5.2.9.dfsg.1.orig/main/spprintf.c
-+++ php5-5.2.9.dfsg.1/main/spprintf.c
-@@ -682,7 +682,11 @@ static void xbuf_format_converter(smart_
+--- php.orig/main/spprintf.c
++++ php/main/spprintf.c
+@@ -683,7 +683,11 @@ static void xbuf_format_converter(smart_
case 'n':
@@ -1742,7 +1742,7 @@
/*
--- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_globals.h
++++ php/main/suhosin_globals.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -1806,7 +1806,7 @@
+ * End:
+ */
--- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_logo.h
++++ php/main/suhosin_logo.h
@@ -0,0 +1,178 @@
+static unsigned char suhosin_logo[] =
+ "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
@@ -1987,7 +1987,7 @@
+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
+ ;
--- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.c
++++ php/main/suhosin_patch.c
@@ -0,0 +1,380 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2370,7 +2370,7 @@
+ * vim<600: sw=4 ts=4
+ */
--- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.h
++++ php/main/suhosin_patch.h
@@ -0,0 +1,40 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2413,7 +2413,7 @@
+ * End:
+ */
--- /dev/null
-+++ php5-5.2.9.dfsg.1/main/suhosin_patch.m4
++++ php/main/suhosin_patch.m4
@@ -0,0 +1,8 @@
+dnl
+dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
@@ -2423,8 +2423,8 @@
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
---- php5-5.2.9.dfsg.1.orig/sapi/apache/mod_php5.c
-+++ php5-5.2.9.dfsg.1/sapi/apache/mod_php5.c
+--- php.orig/sapi/apache/mod_php5.c
++++ php/sapi/apache/mod_php5.c
@@ -951,7 +951,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
@@ -2437,8 +2437,8 @@
}
}
#endif
---- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2filter/sapi_apache2.c
+--- php.orig/sapi/apache2filter/sapi_apache2.c
++++ php/sapi/apache2filter/sapi_apache2.c
@@ -566,7 +566,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
@@ -2451,8 +2451,8 @@
}
}
---- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
+--- php.orig/sapi/apache2handler/sapi_apache2.c
++++ php/sapi/apache2handler/sapi_apache2.c
@@ -370,7 +370,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
@@ -2465,9 +2465,9 @@
}
}
---- php5-5.2.9.dfsg.1.orig/sapi/cgi/cgi_main.c
-+++ php5-5.2.9.dfsg.1/sapi/cgi/cgi_main.c
-@@ -1797,11 +1797,19 @@ consult the installation file that came
+--- php.orig/sapi/cgi/cgi_main.c
++++ php/sapi/cgi/cgi_main.c
+@@ -1801,11 +1801,19 @@ consult the installation file that came
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
@@ -2487,9 +2487,9 @@
php_request_shutdown((void *) 0);
exit_status = 0;
goto out;
---- php5-5.2.9.dfsg.1.orig/sapi/cli/php_cli.c
-+++ php5-5.2.9.dfsg.1/sapi/cli/php_cli.c
-@@ -772,8 +772,14 @@ int main(int argc, char *argv[])
+--- php.orig/sapi/cli/php_cli.c
++++ php/sapi/cli/php_cli.c
+@@ -801,8 +801,14 @@ int main(int argc, char *argv[])
}
request_started = 1;
@@ -2506,8 +2506,8 @@
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
---- php5-5.2.9.dfsg.1.orig/win32/build/config.w32
-+++ php5-5.2.9.dfsg.1/win32/build/config.w32
+--- php.orig/win32/build/config.w32
++++ php/win32/build/config.w32
@@ -305,7 +305,7 @@ ADD_SOURCES("Zend", "zend_language_parse
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_objects.c \
@@ -2517,7 +2517,7 @@
ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
-@@ -350,6 +350,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
+@@ -354,6 +354,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index f8ef8a7..2e177ad 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -8,8 +8,8 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/parse_tz.c
-+++ php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c
+--- php.orig/ext/date/lib/parse_tz.c
++++ php/ext/date/lib/parse_tz.c
@@ -20,6 +20,16 @@
#include "timelib.h"
@@ -258,8 +258,8 @@ r1: initial revision
static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
{
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.h
-+++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.h
+--- php.orig/ext/date/lib/timelib.h
++++ php/ext/date/lib/timelib.h
@@ -32,6 +32,10 @@
#define TIMELIB_SPECIAL_WEEKDAY 0x01
@@ -271,8 +271,8 @@ r1: initial revision
#ifndef LONG_MAX
#define LONG_MAX 2147483647L
#endif
---- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.m4
-+++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.m4
+--- php.orig/ext/date/lib/timelib.m4
++++ php/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
dnl Check for strtoll, atoll
@@ -291,9 +291,9 @@ r1: initial revision
+ fi
+fi
+
---- php5-5.2.9.dfsg.1.orig/ext/date/php_date.c
-+++ php5-5.2.9.dfsg.1/ext/date/php_date.c
-@@ -584,6 +584,11 @@ static char* guess_timezone(const timeli
+--- php.orig/ext/date/php_date.c
++++ php/ext/date/php_date.c
+@@ -595,6 +595,11 @@ static char* guess_timezone(const timeli
if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);
}
--
1.5.6.5
More information about the Pkg-php-commits
mailing list