[Pkg-php-commits] [php/debian-sid] refresh various quilt patches against new upstream version
Sean Finney
seanius at debian.org
Sat Sep 19 22:12:25 UTC 2009
---
debian/patches/004-ldap_fix.patch | 4 +-
debian/patches/107-reflection_is_ext.patch | 2 +-
debian/patches/108-64_bit_datetime.patch | 2 +-
debian/patches/112-proc_open.patch | 2 +-
debian/patches/115-autoconf_ftbfs.patch | 32 ++++++++------------
debian/patches/116-posixness_fix.patch | 30 +++++++------------
debian/patches/bad_whatis_entries.patch | 2 +-
debian/patches/exif_read_data-segfault.patch | 2 -
.../gentoo/006_ext-curl-set_opt-crash.patch | 2 +-
debian/patches/libedit_is_editline.patch | 2 +-
debian/patches/mssql-null-exception.patch | 4 +--
debian/patches/suhosin.patch | 22 +++++++-------
debian/patches/sybase-alias.patch | 2 -
debian/patches/use_embedded_timezonedb.patch | 10 +++---
14 files changed, 49 insertions(+), 69 deletions(-)
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index d09a932..2b5e835 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,6 @@
--- php.orig/ext/ldap/ldap.c
+++ php/ext/ldap/ldap.c
-@@ -1335,7 +1335,7 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1338,7 +1338,7 @@ PHP_FUNCTION(ldap_explode_dn)
}
i=0;
@@ -9,7 +9,7 @@
count = i;
array_init(return_value);
-@@ -1345,7 +1345,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1348,7 +1348,8 @@ PHP_FUNCTION(ldap_explode_dn)
add_index_string(return_value, i, ldap_value[i], 1);
}
diff --git a/debian/patches/107-reflection_is_ext.patch b/debian/patches/107-reflection_is_ext.patch
index 73b7307..2712ab2 100644
--- a/debian/patches/107-reflection_is_ext.patch
+++ b/debian/patches/107-reflection_is_ext.patch
@@ -1,6 +1,6 @@
--- 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
+@@ -2,7 +2,7 @@ dnl $Id: config.m4 218722 2006-08-23 09:
dnl config.m4 for extension reflection
PHP_ARG_ENABLE(reflection, whether to enable reflection support,
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index f38aa0a..75863fe 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -2,7 +2,7 @@
+++ php/ext/standard/datetime.c
@@ -20,6 +20,9 @@
- /* $Id: datetime.c,v 1.134.2.2.2.6 2008/12/31 11:17:44 sebastian Exp $ */
+ /* $Id: datetime.c 272374 2008-12-31 11:17:49Z sebastian $ */
+#define _XOPEN_SOURCE /* needed to get strptime() declared */
+#define _BSD_SOURCE /* needed to get ulong declared */
diff --git a/debian/patches/112-proc_open.patch b/debian/patches/112-proc_open.patch
index bcbe70e..f71e447 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,6 +1,6 @@
--- php.orig/ext/standard/proc_open.c
+++ php/ext/standard/proc_open.c
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index e151c45..998cce0 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:39:10.000000000 +0200
-+++ pkg-php/configure.in 2009-08-25 15:39:21.000000000 +0200
+--- php.orig/configure.in
++++ php/configure.in
@@ -1,7 +1,7 @@
## $Id: configure.in 288372 2009-09-16 12:54:51Z iliaa $ -*- 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 @@
+@@ -263,7 +263,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 @@
+@@ -302,7 +302,7 @@ if test "$enable_maintainer_zts" = "yes"
PTHREADS_FLAGS
fi
@@ -49,8 +47,8 @@ Index: pkg-php/configure.in
+dnl divert(3)
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 @@
+ dnl ## core and how to deal with different system dependencies.
+@@ -661,7 +661,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 @@
+@@ -902,7 +902,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:39:10.000000000 +0200
-+++ pkg-php/ext/standard/config.m4 2009-08-25 15:39:23.000000000 +0200
+--- php.orig/ext/standard/config.m4
++++ php/ext/standard/config.m4
@@ -1,6 +1,6 @@
dnl $Id: config.m4 286890 2009-08-06 14:07:16Z scottmac $ -*- 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 @@
+@@ -205,7 +205,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 for regex library type
-Index: pkg-php/scripts/phpize.m4
-===================================================================
---- pkg-php.orig/scripts/phpize.m4 2009-08-25 15:39:10.000000000 +0200
-+++ pkg-php/scripts/phpize.m4 2009-08-25 15:39:23.000000000 +0200
+--- php.orig/scripts/phpize.m4
++++ 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..c67cd0a 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
+--- php.orig/TSRM/tsrm_config_common.h
++++ 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
+--- php.orig/ext/date/lib/parse_tz.c
++++ 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 272374 2008-12-31 11:17:49Z sebastian $ */
+#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>
+--- php.orig/ext/standard/proc_open.c
++++ 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 @@
+--- php.orig/main/php.h
++++ php/main/php.h
+@@ -242,6 +242,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 d651e01..7ec62f7 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,7 +1,7 @@
--- 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"
+ .TH PHP 1 "2009" "The PHP Group" "Scripting Language"
.SH NAME
-.TP 15
php \- PHP Command Line Interface 'CLI'
diff --git a/debian/patches/exif_read_data-segfault.patch b/debian/patches/exif_read_data-segfault.patch
index 424e28d..714fc62 100644
--- a/debian/patches/exif_read_data-segfault.patch
+++ b/debian/patches/exif_read_data-segfault.patch
@@ -1,5 +1,3 @@
-Index: php/ext/exif/exif.c
-===================================================================
--- php.orig/ext/exif/exif.c
+++ php/ext/exif/exif.c
@@ -3219,6 +3219,10 @@ static void exif_process_TIFF_in_JPEG(im
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 71cc5ee..ab24cac 100644
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
@@ -5,7 +5,7 @@ http://bugs.php.net/bug.php?id=47616
Fixed bug #47616 (curl keeps crashing)
--- php.orig/ext/curl/interface.c
+++ php/ext/curl/interface.c
-@@ -1626,6 +1626,7 @@ static int _php_curl_setopt(php_curl *ch
+@@ -1642,6 +1642,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/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
index b08e6dc..947e78f 100644
--- a/debian/patches/libedit_is_editline.patch
+++ b/debian/patches/libedit_is_editline.patch
@@ -1,6 +1,6 @@
--- php.orig/ext/readline/config.m4
+++ php/ext/readline/config.m4
-@@ -55,7 +55,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+@@ -65,7 +65,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
elif test "$PHP_LIBEDIT" != "no"; then
for i in $PHP_LIBEDIT /usr/local /usr; do
diff --git a/debian/patches/mssql-null-exception.patch b/debian/patches/mssql-null-exception.patch
index 9655a21..cfc4d01 100644
--- a/debian/patches/mssql-null-exception.patch
+++ b/debian/patches/mssql-null-exception.patch
@@ -1,8 +1,6 @@
-Index: php/ext/pdo_dblib/dblib_driver.c
-===================================================================
--- php.orig/ext/pdo_dblib/dblib_driver.c
+++ php/ext/pdo_dblib/dblib_driver.c
-@@ -230,10 +230,12 @@ static int pdo_dblib_handle_factory(pdo_
+@@ -230,11 +230,13 @@ static int pdo_dblib_handle_factory(pdo_
goto cleanup;
}
diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index f936a89..07ab42b 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -917,7 +917,7 @@ the following modifications have been made:
--- 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.11 2009/06/07 19:28:32 mattwil Exp $ */
+ /* $Id: zend_hash.c 281779 2009-06-07 19:28:33Z mattwil $ */
#include "zend.h"
+#include "zend_compile.h"
@@ -1408,7 +1408,7 @@ the following modifications have been made:
+sinclude(main/suhosin_patch.m4)
- divert(2)
+ dnl divert(2)
@@ -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 \
@@ -1430,7 +1430,7 @@ the following modifications have been made:
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
--- php.orig/ext/standard/basic_functions.c
+++ php/ext/standard/basic_functions.c
-@@ -3575,7 +3575,9 @@ zend_function_entry basic_functions[] =
+@@ -3574,7 +3574,9 @@ zend_function_entry basic_functions[] =
PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1628,7 +1628,7 @@ the following modifications have been made:
/* }}} */
#ifndef ZTS
-@@ -1376,7 +1379,7 @@ void php_request_shutdown_for_exec(void
+@@ -1371,7 +1374,7 @@ void php_request_shutdown_for_exec(void
/* used to close fd's in the 3..255 range here, but it's problematic
*/
@@ -1637,7 +1637,7 @@ the following modifications have been made:
}
/* }}} */
-@@ -1417,6 +1420,9 @@ void php_request_shutdown_for_hook(void
+@@ -1412,6 +1415,9 @@ void php_request_shutdown_for_hook(void
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1647,7 +1647,7 @@ the following modifications have been made:
} zend_end_try();
zend_try {
-@@ -1511,6 +1517,9 @@ void php_request_shutdown(void *dummy)
+@@ -1506,6 +1512,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);
@@ -1657,7 +1657,7 @@ the following modifications have been made:
} zend_end_try();
/* 12. Reset max_execution_time */
-@@ -1670,6 +1679,9 @@ int php_module_startup(sapi_module_struc
+@@ -1665,6 +1674,9 @@ int php_module_startup(sapi_module_struc
#ifdef ZTS
tsrm_ls = ts_resource(0);
#endif
@@ -1667,7 +1667,7 @@ the following modifications have been made:
module_shutdown = 0;
module_startup = 1;
-@@ -1811,6 +1823,10 @@ int php_module_startup(sapi_module_struc
+@@ -1806,6 +1818,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);
@@ -1678,7 +1678,7 @@ the following modifications have been made:
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);
-@@ -1860,7 +1876,9 @@ int php_module_startup(sapi_module_struc
+@@ -1855,7 +1871,9 @@ int php_module_startup(sapi_module_struc
module_startup = 0;
shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1689,7 +1689,7 @@ the following modifications have been made:
/* we're done */
return SUCCESS;
}
-@@ -1919,6 +1937,9 @@ void php_module_shutdown(TSRMLS_D)
+@@ -1914,6 +1932,9 @@ void php_module_shutdown(TSRMLS_D)
#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1715,7 +1715,7 @@ the following modifications have been made:
/* PHP's DEBUG value must match Zend's ZEND_DEBUG value */
#undef PHP_DEBUG
#define PHP_DEBUG ZEND_DEBUG
-@@ -448,6 +455,10 @@ END_EXTERN_C()
+@@ -452,6 +459,10 @@ END_EXTERN_C()
#endif
#endif /* !XtOffsetOf */
diff --git a/debian/patches/sybase-alias.patch b/debian/patches/sybase-alias.patch
index 2bd57f4..d7e9b5e 100644
--- a/debian/patches/sybase-alias.patch
+++ b/debian/patches/sybase-alias.patch
@@ -1,5 +1,3 @@
-Index: php/ext/mssql/php_mssql.c
-===================================================================
--- php.orig/ext/mssql/php_mssql.c
+++ php/ext/mssql/php_mssql.c
@@ -78,6 +78,38 @@ zend_function_entry mssql_functions[] =
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index 2e177ad..d3f96b3 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -10,7 +10,7 @@ r1: initial revision
--- php.orig/ext/date/lib/parse_tz.c
+++ php/ext/date/lib/parse_tz.c
-@@ -20,6 +20,16 @@
+@@ -24,6 +24,16 @@
#include "timelib.h"
@@ -27,7 +27,7 @@ r1: initial revision
#include <stdio.h>
#ifdef HAVE_LOCALE_H
-@@ -31,7 +41,10 @@
+@@ -35,7 +45,10 @@
#else
#include <strings.h>
#endif
@@ -38,7 +38,7 @@ r1: initial revision
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
-@@ -212,6 +225,211 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -216,6 +229,211 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
}
@@ -250,7 +250,7 @@ r1: initial revision
static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
{
int left = 0, right = tzdb->index_size - 1;
-@@ -285,6 +503,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+@@ -289,6 +507,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
return tmp;
}
@@ -293,7 +293,7 @@ r1: initial revision
+
--- php.orig/ext/date/php_date.c
+++ php/ext/date/php_date.c
-@@ -595,6 +595,11 @@ static char* guess_timezone(const timeli
+@@ -599,6 +599,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