[Pkg-php-commits] [php/debian-sid] Adapt debian patches to 5.3.2.
Ondřej Surý
ondrej at sury.org
Tue Mar 9 14:22:59 UTC 2010
* Refreshed patches in debian/patches/:
- 013-force_getaddrinfo.patch
- 034-apache2_umask_fix.patch
- 036-fd_setsize_fix.patch
- 053-extension_api.patch
- 108-64_bit_datetime.patch
- 115-autoconf_ftbfs.patch
- 116-posixness_fix.patch
- bad_whatis_entries.patch
- broken_5.3_test-posix_uname.patch
- fix_broken_5.3_tests.patch
- fix_broken_upstream_tests.patch
- fix_filter_var_email_test.patch
- force_libmysqlclient_r.patch
- gentoo/009_ob-memory-leaks.patch
- page_size_fixes.patch
- ref-converted-to-value-in-_call.patch
- use_embedded_timezonedb_fixes.patch
* Removed patches that were merged upstream:
- fix_filter_var_email_test.patch.
- ref-converted-to-value-in-_call.patch.
---
debian/patches/013-force_getaddrinfo.patch | 2 +-
debian/patches/034-apache2_umask_fix.patch | 10 ++--
debian/patches/036-fd_setsize_fix.patch | 4 +-
debian/patches/053-extension_api.patch | 4 +-
debian/patches/108-64_bit_datetime.patch | 2 +-
debian/patches/115-autoconf_ftbfs.patch | 16 +++---
debian/patches/116-posixness_fix.patch | 2 +-
debian/patches/bad_whatis_entries.patch | 14 +++---
debian/patches/broken_5.3_test-posix_uname.patch | 21 +++-----
debian/patches/fix_broken_5.3_tests.patch | 55 ++++++--------------
debian/patches/fix_broken_upstream_tests.patch | 19 +++----
debian/patches/fix_filter_var_email_test.patch | 14 -----
debian/patches/force_libmysqlclient_r.patch | 18 +++---
debian/patches/gentoo/009_ob-memory-leaks.patch | 4 +-
debian/patches/page_size_fixes.patch | 16 ++----
.../patches/ref-converted-to-value-in-_call.patch | 18 ------
debian/patches/series | 2 -
debian/patches/use_embedded_timezonedb_fixes.patch | 6 +-
18 files changed, 79 insertions(+), 148 deletions(-)
delete mode 100644 debian/patches/fix_filter_var_email_test.patch
delete mode 100644 debian/patches/ref-converted-to-value-in-_call.patch
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index 7c44219..e64b3d0 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -7,7 +7,7 @@ Last-Update: 2010-01-18
--- a/configure.in
+++ b/configure.in
-@@ -631,50 +631,50 @@ asprintf \
+@@ -615,50 +615,50 @@ AC_CACHE_CHECK([for nanosleep], ac_cv_fu
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
diff --git a/debian/patches/034-apache2_umask_fix.patch b/debian/patches/034-apache2_umask_fix.patch
index 30b4d95..abb1173 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -7,9 +7,9 @@ Bug-Debian: http://bugs.debian.org/286225
Forwarded: no
Last-Update: 2010-01-18
---- 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
+--- a/sapi/apache2handler/sapi_apache2.c
++++ b/sapi/apache2handler/sapi_apache2.c
+@@ -455,6 +455,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
@@ -29,7 +29,7 @@ Last-Update: 2010-01-18
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_length;
-@@ -639,6 +652,8 @@ zend_first_try {
+@@ -646,6 +659,8 @@ zend_first_try {
} else {
zend_file_handle zfd;
@@ -38,7 +38,7 @@ Last-Update: 2010-01-18
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
-@@ -650,6 +665,9 @@ zend_first_try {
+@@ -657,6 +672,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 8f597d6..0adda07 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -5,7 +5,7 @@ Last-Update: 2010-01-18
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
-@@ -714,6 +714,7 @@ static int php_sock_array_to_fd_set(zval
+@@ -720,6 +720,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 */
@@ -15,7 +15,7 @@ Last-Update: 2010-01-18
if (php_sock->bsd_socket > *max_fd) {
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
-@@ -612,6 +612,9 @@ static int stream_array_to_fd_set(zval *
+@@ -610,6 +610,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/053-extension_api.patch b/debian/patches/053-extension_api.patch
index fcdf9b5..3e82e21 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -7,7 +7,7 @@ Last-Update: 2010-01-18
--- a/configure.in
+++ b/configure.in
-@@ -1130,8 +1130,13 @@ dnl Build extension directory path
+@@ -1114,8 +1114,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 //'`
@@ -22,7 +22,7 @@ Last-Update: 2010-01-18
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1276,6 +1281,7 @@ PHP_SUBST(CXX)
+@@ -1265,6 +1270,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index 6d46a94..28e8d9a 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -2,7 +2,7 @@
+++ b/ext/standard/datetime.c
@@ -20,6 +20,9 @@
- /* $Id: datetime.c 272370 2008-12-31 11:15:49Z sebastian $ */
+ /* $Id: datetime.c 293036 2010-01-03 09:23:27Z sebastian $ */
+#define _XOPEN_SOURCE /* needed to get strptime() declared */
+#define _BSD_SOURCE /* needed to get ulong declared */
diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index 8a2c1ab..a073a69 100644
--- a/debian/patches/115-autoconf_ftbfs.patch
+++ b/debian/patches/115-autoconf_ftbfs.patch
@@ -1,7 +1,7 @@
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
- ## $Id: configure.in 290928 2009-11-18 19:43:33Z johannes $ -*- autoconf -*-
+ ## $Id: configure.in 295792 2010-03-03 16:36:07Z johannes $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
@@ -9,7 +9,7 @@
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
-@@ -305,7 +305,7 @@ sinclude(TSRM/threads.m4)
+@@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -18,7 +18,7 @@
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
-@@ -344,7 +344,7 @@ if test "$enable_maintainer_zts" = "yes"
+@@ -329,7 +329,7 @@ if test "$enable_maintainer_zts" = "yes"
PTHREADS_FLAGS
fi
@@ -27,7 +27,7 @@
dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.
-@@ -691,7 +691,7 @@ if test "x$php_crypt_r" = "x1"; then
+@@ -675,7 +675,7 @@ if test "x$php_crypt_r" = "x1"; then
PHP_CRYPT_R_STYLE
fi
@@ -36,7 +36,7 @@
dnl ## In diversion 4 we check user-configurable general settings.
-@@ -932,7 +932,7 @@ else
+@@ -916,7 +916,7 @@ else
AC_MSG_RESULT([using system default])
fi
@@ -48,15 +48,15 @@
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -1,6 +1,6 @@
- dnl $Id: config.m4 287120 2009-08-11 22:07:35Z scottmac $ -*- autoconf -*-
+ dnl $Id: config.m4 295350 2010-02-22 00:34:22Z pajoye $ -*- autoconf -*-
-divert(3)dnl
+dnl divert(3)dnl
dnl
dnl Check if flush should be called explicitly after buffered io
-@@ -220,7 +220,7 @@ dnl
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
+@@ -333,7 +333,7 @@ dnl
+ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
AC_FUNC_FNMATCH
-divert(5)dnl
diff --git a/debian/patches/116-posixness_fix.patch b/debian/patches/116-posixness_fix.patch
index 11fa843..60ead42 100644
--- a/debian/patches/116-posixness_fix.patch
+++ b/debian/patches/116-posixness_fix.patch
@@ -15,7 +15,7 @@
+++ b/ext/date/lib/parse_tz.c
@@ -18,6 +18,10 @@
- /* $Id: parse_tz.c 279320 2009-04-25 16:33:41Z nlopess $ */
+ /* $Id: parse_tz.c 293036 2010-01-03 09:23:27Z sebastian $ */
+#ifndef PATH_MAX
+#define PATH_MAX 4096
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index f1d0d67..0dc956f 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -3,17 +3,17 @@ Origin: vendor
Forwarded: http://bugs.php.net/50795
Last-Update: 2010-01-18
---- pkg-php.orig/sapi/cli/php.1.in
-+++ pkg-php/sapi/cli/php.1.in
+--- a/sapi/cli/php.1.in
++++ b/sapi/cli/php.1.in
@@ -1,6 +1,5 @@
- .TH PHP 1 "2009" "The PHP Group" "Scripting Language"
+ .TH PHP 1 "2010" "The PHP Group" "Scripting Language"
.SH NAME
-.TP 15
php \- PHP Command Line Interface 'CLI'
.SH SYNOPSIS
.B php
---- pkg-php.orig/scripts/man1/php-config.1.in
-+++ pkg-php/scripts/man1/php-config.1.in
+--- a/scripts/man1/php-config.1.in
++++ b/scripts/man1/php-config.1.in
@@ -1,6 +1,5 @@
.TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
@@ -21,8 +21,8 @@ Last-Update: 2010-01-18
php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS
.B php\-config
---- pkg-php.orig/scripts/man1/phpize.1.in
-+++ pkg-php/scripts/man1/phpize.1.in
+--- a/scripts/man1/phpize.1.in
++++ b/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/broken_5.3_test-posix_uname.patch b/debian/patches/broken_5.3_test-posix_uname.patch
index eb9dd15..6f30365 100644
--- a/debian/patches/broken_5.3_test-posix_uname.patch
+++ b/debian/patches/broken_5.3_test-posix_uname.patch
@@ -4,9 +4,9 @@ Description: Fix two failing tests
* ext/posix/tests/posix_uname_basic.phpt: backported fix from upstream.
Bug: http://bugs.php.net/bug.php?id=50982
Bug-Debian: http://bugs.debian.org/570286
---- php.orig/ext/posix/tests/posix_uname.phpt
+--- a/ext/posix/tests/posix_uname.phpt
+++ /dev/null
-@@ -1,33 +0,0 @@
+@@ -1,35 +0,0 @@
---TEST--
-Test posix_uname()
---DESCRIPTION--
@@ -23,7 +23,9 @@ Bug-Debian: http://bugs.debian.org/570286
-?>
---FILE--
-<?php
-- var_dump(posix_uname());
+- $uname = posix_uname();
+- unset($uname['domainname']);
+- var_dump($uname);
-?>
-===DONE===
---EXPECTF--
@@ -40,17 +42,8 @@ Bug-Debian: http://bugs.debian.org/570286
- string(%d) "%s"
-}
-===DONE===
---- php.orig/ext/posix/tests/posix_uname_basic.phpt
-+++ php/ext/posix/tests/posix_uname_basic.phpt
-@@ -9,7 +9,7 @@ Test posix_uname() function : basic func
- echo "Basic test of POSIX uname function\n";
-
- $uname = posix_uname();
--
-+ unset($uname['domainname']);
- print_r($uname);
-
- ?>
+--- a/ext/posix/tests/posix_uname_basic.phpt
++++ b/ext/posix/tests/posix_uname_basic.phpt
@@ -25,4 +25,4 @@ Array
[machine] => %s
)
diff --git a/debian/patches/fix_broken_5.3_tests.patch b/debian/patches/fix_broken_5.3_tests.patch
index 35cc71d..6a9cf0d 100644
--- a/debian/patches/fix_broken_5.3_tests.patch
+++ b/debian/patches/fix_broken_5.3_tests.patch
@@ -15,9 +15,22 @@ Description: Fix another small batch of broken test cases
variable hardcoded to 9 instead. Did i mention that this test is
sketchy?
Origin: vendor
---- php.orig/ext/standard/tests/php_ini_loaded_file.phpt
+--- a/ext/posix/tests/posix_errno_variation2.phpt
++++ b/ext/posix/tests/posix_errno_variation2.phpt
+@@ -21,7 +21,9 @@ do {
+ $result = shell_exec("ps -p " . $pid);
+ } while (strstr($pid, $result));
+
+-posix_kill($pid, SIGKILL);
++/* don't depend on SIGKILL being defined (pcntl might not not be loaded) */
++$SIGKILL = 9;
++posix_kill($pid, $SIGKILL);
+ var_dump(posix_errno());
+
+ ?>
+--- a/ext/standard/tests/php_ini_loaded_file.phpt
+++ /dev/null
-@@ -1,13 +0,0 @@
+@@ -1,12 +0,0 @@
---TEST--
-Check the php_ini_loaded_file() function. No file is loaded in test, so false ins returned
---CREDITS--
@@ -28,39 +41,5 @@ Origin: vendor
-<?php
-var_dump(php_ini_loaded_file());
-?>
----EXPECT--
--bool(false)
--
---- php.orig/sapi/cli/tests/006.phpt
-+++ php/sapi/cli/tests/006.phpt
-@@ -79,7 +79,7 @@ string(%d) "Extension [ <persistent> ext
- - Parameters [5] {
- Parameter #0 [ <required> $regex ]
- Parameter #1 [ <required> $replace ]
-- Parameter #2 [ <optional> $subject ]
-+ Parameter #2 [ <required> $subject ]
- Parameter #3 [ <optional> $limit ]
- Parameter #4 [ <optional> &$count ]
- }
-@@ -99,7 +99,7 @@ string(%d) "Extension [ <persistent> ext
- - Parameters [5] {
- Parameter #0 [ <required> $regex ]
- Parameter #1 [ <required> $replace ]
-- Parameter #2 [ <optional> $subject ]
-+ Parameter #2 [ <required> $subject ]
- Parameter #3 [ <optional> $limit ]
- Parameter #4 [ <optional> &$count ]
- }
---- php.orig/ext/posix/tests/posix_errno_variation2.phpt
-+++ php/ext/posix/tests/posix_errno_variation2.phpt
-@@ -20,7 +20,9 @@ do {
- $result = shell_exec("ps -p " . $pid);
- } while (strstr($pid, $result));
-
--posix_kill($pid, SIGKILL);
-+/* don't depend on SIGKILL being defined (pcntl might not not be loaded) */
-+$SIGKILL = 9;
-+posix_kill($pid, $SIGKILL);
- var_dump(posix_errno());
-
- ?>
+---EXPECTF--
+-string(%d) "%s/tmp-php.ini"
diff --git a/debian/patches/fix_broken_upstream_tests.patch b/debian/patches/fix_broken_upstream_tests.patch
index d447c96..7693a87 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -3,21 +3,18 @@ Origin: vendor
Forwarded: http://bugs.php.net/50796
Last-Update: 2010-01-18
---- 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');
- }
- ?>
-+--INI--
-+session.auto_start=1
-+session.save_handler=files
+--- a/ext/soap/tests/server009.phpt
++++ b/ext/soap/tests/server009.phpt
+@@ -10,6 +10,7 @@ SOAP Server 9: setclass and setpersisten
+ --INI--
+ session.auto_start=1
+ session.save_handler=files
+session.save_path=temp_session_store
--FILE--
<?php
class foo {
---- pkg-php.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ pkg-php/ext/standard/tests/general_functions/phpinfo.phpt
+--- a/ext/standard/tests/general_functions/phpinfo.phpt
++++ b/ext/standard/tests/general_functions/phpinfo.phpt
@@ -1,5 +1,7 @@
--TEST--
phpinfo()
diff --git a/debian/patches/fix_filter_var_email_test.patch b/debian/patches/fix_filter_var_email_test.patch
deleted file mode 100644
index 36d09f5..0000000
--- a/debian/patches/fix_filter_var_email_test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Backport upstream fix for broken email filtering test.
-Origin: http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/tests/033.phpt?r1=235867&r2=291212&view=patch
-Bug-Debian: http://bugs.debian.org/571764
---- php.orig/ext/filter/tests/033.phpt
-+++ php/ext/filter/tests/033.phpt
-@@ -21,7 +21,7 @@ stripped PHP 1 foo at bar.com
- encoded PHP 1 foo%40bar.com http%3A%2F%2Fa.b.c 1.2.3.4 123 123abc%3C%3E%28%29 O%27Henry %ED%95%98%ED%8D%BC
- special_chars PHP 1 foo at bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry 하í¼
- unsafe_raw PHP 1 foo at bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry 하í¼
--email PHP 1 foo at bar.com http//a.b.c 1.2.3.4 123 123abc O'Henry
-+email PHP 1 foo at bar.com httpa.b.c 1.2.3.4 123 123abc O'Henry
- url PHP 1 foo at bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry
- number_int 1 1234 123 123
- number_float 1 1234 123 123
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index 463b92d..72ced68 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -6,9 +6,9 @@ Origin: other, http://bugs.debian.org/469081
Forwarded: not-needed
Last-Update: 2010-01-18
---- pkg-php.orig/ext/mysql/config.m4
-+++ pkg-php/ext/mysql/config.m4
-@@ -90,7 +90,7 @@ elif test "$PHP_MYSQL" != "no"; then
+--- a/ext/mysql/config.m4
++++ b/ext/mysql/config.m4
+@@ -78,7 +78,7 @@ elif test "$PHP_MYSQL" != "no"; then
Note that the MySQL client library is not bundled anymore!])
fi
@@ -17,8 +17,8 @@ Last-Update: 2010-01-18
MYSQL_LIBNAME=mysqlclient_r
else
MYSQL_LIBNAME=mysqlclient
---- pkg-php.orig/ext/mysqli/config.m4
-+++ pkg-php/ext/mysqli/config.m4
+--- a/ext/mysqli/config.m4
++++ b/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
@@ -28,12 +28,12 @@ Last-Update: 2010-01-18
MYSQL_LIB_CFG='--libs_r'
MYSQL_LIB_NAME='mysqlclient_r'
else
---- 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
+--- a/ext/pdo_mysql/config.m4
++++ b/ext/pdo_mysql/config.m4
+@@ -64,7 +64,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
+ if test "x$SED" = "x"; then
AC_PATH_PROG(SED, sed)
fi
-
- if test "$enable_maintainer_zts" = "yes"; then
+ if true || test "$enable_maintainer_zts" = "yes"; then
PDO_MYSQL_LIBNAME=mysqlclient_r
diff --git a/debian/patches/gentoo/009_ob-memory-leaks.patch b/debian/patches/gentoo/009_ob-memory-leaks.patch
index ae16bc1..8f96b7d 100644
--- a/debian/patches/gentoo/009_ob-memory-leaks.patch
+++ b/debian/patches/gentoo/009_ob-memory-leaks.patch
@@ -5,7 +5,7 @@ Fixed memory leak in ob_get_clean/ob_get_flush.
--- a/main/output.c
+++ b/main/output.c
-@@ -812,10 +812,12 @@ PHP_FUNCTION(ob_end_flush)
+@@ -816,10 +816,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.");
@@ -18,7 +18,7 @@ Fixed memory leak in ob_get_clean/ob_get_flush.
RETURN_FALSE;
}
-@@ -834,10 +836,12 @@ PHP_FUNCTION(ob_end_clean)
+@@ -838,10 +840,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/page_size_fixes.patch b/debian/patches/page_size_fixes.patch
index 9fd2d61..4513a64 100644
--- a/debian/patches/page_size_fixes.patch
+++ b/debian/patches/page_size_fixes.patch
@@ -4,10 +4,8 @@ Origin: vendor
Bug: http://bugs.php.net/bug.php?id=50982
Last-Update: 2010-02-17
-Index: php/Zend/zend_stream.c
-===================================================================
---- php.orig/Zend/zend_stream.c
-+++ php/Zend/zend_stream.c
+--- a/Zend/zend_stream.c
++++ b/Zend/zend_stream.c
@@ -27,10 +27,15 @@
#include <sys/types.h>
@@ -51,10 +49,8 @@ Index: php/Zend/zend_stream.c
/* *buf[size] is zeroed automatically by the kernel */
*buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0);
if (*buf != MAP_FAILED) {
-Index: php/main/main.c
-===================================================================
---- php.orig/main/main.c
-+++ php/main/main.c
+--- a/main/main.c
++++ b/main/main.c
@@ -91,15 +91,17 @@
#include "SAPI.h"
#include "rfc1867.h"
@@ -79,7 +75,7 @@ Index: php/main/main.c
/* }}} */
PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
-@@ -1161,6 +1163,17 @@ PHPAPI int php_stream_open_for_zend_ex(c
+@@ -1192,6 +1194,17 @@ PHPAPI int php_stream_open_for_zend_ex(c
char *p;
size_t len, mapped_len;
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
@@ -97,7 +93,7 @@ Index: php/main/main.c
if (stream) {
handle->filename = (char*)filename;
-@@ -1173,7 +1186,7 @@ PHPAPI int php_stream_open_for_zend_ex(c
+@@ -1204,7 +1217,7 @@ PHPAPI int php_stream_open_for_zend_ex(c
memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
len = php_zend_stream_fsizer(stream TSRMLS_CC);
if (len != 0
diff --git a/debian/patches/ref-converted-to-value-in-_call.patch b/debian/patches/ref-converted-to-value-in-_call.patch
deleted file mode 100644
index 7dc5395..0000000
--- a/debian/patches/ref-converted-to-value-in-_call.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix a regression where reference arguments are converted to
- value in __call.
-Origin: upstream, http://svn.php.net/viewvc?view=revision&revision=292295
-Bug: http://bugs.php.net/50394
-Last-Update: 2010-01-19
-
-Index: php/Zend/zend_execute_API.c
-===================================================================
---- php.orig/Zend/zend_execute_API.c
-+++ php/Zend/zend_execute_API.c
-@@ -838,6 +838,7 @@ int zend_call_function(zend_fcall_info *
- zval *param;
-
- if(EX(function_state).function->type == ZEND_INTERNAL_FUNCTION
-+ && (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0
- && !ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
- && PZVAL_IS_REF(*fci->params[i])) {
- SEPARATE_ZVAL(fci->params[i]);
diff --git a/debian/patches/series b/debian/patches/series
index 84eeed2..b1f1634 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,7 +36,6 @@ mssql-null-exception.patch
sybase-alias.patch
strcmp_null-OnUpdateErrorLog.patch
#deprecate_short_open_tag
-ref-converted-to-value-in-_call.patch
unaligned_memory_access.patch
fix_broken_5.3_tests.patch
dont-gitclean-in-build.patch
@@ -45,6 +44,5 @@ shtool_mkdir_-p_-race-condition.patch
qdbm-is-usr_include_qdbm.patch
filter_validate_int.patch
zend_int_overflow.patch
-fix_filter_var_email_test.patch
fix_var_dump_64bit.phpt.patch
use_embedded_timezonedb_fixes.patch
diff --git a/debian/patches/use_embedded_timezonedb_fixes.patch b/debian/patches/use_embedded_timezonedb_fixes.patch
index 2a10f82..18041f8 100644
--- a/debian/patches/use_embedded_timezonedb_fixes.patch
+++ b/debian/patches/use_embedded_timezonedb_fixes.patch
@@ -5,9 +5,9 @@ Description: Silence warnings about using the default system timezone info
set the timezone explicitly), though with our use of the system timezonedb
patch, we actually feel quite comfortable using the default timezone info.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
---- php.orig/ext/date/php_date.c
-+++ php/ext/date/php_date.c
-@@ -883,7 +883,7 @@ static char* guess_timezone(const timeli
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -879,7 +879,7 @@ static char* guess_timezone(const timeli
tzid = "UTC";
}
--
1.6.3.3
More information about the Pkg-php-commits
mailing list