[Pkg-php-commits] r1253 - php5/trunk/debian/patches
Sean Finney
seanius at alioth.debian.org
Sun Mar 22 10:20:47 UTC 2009
Author: seanius
Date: 2009-03-22 10:20:47 +0000 (Sun, 22 Mar 2009)
New Revision: 1253
Modified:
php5/trunk/debian/patches/001-libtool_fixes.patch
php5/trunk/debian/patches/002-static_openssl.patch
php5/trunk/debian/patches/004-ldap_fix.patch
php5/trunk/debian/patches/006-debian_quirks.patch
php5/trunk/debian/patches/013-force_getaddrinfo.patch
php5/trunk/debian/patches/017-pread_pwrite_disable.patch
php5/trunk/debian/patches/019-z_off_t_as_long.patch
php5/trunk/debian/patches/029-php.ini_paranoid.patch
php5/trunk/debian/patches/033-we_WANT_libtool.patch
php5/trunk/debian/patches/034-apache2_umask_fix.patch
php5/trunk/debian/patches/036-fd_setsize_fix.patch
php5/trunk/debian/patches/043-recode_size_t.patch
php5/trunk/debian/patches/044-strtod_arm_fix.patch
php5/trunk/debian/patches/045-exif_nesting_level.patch
php5/trunk/debian/patches/047-zts_with_dl.patch
php5/trunk/debian/patches/052-phpinfo_no_configure.patch
php5/trunk/debian/patches/053-extension_api.patch
php5/trunk/debian/patches/056-mime_magic_liberal.patch
php5/trunk/debian/patches/057-no_apache_installed.patch
php5/trunk/debian/patches/100-recode_is_shared.patch
php5/trunk/debian/patches/101-sqlite_is_shared.patch
php5/trunk/debian/patches/107-reflection_is_ext.patch
php5/trunk/debian/patches/108-64_bit_datetime.patch
php5/trunk/debian/patches/112-proc_open.patch
php5/trunk/debian/patches/113-php.ini_securitynotes.patch
php5/trunk/debian/patches/bad_whatis_entries.patch
php5/trunk/debian/patches/disable_dl_by_default.patch
php5/trunk/debian/patches/fix_broken_upstream_tests.patch
php5/trunk/debian/patches/force_libmysqlclient_r.patch
php5/trunk/debian/patches/libdb_is_-ldb
php5/trunk/debian/patches/libedit_is_editline.patch
php5/trunk/debian/patches/manpage_spelling.patch
php5/trunk/debian/patches/suhosin.patch
php5/trunk/debian/patches/use_embedded_timezonedb.patch
Log:
fix broken fix-broken-upstream-tests patch
Modified: php5/trunk/debian/patches/001-libtool_fixes.patch
===================================================================
--- php5/trunk/debian/patches/001-libtool_fixes.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/001-libtool_fixes.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/TSRM/configure.in
-===================================================================
---- php5-5.2.6.orig/TSRM/configure.in
-+++ php5-5.2.6/TSRM/configure.in
+--- php5-5.2.9.dfsg.1.orig/TSRM/configure.in
++++ php5-5.2.9.dfsg.1/TSRM/configure.in
@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
@@ -12,12 +10,10 @@
dnl TSRM_PTHREAD
-Index: php5-5.2.6/configure.in
-===================================================================
---- php5-5.2.6.orig/configure.in
-+++ php5-5.2.6/configure.in
-@@ -1256,9 +1256,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC
- AC_DEFUN([AC_PROG_CXX], [])])
+--- 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], [],
+ ])
AC_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
Modified: php5/trunk/debian/patches/002-static_openssl.patch
===================================================================
--- php5/trunk/debian/patches/002-static_openssl.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/002-static_openssl.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/acinclude.m4
-===================================================================
---- php5-5.2.6.orig/acinclude.m4
-+++ php5-5.2.6/acinclude.m4
-@@ -2364,9 +2364,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+--- 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_ADD_INCLUDE($OPENSSL_INCDIR)
Modified: php5/trunk/debian/patches/004-ldap_fix.patch
===================================================================
--- php5/trunk/debian/patches/004-ldap_fix.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/004-ldap_fix.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/ldap/ldap.c
-===================================================================
---- php5-5.2.6.orig/ext/ldap/ldap.c
-+++ php5-5.2.6/ext/ldap/ldap.c
+--- 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)
}
Modified: php5/trunk/debian/patches/006-debian_quirks.patch
===================================================================
--- php5/trunk/debian/patches/006-debian_quirks.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/006-debian_quirks.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/configure.in
-===================================================================
---- php5-5.2.6.orig/configure.in
-+++ php5-5.2.6/configure.in
-@@ -934,7 +934,7 @@ if test "$PHP_CLI" = "no"; then
+--- php5-5.2.9.dfsg.1.orig/configure.in
++++ php5-5.2.9.dfsg.1/configure.in
+@@ -977,7 +977,7 @@ if test "$PHP_CLI" = "no"; then
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -11,7 +9,7 @@
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
-@@ -968,7 +968,7 @@ dnl
+@@ -1011,7 +1011,7 @@ dnl
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -20,7 +18,7 @@
esac
fi
-@@ -1023,12 +1023,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1066,12 +1066,12 @@ test "$program_suffix" = "NONE" && progr
case $libdir in
'${exec_prefix}/lib')
@@ -33,9 +31,9 @@
- datadir=$datadir/php
+ datadir=$datadir/php5
;;
- *) ;;
esac
-@@ -1094,7 +1094,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+
+@@ -1136,7 +1136,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -44,10 +42,8 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-Index: php5-5.2.6/ext/ext_skel
-===================================================================
---- php5-5.2.6.orig/ext/ext_skel
-+++ php5-5.2.6/ext/ext_skel
+--- php5-5.2.9.dfsg.1.orig/ext/ext_skel
++++ php5-5.2.9.dfsg.1/ext/ext_skel
@@ -70,7 +70,7 @@ if test -d "$extname" ; then
fi
@@ -57,10 +53,8 @@
fi
## convert skel_dir to full path
-Index: php5-5.2.6/ext/session/session.c
-===================================================================
---- php5-5.2.6.orig/ext/session/session.c
-+++ php5-5.2.6/ext/session/session.c
+--- php5-5.2.9.dfsg.1.orig/ext/session/session.c
++++ php5-5.2.9.dfsg.1/ext/session/session.c
@@ -181,11 +181,11 @@ static PHP_INI_MH(OnUpdateSaveDir)
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("session.bug_compat_42", "1", PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals, ps_globals)
@@ -75,11 +69,9 @@
STD_PHP_INI_ENTRY("session.gc_divisor", "100", PHP_INI_ALL, OnUpdateLong, gc_divisor, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, OnUpdateLong, gc_maxlifetime, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, OnUpdateSerializer)
-Index: php5-5.2.6/php.ini-dist
-===================================================================
---- php5-5.2.6.orig/php.ini-dist
-+++ php5-5.2.6/php.ini-dist
-@@ -466,7 +466,7 @@ default_mimetype = "text/html"
+--- php5-5.2.9.dfsg.1.orig/php.ini-dist
++++ php5-5.2.9.dfsg.1/php.ini-dist
+@@ -471,7 +471,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -88,7 +80,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -483,7 +483,7 @@ doc_root =
+@@ -488,7 +488,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -97,7 +89,7 @@
; 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
-@@ -596,58 +596,6 @@ default_socket_timeout = 60
+@@ -601,58 +601,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -156,7 +148,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -988,7 +936,7 @@ session.save_handler = files
+@@ -989,7 +937,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -165,7 +157,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1026,7 +974,12 @@ session.serialize_handler = php
+@@ -1027,7 +975,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -179,11 +171,9 @@
session.gc_divisor = 100
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.6/php.ini-recommended
-===================================================================
---- php5-5.2.6.orig/php.ini-recommended
-+++ php5-5.2.6/php.ini-recommended
-@@ -516,7 +516,7 @@ default_mimetype = "text/html"
+--- php5-5.2.9.dfsg.1.orig/php.ini-recommended
++++ php5-5.2.9.dfsg.1/php.ini-recommended
+@@ -522,7 +522,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -192,7 +182,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -533,7 +533,7 @@ doc_root =
+@@ -539,7 +539,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -201,7 +191,7 @@
; 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
-@@ -646,58 +646,6 @@ default_socket_timeout = 60
+@@ -652,58 +652,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -260,7 +250,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -1038,7 +986,7 @@ session.save_handler = files
+@@ -1040,7 +988,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -269,7 +259,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1076,7 +1024,12 @@ session.serialize_handler = php
+@@ -1078,7 +1026,12 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -283,10 +273,8 @@
session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.6/sapi/caudium/config.m4
-===================================================================
---- php5-5.2.6.orig/sapi/caudium/config.m4
-+++ php5-5.2.6/sapi/caudium/config.m4
+--- php5-5.2.9.dfsg.1.orig/sapi/caudium/config.m4
++++ php5-5.2.9.dfsg.1/sapi/caudium/config.m4
@@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then
AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/])
fi
@@ -309,10 +297,8 @@
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
-Index: php5-5.2.6/sapi/cli/php.1.in
-===================================================================
---- php5-5.2.6.orig/sapi/cli/php.1.in
-+++ php5-5.2.6/sapi/cli/php.1.in
+--- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
++++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
@@ -306,13 +306,14 @@ Shows configuration for extension
.B name
.SH FILES
@@ -333,10 +319,8 @@
.SH EXAMPLES
.TP 5
\fIphp -r 'echo "Hello World\\n";'\fP
-Index: php5-5.2.6/scripts/Makefile.frag
-===================================================================
---- php5-5.2.6.orig/scripts/Makefile.frag
-+++ php5-5.2.6/scripts/Makefile.frag
+--- php5-5.2.9.dfsg.1.orig/scripts/Makefile.frag
++++ php5-5.2.9.dfsg.1/scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -348,10 +332,8 @@
BUILD_FILES = \
scripts/phpize.m4 \
-Index: php5-5.2.6/scripts/php-config.in
-===================================================================
---- php5-5.2.6.orig/scripts/php-config.in
-+++ php5-5.2.6/scripts/php-config.in
+--- php5-5.2.9.dfsg.1.orig/scripts/php-config.in
++++ php5-5.2.9.dfsg.1/scripts/php-config.in
@@ -5,8 +5,8 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
@@ -363,10 +345,8 @@
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
-Index: php5-5.2.6/scripts/phpize.in
-===================================================================
---- php5-5.2.6.orig/scripts/phpize.in
-+++ php5-5.2.6/scripts/phpize.in
+--- php5-5.2.9.dfsg.1.orig/scripts/phpize.in
++++ php5-5.2.9.dfsg.1/scripts/phpize.in
@@ -3,8 +3,8 @@
# Variable declaration
prefix='@prefix@'
Modified: php5/trunk/debian/patches/013-force_getaddrinfo.patch
===================================================================
--- php5/trunk/debian/patches/013-force_getaddrinfo.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/013-force_getaddrinfo.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/configure.in
-===================================================================
---- php5-5.2.6.orig/configure.in
-+++ php5-5.2.6/configure.in
-@@ -557,50 +557,50 @@ vsnprintf \
+--- php5-5.2.9.dfsg.1.orig/configure.in
++++ php5-5.2.9.dfsg.1/configure.in
+@@ -596,50 +596,50 @@ vsnprintf \
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
Modified: php5/trunk/debian/patches/017-pread_pwrite_disable.patch
===================================================================
--- php5/trunk/debian/patches/017-pread_pwrite_disable.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/017-pread_pwrite_disable.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/acinclude.m4
-===================================================================
---- php5-5.2.6.orig/acinclude.m4
-+++ php5-5.2.6/acinclude.m4
-@@ -1210,7 +1210,7 @@ $1
+--- php5-5.2.9.dfsg.1.orig/acinclude.m4
++++ php5-5.2.9.dfsg.1/acinclude.m4
+@@ -1216,7 +1216,7 @@ $1
}
],[
@@ -11,7 +9,7 @@
],[
ac_cv_pwrite=no
],[
-@@ -1239,7 +1239,7 @@ $1
+@@ -1245,7 +1245,7 @@ $1
exit(0);
}
],[
Modified: php5/trunk/debian/patches/019-z_off_t_as_long.patch
===================================================================
--- php5/trunk/debian/patches/019-z_off_t_as_long.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/019-z_off_t_as_long.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/zlib/zconf.h
-===================================================================
--- /dev/null
-+++ php5-5.2.6/ext/zlib/zconf.h
++++ php5-5.2.9.dfsg.1/ext/zlib/zconf.h
@@ -0,0 +1,326 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -329,10 +327,8 @@
+#endif
+
+#endif /* ZCONF_H */
-Index: php5-5.2.6/ext/zlib/zlib.h
-===================================================================
--- /dev/null
-+++ php5-5.2.6/ext/zlib/zlib.h
++++ php5-5.2.9.dfsg.1/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
Modified: php5/trunk/debian/patches/029-php.ini_paranoid.patch
===================================================================
--- php5/trunk/debian/patches/029-php.ini_paranoid.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/029-php.ini_paranoid.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/php.ini-paranoid
-===================================================================
--- /dev/null
-+++ php5-5.2.6/php.ini-paranoid
++++ php5-5.2.9.dfsg.1/php.ini-paranoid
@@ -0,0 +1,1504 @@
+[PHP]
+
Modified: php5/trunk/debian/patches/033-we_WANT_libtool.patch
===================================================================
--- php5/trunk/debian/patches/033-we_WANT_libtool.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/033-we_WANT_libtool.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/build/build2.mk
-===================================================================
---- php5-5.2.6.orig/build/build2.mk
-+++ php5-5.2.6/build/build2.mk
+--- php5-5.2.9.dfsg.1.orig/build/build2.mk
++++ php5-5.2.9.dfsg.1/build/build2.mk
@@ -52,6 +52,15 @@ $(TOUCH_FILES):
aclocal.m4: configure.in acinclude.m4
Modified: php5/trunk/debian/patches/034-apache2_umask_fix.patch
===================================================================
--- php5/trunk/debian/patches/034-apache2_umask_fix.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/034-apache2_umask_fix.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,10 +1,8 @@
Save and restore umask across requests correctly.
-Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
-===================================================================
---- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+--- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
@@ -25,7 +23,7 @@
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_length;
-@@ -620,6 +633,8 @@ zend_first_try {
+@@ -623,6 +636,8 @@ zend_first_try {
} else {
zend_file_handle zfd;
@@ -34,7 +32,7 @@
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
-@@ -631,6 +646,9 @@ zend_first_try {
+@@ -634,6 +649,9 @@ zend_first_try {
zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd);
}
Modified: php5/trunk/debian/patches/036-fd_setsize_fix.patch
===================================================================
--- php5/trunk/debian/patches/036-fd_setsize_fix.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/036-fd_setsize_fix.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/ext/sockets/sockets.c
-===================================================================
---- php5-5.2.6.orig/ext/sockets/sockets.c
-+++ php5-5.2.6/ext/sockets/sockets.c
-@@ -566,6 +566,7 @@ static int php_sock_array_to_fd_set(zval
+--- 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_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket);
if (!php_sock) continue; /* If element is not a resource, skip it */
@@ -10,11 +8,9 @@
PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
if (php_sock->bsd_socket > *max_fd) {
-Index: php5-5.2.6/ext/standard/streamsfuncs.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/streamsfuncs.c
-+++ php5-5.2.6/ext/standard/streamsfuncs.c
-@@ -592,6 +592,9 @@ static int stream_array_to_fd_set(zval *
+--- 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 *
* 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) {
Modified: php5/trunk/debian/patches/043-recode_size_t.patch
===================================================================
--- php5/trunk/debian/patches/043-recode_size_t.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/043-recode_size_t.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/recode/recode.c
-===================================================================
---- php5-5.2.6.orig/ext/recode/recode.c
-+++ php5-5.2.6/ext/recode/recode.c
+--- php5-5.2.9.dfsg.1.orig/ext/recode/recode.c
++++ php5-5.2.9.dfsg.1/ext/recode/recode.c
@@ -136,7 +136,7 @@ PHP_FUNCTION(recode_string)
int req_len, str_len;
char *req, *str;
Modified: php5/trunk/debian/patches/044-strtod_arm_fix.patch
===================================================================
--- php5/trunk/debian/patches/044-strtod_arm_fix.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/044-strtod_arm_fix.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/Zend/zend_strtod.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_strtod.c
-+++ php5-5.2.6/Zend/zend_strtod.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_strtod.c
++++ php5-5.2.9.dfsg.1/Zend/zend_strtod.c
@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
#define IEEE_LITTLE_ENDIAN
#endif
Modified: php5/trunk/debian/patches/045-exif_nesting_level.patch
===================================================================
--- php5/trunk/debian/patches/045-exif_nesting_level.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/045-exif_nesting_level.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/exif/exif.c
-===================================================================
---- php5-5.2.6.orig/ext/exif/exif.c
-+++ php5-5.2.6/ext/exif/exif.c
+--- php5-5.2.9.dfsg.1.orig/ext/exif/exif.c
++++ php5-5.2.9.dfsg.1/ext/exif/exif.c
@@ -99,7 +99,7 @@ typedef unsigned char uchar;
#define EFREE_IF(ptr) if (ptr) efree(ptr)
Modified: php5/trunk/debian/patches/047-zts_with_dl.patch
===================================================================
--- php5/trunk/debian/patches/047-zts_with_dl.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/047-zts_with_dl.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/standard/dl.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/dl.c
-+++ php5-5.2.6/ext/standard/dl.c
+--- php5-5.2.9.dfsg.1.orig/ext/standard/dl.c
++++ php5-5.2.9.dfsg.1/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) &&
Modified: php5/trunk/debian/patches/052-phpinfo_no_configure.patch
===================================================================
--- php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/ext/standard/info.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/info.c
-+++ php5-5.2.6/ext/standard/info.c
-@@ -486,7 +486,7 @@ PHPAPI void php_print_info(int flag TSRM
+--- php5-5.2.9.dfsg.1.orig/ext/standard/info.c
++++ php5-5.2.9.dfsg.1/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 );
php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__ );
@@ -11,10 +9,8 @@
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
if (sapi_module.pretty_name) {
-Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
-===================================================================
---- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
+--- 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
@@ -20,7 +20,6 @@ PHP Version => %s
System => %s
Modified: php5/trunk/debian/patches/053-extension_api.patch
===================================================================
--- php5/trunk/debian/patches/053-extension_api.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/053-extension_api.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/configure.in
-===================================================================
---- php5-5.2.6.orig/configure.in
-+++ php5-5.2.6/configure.in
-@@ -1048,8 +1048,13 @@ dnl Build extension directory path
+--- 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
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
@@ -17,7 +15,7 @@
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1193,6 +1198,7 @@ PHP_SUBST(CXX)
+@@ -1236,6 +1241,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -25,10 +23,8 @@
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
-Index: php5-5.2.6/scripts/php-config.in
-===================================================================
---- php5-5.2.6.orig/scripts/php-config.in
-+++ php5-5.2.6/scripts/php-config.in
+--- php5-5.2.9.dfsg.1.orig/scripts/php-config.in
++++ php5-5.2.9.dfsg.1/scripts/php-config.in
@@ -17,6 +17,7 @@ php_cli_binary=NONE
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
Modified: php5/trunk/debian/patches/056-mime_magic_liberal.patch
===================================================================
--- php5/trunk/debian/patches/056-mime_magic_liberal.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/056-mime_magic_liberal.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/mime_magic/mime_magic.c
-===================================================================
---- php5-5.2.6.orig/ext/mime_magic/mime_magic.c
-+++ php5-5.2.6/ext/mime_magic/mime_magic.c
+--- 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
@@ -501,7 +501,7 @@ static int is_valid_mimetype(char *p, in
} while (*(++p) != '/');
++p;
Modified: php5/trunk/debian/patches/057-no_apache_installed.patch
===================================================================
--- php5/trunk/debian/patches/057-no_apache_installed.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/057-no_apache_installed.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/sapi/apache2handler/config.m4
-===================================================================
---- php5-5.2.6.orig/sapi/apache2handler/config.m4
-+++ php5-5.2.6/sapi/apache2handler/config.m4
+--- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/config.m4
++++ php5-5.2.9.dfsg.1/sapi/apache2handler/config.m4
@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -23,10 +21,8 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.6/sapi/apache/config.m4
-===================================================================
---- php5-5.2.6.orig/sapi/apache/config.m4
-+++ php5-5.2.6/sapi/apache/config.m4
+--- php5-5.2.9.dfsg.1.orig/sapi/apache/config.m4
++++ php5-5.2.9.dfsg.1/sapi/apache/config.m4
@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -44,10 +40,8 @@
for flag in $APXS_CFLAGS; do
case $flag in
-Index: php5-5.2.6/sapi/apache2filter/config.m4
-===================================================================
---- php5-5.2.6.orig/sapi/apache2filter/config.m4
-+++ php5-5.2.6/sapi/apache2filter/config.m4
+--- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/config.m4
++++ php5-5.2.9.dfsg.1/sapi/apache2filter/config.m4
@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -69,10 +63,8 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.6/sapi/apache_hooks/config.m4
-===================================================================
---- php5-5.2.6.orig/sapi/apache_hooks/config.m4
-+++ php5-5.2.6/sapi/apache_hooks/config.m4
+--- php5-5.2.9.dfsg.1.orig/sapi/apache_hooks/config.m4
++++ php5-5.2.9.dfsg.1/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
Modified: php5/trunk/debian/patches/100-recode_is_shared.patch
===================================================================
--- php5/trunk/debian/patches/100-recode_is_shared.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/100-recode_is_shared.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/recode/config9.m4
-===================================================================
---- php5-5.2.6.orig/ext/recode/config9.m4
-+++ php5-5.2.6/ext/recode/config9.m4
+--- php5-5.2.9.dfsg.1.orig/ext/recode/config9.m4
++++ php5-5.2.9.dfsg.1/ext/recode/config9.m4
@@ -8,6 +8,6 @@ if test "$PHP_RECODE" != "no"; then
test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
Modified: php5/trunk/debian/patches/101-sqlite_is_shared.patch
===================================================================
--- php5/trunk/debian/patches/101-sqlite_is_shared.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/101-sqlite_is_shared.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/sqlite/config.m4
-===================================================================
---- php5-5.2.6.orig/ext/sqlite/config.m4
-+++ php5-5.2.6/ext/sqlite/config.m4
+--- php5-5.2.9.dfsg.1.orig/ext/sqlite/config.m4
++++ php5-5.2.9.dfsg.1/ext/sqlite/config.m4
@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
])
SQLITE_MODULE_TYPE=external
Modified: php5/trunk/debian/patches/107-reflection_is_ext.patch
===================================================================
--- php5/trunk/debian/patches/107-reflection_is_ext.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/107-reflection_is_ext.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/reflection/config.m4
-===================================================================
---- php5-5.2.6.orig/ext/reflection/config.m4
-+++ php5-5.2.6/ext/reflection/config.m4
+--- php5-5.2.9.dfsg.1.orig/ext/reflection/config.m4
++++ php5-5.2.9.dfsg.1/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
Modified: php5/trunk/debian/patches/108-64_bit_datetime.patch
===================================================================
--- php5/trunk/debian/patches/108-64_bit_datetime.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/108-64_bit_datetime.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,10 +1,8 @@
-Index: php5-5.2.6/ext/standard/datetime.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/datetime.c
-+++ php5-5.2.6/ext/standard/datetime.c
+--- php5-5.2.9.dfsg.1.orig/ext/standard/datetime.c
++++ php5-5.2.9.dfsg.1/ext/standard/datetime.c
@@ -20,6 +20,9 @@
- /* $Id: datetime.c,v 1.134.2.2.2.5 2007/12/31 07:20:12 sebastian Exp $ */
+ /* $Id: datetime.c,v 1.134.2.2.2.6 2008/12/31 11:17:44 sebastian Exp $ */
+#define _XOPEN_SOURCE /* needed to get strptime() declared */
+#define _BSD_SOURCE /* needed to get ulong declared */
Modified: php5/trunk/debian/patches/112-proc_open.patch
===================================================================
--- php5/trunk/debian/patches/112-proc_open.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/112-proc_open.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/standard/proc_open.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/proc_open.c
-+++ php5-5.2.6/ext/standard/proc_open.c
+--- php5-5.2.9.dfsg.1.orig/ext/standard/proc_open.c
++++ php5-5.2.9.dfsg.1/ext/standard/proc_open.c
@@ -61,7 +61,7 @@
* */
#ifdef PHP_CAN_SUPPORT_PROC_OPEN
Modified: php5/trunk/debian/patches/113-php.ini_securitynotes.patch
===================================================================
--- php5/trunk/debian/patches/113-php.ini_securitynotes.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/113-php.ini_securitynotes.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/php.ini-dist
-===================================================================
---- php5-5.2.6.orig/php.ini-dist
-+++ php5-5.2.6/php.ini-dist
+--- php5-5.2.9.dfsg.1.orig/php.ini-dist
++++ php5-5.2.9.dfsg.1/php.ini-dist
@@ -166,6 +166,11 @@ allow_call_time_pass_reference = On
;
; Safe Mode
@@ -28,7 +26,7 @@
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
-@@ -411,6 +423,11 @@ variables_order = "EGPCS"
+@@ -416,6 +428,11 @@ variables_order = "EGPCS"
; You should do your best to write your scripts so that they do not require
; register_globals to be on; Using form variables as globals can easily lead
; to possible security problems, if the code is not very well thought of.
Modified: php5/trunk/debian/patches/bad_whatis_entries.patch
===================================================================
--- php5/trunk/debian/patches/bad_whatis_entries.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/bad_whatis_entries.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/sapi/cli/php.1.in
-===================================================================
---- php5-5.2.6.orig/sapi/cli/php.1.in
-+++ php5-5.2.6/sapi/cli/php.1.in
+--- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
++++ php5-5.2.9.dfsg.1/sapi/cli/php.1.in
@@ -1,6 +1,5 @@
.TH PHP 1 "2008" "The PHP Group" "Scripting Language"
.SH NAME
@@ -9,10 +7,8 @@
php \- PHP Command Line Interface 'CLI'
.SH SYNOPSIS
.B php
-Index: php5-5.2.6/scripts/man1/php-config.1.in
-===================================================================
---- php5-5.2.6.orig/scripts/man1/php-config.1.in
-+++ php5-5.2.6/scripts/man1/php-config.1.in
+--- 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
@@ -1,6 +1,5 @@
.TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
@@ -20,10 +16,8 @@
php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS
.B php\-config
-Index: php5-5.2.6/scripts/man1/phpize.1.in
-===================================================================
---- php5-5.2.6.orig/scripts/man1/phpize.1.in
-+++ php5-5.2.6/scripts/man1/phpize.1.in
+--- php5-5.2.9.dfsg.1.orig/scripts/man1/phpize.1.in
++++ php5-5.2.9.dfsg.1/scripts/man1/phpize.1.in
@@ -1,7 +1,6 @@
.TH phpize 1 "2006" "The PHP Group" "Scripting Language"
.SH NAME
Modified: php5/trunk/debian/patches/disable_dl_by_default.patch
===================================================================
--- php5/trunk/debian/patches/disable_dl_by_default.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/disable_dl_by_default.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.6/php.ini-dist
-===================================================================
---- php5-5.2.6.orig/php.ini-dist
-+++ php5-5.2.6/php.ini-dist
-@@ -505,7 +505,8 @@ user_dir =
+--- php5-5.2.9.dfsg.1.orig/php.ini-dist
++++ php5-5.2.9.dfsg.1/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
; disabled on them.
@@ -12,11 +10,9 @@
; 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
-Index: php5-5.2.6/php.ini-recommended
-===================================================================
---- php5-5.2.6.orig/php.ini-recommended
-+++ php5-5.2.6/php.ini-recommended
-@@ -538,7 +538,9 @@ user_dir =
+--- php5-5.2.9.dfsg.1.orig/php.ini-recommended
++++ php5-5.2.9.dfsg.1/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
; disabled on them.
Modified: php5/trunk/debian/patches/fix_broken_upstream_tests.patch
===================================================================
--- php5/trunk/debian/patches/fix_broken_upstream_tests.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/fix_broken_upstream_tests.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,19 +1,5 @@
-Index: php5-5.2.6/tests/basic/bug20539.phpt
-===================================================================
---- php5-5.2.6.orig/tests/basic/bug20539.phpt
-+++ php5-5.2.6/tests/basic/bug20539.phpt
-@@ -3,6 +3,7 @@ Bug #20539 (PHP CLI Segmentation Fault)
- --INI--
- session.auto_start=1
- session.save_handler=files
-+session.save_path=temp_session_store
- --FILE--
- <?php
- print "good :)\n";
-Index: php5-5.2.6/ext/soap/tests/server009.phpt
-===================================================================
---- php5-5.2.6.orig/ext/soap/tests/server009.phpt
-+++ php5-5.2.6/ext/soap/tests/server009.phpt
+--- php5-5.2.9.dfsg.1.orig/ext/soap/tests/server009.phpt
++++ php5-5.2.9.dfsg.1/ext/soap/tests/server009.phpt
@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
die('skip this test needs session extension');
}
@@ -25,10 +11,8 @@
--FILE--
<?php
class foo {
-Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
-===================================================================
---- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
+--- 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
@@ -1,5 +1,7 @@
--TEST--
phpinfo()
@@ -45,10 +29,8 @@
PHP API => %d
PHP Extension => %d
Zend Extension => %d
-Index: php5-5.2.6/ext/standard/tests/strings/moneyformat.phpt
-===================================================================
---- php5-5.2.6.orig/ext/standard/tests/strings/moneyformat.phpt
-+++ php5-5.2.6/ext/standard/tests/strings/moneyformat.phpt
+--- 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
@@ -5,6 +5,8 @@ money_format test
if (!function_exists('money_format') || !function_exists('setlocale')) {
die("SKIP money_format - not supported\n");
Modified: php5/trunk/debian/patches/force_libmysqlclient_r.patch
===================================================================
--- php5/trunk/debian/patches/force_libmysqlclient_r.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/force_libmysqlclient_r.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,8 +1,6 @@
-Index: php5-5.2.5/ext/mysql/config.m4
-===================================================================
---- php5-5.2.5.orig/ext/mysql/config.m4 2008-03-01 21:03:07.000000000 +0100
-+++ php5-5.2.5/ext/mysql/config.m4 2008-03-01 21:03:36.000000000 +0100
-@@ -86,7 +86,7 @@
+--- php5-5.2.9.dfsg.1.orig/ext/mysql/config.m4
++++ php5-5.2.9.dfsg.1/ext/mysql/config.m4
+@@ -86,7 +86,7 @@ if test "$PHP_MYSQL" != "no"; then
Note that the MySQL client library is not bundled anymore!])
fi
@@ -11,11 +9,9 @@
MYSQL_LIBNAME=mysqlclient_r
else
MYSQL_LIBNAME=mysqlclient
-Index: php5-5.2.5/ext/mysqli/config.m4
-===================================================================
---- php5-5.2.5.orig/ext/mysqli/config.m4 2008-03-01 21:03:07.000000000 +0100
-+++ php5-5.2.5/ext/mysqli/config.m4 2008-03-01 21:03:58.000000000 +0100
-@@ -26,7 +26,7 @@
+--- php5-5.2.9.dfsg.1.orig/ext/mysqli/config.m4
++++ php5-5.2.9.dfsg.1/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])
MYSQL_LIB_CFG='--libmysqld-libs'
@@ -24,11 +20,9 @@
MYSQL_LIB_CFG='--libs_r'
MYSQL_LIB_NAME='mysqlclient_r'
else
-Index: php5-5.2.5/ext/pdo_mysql/config.m4
-===================================================================
---- php5-5.2.5.orig/ext/pdo_mysql/config.m4 2008-03-01 21:03:07.000000000 +0100
-+++ php5-5.2.5/ext/pdo_mysql/config.m4 2008-03-01 21:03:50.000000000 +0100
-@@ -58,7 +58,7 @@
+--- php5-5.2.9.dfsg.1.orig/ext/pdo_mysql/config.m4
++++ php5-5.2.9.dfsg.1/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)
fi
Modified: php5/trunk/debian/patches/libdb_is_-ldb
===================================================================
--- php5/trunk/debian/patches/libdb_is_-ldb 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/libdb_is_-ldb 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/dba/config.m4
-===================================================================
---- php5-5.2.6.orig/ext/dba/config.m4
-+++ php5-5.2.6/ext/dba/config.m4
+--- php5-5.2.9.dfsg.1.orig/ext/dba/config.m4
++++ php5-5.2.9.dfsg.1/ext/dba/config.m4
@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
Modified: php5/trunk/debian/patches/libedit_is_editline.patch
===================================================================
--- php5/trunk/debian/patches/libedit_is_editline.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/libedit_is_editline.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/ext/readline/config.m4
-===================================================================
---- php5-5.2.6.orig/ext/readline/config.m4
-+++ php5-5.2.6/ext/readline/config.m4
+--- 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
elif test "$PHP_LIBEDIT" != "no"; then
@@ -11,10 +9,8 @@
done
if test -z "$LIBEDIT_DIR"; then
-Index: php5-5.2.6/ext/readline/readline.c
-===================================================================
---- php5-5.2.6.orig/ext/readline/readline.c
-+++ php5-5.2.6/ext/readline/readline.c
+--- php5-5.2.9.dfsg.1.orig/ext/readline/readline.c
++++ php5-5.2.9.dfsg.1/ext/readline/readline.c
@@ -33,8 +33,10 @@
#define rl_completion_matches completion_matches
#endif
Modified: php5/trunk/debian/patches/manpage_spelling.patch
===================================================================
--- php5/trunk/debian/patches/manpage_spelling.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/manpage_spelling.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,7 +1,5 @@
-Index: php5-5.2.6/sapi/cli/php.1.in
-===================================================================
---- php5-5.2.6.orig/sapi/cli/php.1.in
-+++ php5-5.2.6/sapi/cli/php.1.in
+--- php5-5.2.9.dfsg.1.orig/sapi/cli/php.1.in
++++ php5-5.2.9.dfsg.1/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
Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/suhosin.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -1,12 +1,5 @@
-suhosin hardening patch
-Copyright © 2006-2007 Stefan Esser <sesser at hardened-php.net>
-Suhosin is licensed under the PHP License Version 3.01
-downloaded from http://www.hardened-php.net/suhosin/download.html
-modified to not patch autofoo output scripts (configure/Makefile.in/etc)
-Index: php5-5.2.6/TSRM/TSRM.h
-===================================================================
---- php5-5.2.6.orig/TSRM/TSRM.h
-+++ php5-5.2.6/TSRM/TSRM.h
+--- php5-5.2.9.dfsg.1.orig/TSRM/TSRM.h
++++ php5-5.2.9.dfsg.1/TSRM/TSRM.h
@@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
typedef unsigned long tsrm_uintptr_t;
#endif
@@ -29,11 +22,9 @@
#ifdef __cplusplus
extern "C" {
#endif
-Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.c
-===================================================================
---- php5-5.2.6.orig/TSRM/tsrm_virtual_cwd.c
-+++ php5-5.2.6/TSRM/tsrm_virtual_cwd.c
-@@ -273,6 +273,178 @@ static char *tsrm_strndup(const char *s,
+--- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.c
++++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.c
+@@ -273,6 +273,191 @@ static char *tsrm_strndup(const char *s,
}
/* }}} */
@@ -99,9 +90,17 @@
+ }
+ if (next_token[0] == '\0')
+ continue;
-+ else if (strcmp(next_token, ".") == 0)
++ else if (strcmp(next_token, ".") == 0){
++ if (!is_dir) {
++ resolved_len = strlcat(resolved, "#", PATH_MAX);
++ if (resolved_len >= PATH_MAX) {
++ errno = ENAMETOOLONG;
++ return (NULL);
++ }
++ return resolved;
++ }
+ continue;
-+ else if (strcmp(next_token, "..") == 0) {
++ } else if (strcmp(next_token, "..") == 0) {
+ /*
+ * Strip the last path component except when we have
+ * single "/"
@@ -202,8 +201,13 @@
+ * Remove trailing slash except when the resolved pathname
+ * is a single "/".
+ */
-+ if (resolved_len > 1 && resolved[resolved_len - 1] == '/')
++ if (resolved_len > 1 && resolved[resolved_len - 1] == '/') {
++ if (!is_dir) {
++ errno = ENOENT;
++ return (NULL);
++ }
+ resolved[resolved_len - 1] = '\0';
++ }
+ return (resolved);
+}
+#endif
@@ -212,10 +216,8 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
-Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.h
-===================================================================
---- php5-5.2.6.orig/TSRM/tsrm_virtual_cwd.h
-+++ php5-5.2.6/TSRM/tsrm_virtual_cwd.h
+--- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_virtual_cwd.h
++++ php5-5.2.9.dfsg.1/TSRM/tsrm_virtual_cwd.h
@@ -139,6 +139,22 @@ typedef struct _cwd_state {
typedef int (*verify_path_func)(const cwd_state *);
@@ -239,10 +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);
-Index: php5-5.2.6/Zend/Makefile.am
-===================================================================
---- php5-5.2.6.orig/Zend/Makefile.am
-+++ php5-5.2.6/Zend/Makefile.am
+--- php5-5.2.9.dfsg.1.orig/Zend/Makefile.am
++++ php5-5.2.9.dfsg.1/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,10 +252,8 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-Index: php5-5.2.6/Zend/Zend.dsp
-===================================================================
---- php5-5.2.6.orig/Zend/Zend.dsp
-+++ php5-5.2.6/Zend/Zend.dsp
+--- php5-5.2.9.dfsg.1.orig/Zend/Zend.dsp
++++ php5-5.2.9.dfsg.1/Zend/Zend.dsp
@@ -239,6 +239,10 @@ SOURCE=.\zend_strtod.c
# End Source File
# Begin Source File
@@ -267,10 +265,8 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-Index: php5-5.2.6/Zend/ZendTS.dsp
-===================================================================
---- php5-5.2.6.orig/Zend/ZendTS.dsp
-+++ php5-5.2.6/Zend/ZendTS.dsp
+--- php5-5.2.9.dfsg.1.orig/Zend/ZendTS.dsp
++++ php5-5.2.9.dfsg.1/Zend/ZendTS.dsp
@@ -273,6 +273,10 @@ SOURCE=.\zend_strtod.c
# End Source File
# Begin Source File
@@ -282,10 +278,8 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-Index: php5-5.2.6/Zend/zend.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend.c
-+++ php5-5.2.6/Zend/zend.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend.c
++++ php5-5.2.9.dfsg.1/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);
@@ -386,10 +380,8 @@
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)
-Index: php5-5.2.6/Zend/zend.h
-===================================================================
---- php5-5.2.6.orig/Zend/zend.h
-+++ php5-5.2.6/Zend/zend.h
+--- 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
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);
@@ -414,10 +406,8 @@
#endif /* ZEND_H */
/*
-Index: php5-5.2.6/Zend/zend_alloc.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_alloc.c
-+++ php5-5.2.6/Zend/zend_alloc.c
+--- 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
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -503,7 +493,7 @@
+ } while (0)
+
+# define SUHOSIN_MM_END_CANARY_PTR(block) \
-+ (char*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
++ (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
+
+# define SUHOSIN_MM_SET_END_CANARY(block) do { \
+ char *p = SUHOSIN_MM_END_CANARY_PTR(block); \
@@ -563,7 +553,7 @@
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1766,6 +1841,11 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1779,6 +1854,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;
@@ -575,7 +565,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);
-@@ -1905,6 +1985,12 @@ zend_mm_finished_searching_for_block:
+@@ -1918,6 +1998,12 @@ zend_mm_finished_searching_for_block:
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -588,7 +578,7 @@
heap->size += true_size;
if (heap->peak < heap->size) {
heap->peak = heap->size;
-@@ -1928,6 +2014,9 @@ static void _zend_mm_free_int(zend_mm_he
+@@ -1941,6 +2027,9 @@ static void _zend_mm_free_int(zend_mm_he
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -598,7 +588,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
-@@ -1990,6 +2079,9 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2003,6 +2092,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);
@@ -608,7 +598,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2021,6 +2113,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2034,6 +2126,11 @@ static void *_zend_mm_realloc_int(zend_m
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -620,7 +610,7 @@
return p;
}
-@@ -2040,13 +2137,18 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2053,13 +2150,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);
@@ -640,7 +630,7 @@
#endif
heap->cached -= true_size - orig_size;
-@@ -2104,6 +2206,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2117,6 +2219,11 @@ static void *_zend_mm_realloc_int(zend_m
if (heap->peak < heap->size) {
heap->peak = heap->size;
}
@@ -652,7 +642,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
-@@ -2207,6 +2314,11 @@ out_of_memory:
+@@ -2220,6 +2327,11 @@ out_of_memory:
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -664,7 +654,7 @@
return ZEND_MM_DATA_OF(mm_block);
}
-@@ -2214,7 +2326,7 @@ out_of_memory:
+@@ -2227,7 +2339,7 @@ out_of_memory:
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
memcpy(ptr, p, mm_block->debug.size);
#else
@@ -673,7 +663,7 @@
#endif
_zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
return ptr;
-@@ -2477,6 +2589,17 @@ ZEND_API void shutdown_memory_manager(in
+@@ -2490,6 +2602,17 @@ ZEND_API void shutdown_memory_manager(in
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
}
@@ -691,11 +681,9 @@
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
char *tmp;
-Index: php5-5.2.6/Zend/zend_alloc.h
-===================================================================
---- php5-5.2.6.orig/Zend/zend_alloc.h
-+++ php5-5.2.6/Zend/zend_alloc.h
-@@ -128,6 +128,9 @@ ZEND_API int zend_set_memory_limit(size_
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_alloc.h
++++ php5-5.2.9.dfsg.1/Zend/zend_alloc.h
+@@ -129,6 +129,9 @@ ZEND_API int zend_set_memory_limit(size_
ZEND_API void start_memory_manager(TSRMLS_D);
ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);
@@ -705,10 +693,8 @@
ZEND_API int is_zend_mm(TSRMLS_D);
#if ZEND_DEBUG
-Index: php5-5.2.6/Zend/zend_canary.c
-===================================================================
--- /dev/null
-+++ php5-5.2.6/Zend/zend_canary.c
++++ php5-5.2.9.dfsg.1/Zend/zend_canary.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -774,10 +760,8 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.6/Zend/zend_compile.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_compile.c
-+++ php5-5.2.6/Zend/zend_compile.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.c
++++ php5-5.2.9.dfsg.1/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);
}
@@ -797,10 +781,8 @@
static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
{
-Index: php5-5.2.6/Zend/zend_compile.h
-===================================================================
---- php5-5.2.6.orig/Zend/zend_compile.h
-+++ php5-5.2.6/Zend/zend_compile.h
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_compile.h
++++ php5-5.2.9.dfsg.1/Zend/zend_compile.h
@@ -564,6 +564,11 @@ ZEND_API int zend_auto_global_disable_ji
int zendlex(znode *zendlval TSRMLS_DC);
@@ -813,18 +795,16 @@
/* BEGIN: OPCODES */
#include "zend_vm_opcodes.h"
-@@ -686,6 +691,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
-
+@@ -689,6 +694,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
#define ZEND_RETURNS_FUNCTION 1<<0
+ #define ZEND_RETURNS_NEW 1<<1
+
END_EXTERN_C()
#define ZEND_CLONE_FUNC_NAME "__clone"
-Index: php5-5.2.6/Zend/zend_constants.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_constants.c
-+++ php5-5.2.6/Zend/zend_constants.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_constants.c
++++ php5-5.2.9.dfsg.1/Zend/zend_constants.c
@@ -110,6 +110,75 @@ void zend_register_standard_constants(TS
REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
@@ -901,10 +881,8 @@
/* true/false constants */
{
-Index: php5-5.2.6/Zend/zend_errors.h
-===================================================================
---- php5-5.2.6.orig/Zend/zend_errors.h
-+++ php5-5.2.6/Zend/zend_errors.h
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_errors.h
++++ php5-5.2.9.dfsg.1/Zend/zend_errors.h
@@ -39,6 +39,20 @@
#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
@@ -926,12 +904,10 @@
#endif /* ZEND_ERRORS_H */
/*
-Index: php5-5.2.6/Zend/zend_hash.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_hash.c
-+++ php5-5.2.6/Zend/zend_hash.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_hash.c
++++ php5-5.2.9.dfsg.1/Zend/zend_hash.c
@@ -20,6 +20,7 @@
- /* $Id: zend_hash.c,v 1.121.2.4.2.9 2007/12/31 07:20:02 sebastian Exp $ */
+ /* $Id: zend_hash.c,v 1.121.2.4.2.10 2008/12/31 11:17:33 sebastian Exp $ */
#include "zend.h"
+#include "zend_compile.h"
@@ -1195,10 +1171,8 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-Index: php5-5.2.6/Zend/zend_llist.c
-===================================================================
---- php5-5.2.6.orig/Zend/zend_llist.c
-+++ php5-5.2.6/Zend/zend_llist.c
+--- php5-5.2.9.dfsg.1.orig/Zend/zend_llist.c
++++ php5-5.2.9.dfsg.1/Zend/zend_llist.c
@@ -23,6 +23,184 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -1416,11 +1390,39 @@
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-Index: php5-5.2.6/configure.in
-===================================================================
---- php5-5.2.6.orig/configure.in
-+++ php5-5.2.6/configure.in
-@@ -227,6 +227,7 @@ sinclude(Zend/Zend.m4)
+--- php5-5.2.9.dfsg.1.orig/configure
++++ php5-5.2.9.dfsg.1/configure
+@@ -18576,6 +18576,9 @@ EOF
+
+ fi
+
++cat >> confdefs.h <<\EOF
++#define SUHOSIN_PATCH 1
++EOF
+
+ echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
+ echo "configure:18582: checking for declared timezone" >&5
+@@ -116592,7 +116595,7 @@ EOF
+ 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 \
+- output.c ; do
++ output.c suhosin_patch.c ; do
+
+ IFS=.
+ set $ac_src
+@@ -116794,7 +116797,7 @@ esac
+ 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 \
+- zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c; do
++ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c; do
+
+ IFS=.
+ set $ac_src
+--- 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)
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -1428,7 +1430,7 @@
divert(2)
-@@ -1304,7 +1305,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c
+@@ -1371,7 +1372,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 \
@@ -1437,7 +1439,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)
-@@ -1330,7 +1331,7 @@ PHP_ADD_SOURCES(Zend, \
+@@ -1397,7 +1398,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 \
@@ -1445,11 +1447,9 @@
+ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c )
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 \
-Index: php5-5.2.6/ext/standard/basic_functions.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/basic_functions.c
-+++ php5-5.2.6/ext/standard/basic_functions.c
+ PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
+--- php5-5.2.9.dfsg.1.orig/ext/standard/basic_functions.c
++++ php5-5.2.9.dfsg.1/ext/standard/basic_functions.c
@@ -3575,7 +3575,9 @@ zend_function_entry basic_functions[] =
PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
@@ -1461,10 +1461,8 @@
#endif
#ifdef HAVE_FNMATCH
-Index: php5-5.2.6/ext/standard/dl.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/dl.c
-+++ php5-5.2.6/ext/standard/dl.c
+--- php5-5.2.9.dfsg.1.orig/ext/standard/dl.c
++++ php5-5.2.9.dfsg.1/ext/standard/dl.c
@@ -241,6 +241,19 @@ void php_dl(zval *file, int type, zval *
RETURN_FALSE;
}
@@ -1485,11 +1483,9 @@
RETURN_TRUE;
}
/* }}} */
-Index: php5-5.2.6/ext/standard/file.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/file.c
-+++ php5-5.2.6/ext/standard/file.c
-@@ -2372,7 +2372,7 @@ out:
+--- 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:
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
/* {{{ proto string realpath(string path)
Return the resolved path */
@@ -1498,10 +1494,8 @@
{
zval **path;
char resolved_path_buff[MAXPATHLEN];
-Index: php5-5.2.6/ext/standard/file.h
-===================================================================
---- php5-5.2.6.orig/ext/standard/file.h
-+++ php5-5.2.6/ext/standard/file.h
+--- php5-5.2.9.dfsg.1.orig/ext/standard/file.h
++++ php5-5.2.9.dfsg.1/ext/standard/file.h
@@ -61,7 +61,7 @@ PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
@@ -1511,11 +1505,9 @@
#endif
#ifdef HAVE_FNMATCH
PHP_FUNCTION(fnmatch);
-Index: php5-5.2.6/ext/standard/info.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/info.c
-+++ php5-5.2.6/ext/standard/info.c
-@@ -652,6 +652,31 @@ PHPAPI void php_print_info(int flag TSRM
+--- php5-5.2.9.dfsg.1.orig/ext/standard/info.c
++++ php5-5.2.9.dfsg.1/ext/standard/info.c
+@@ -648,6 +648,31 @@ PHPAPI void php_print_info(int flag TSRM
php_info_print_table_end();
@@ -1547,10 +1539,8 @@
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
-Index: php5-5.2.6/ext/standard/syslog.c
-===================================================================
---- php5-5.2.6.orig/ext/standard/syslog.c
-+++ php5-5.2.6/ext/standard/syslog.c
+--- php5-5.2.9.dfsg.1.orig/ext/standard/syslog.c
++++ php5-5.2.9.dfsg.1/ext/standard/syslog.c
@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
*/
PHP_MINIT_FUNCTION(syslog)
@@ -1567,10 +1557,8 @@
BG(syslog_device)=NULL;
return SUCCESS;
-Index: php5-5.2.6/main/fopen_wrappers.c
-===================================================================
---- php5-5.2.6.orig/main/fopen_wrappers.c
-+++ php5-5.2.6/main/fopen_wrappers.c
+--- php5-5.2.9.dfsg.1.orig/main/fopen_wrappers.c
++++ php5-5.2.9.dfsg.1/main/fopen_wrappers.c
@@ -110,7 +110,7 @@ PHPAPI int php_check_specific_open_based
/* normalize and expand path */
@@ -1648,10 +1636,8 @@
ptr = end;
}
-Index: php5-5.2.6/main/main.c
-===================================================================
---- php5-5.2.6.orig/main/main.c
-+++ php5-5.2.6/main/main.c
+--- php5-5.2.9.dfsg.1.orig/main/main.c
++++ php5-5.2.9.dfsg.1/main/main.c
@@ -89,6 +89,9 @@
#include "SAPI.h"
@@ -1662,7 +1648,7 @@
/* }}} */
#ifndef ZTS
-@@ -1370,7 +1373,7 @@ void php_request_shutdown_for_exec(void
+@@ -1374,7 +1377,7 @@ void php_request_shutdown_for_exec(void
/* used to close fd's in the 3..255 range here, but it's problematic
*/
@@ -1671,7 +1657,7 @@
}
/* }}} */
-@@ -1411,6 +1414,9 @@ void php_request_shutdown_for_hook(void
+@@ -1415,6 +1418,9 @@ void php_request_shutdown_for_hook(void
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1681,7 +1667,7 @@
} zend_end_try();
zend_try {
-@@ -1503,6 +1509,9 @@ void php_request_shutdown(void *dummy)
+@@ -1509,6 +1515,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);
@@ -1691,7 +1677,7 @@
} zend_end_try();
/* 12. Reset max_execution_time */
-@@ -1662,6 +1671,9 @@ int php_module_startup(sapi_module_struc
+@@ -1668,6 +1677,9 @@ int php_module_startup(sapi_module_struc
#ifdef ZTS
tsrm_ls = ts_resource(0);
#endif
@@ -1701,7 +1687,7 @@
module_shutdown = 0;
module_startup = 1;
-@@ -1791,6 +1803,10 @@ int php_module_startup(sapi_module_struc
+@@ -1809,6 +1821,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);
@@ -1712,7 +1698,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);
-@@ -1840,7 +1856,9 @@ int php_module_startup(sapi_module_struc
+@@ -1858,7 +1874,9 @@ int php_module_startup(sapi_module_struc
module_startup = 0;
shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1723,7 +1709,7 @@
/* we're done */
return SUCCESS;
}
-@@ -1899,6 +1917,9 @@ void php_module_shutdown(TSRMLS_D)
+@@ -1917,6 +1935,9 @@ void php_module_shutdown(TSRMLS_D)
#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1733,10 +1719,8 @@
core_globals_dtor(&core_globals TSRMLS_CC);
#else
zend_ini_global_shutdown(TSRMLS_C);
-Index: php5-5.2.6/main/php.h
-===================================================================
---- php5-5.2.6.orig/main/php.h
-+++ php5-5.2.6/main/php.h
+--- php5-5.2.9.dfsg.1.orig/main/php.h
++++ php5-5.2.9.dfsg.1/main/php.h
@@ -40,6 +40,13 @@
#undef sprintf
#define sprintf php_sprintf
@@ -1762,10 +1746,20 @@
#endif
/*
-Index: php5-5.2.6/main/php_logos.c
-===================================================================
---- php5-5.2.6.orig/main/php_logos.c
-+++ php5-5.2.6/main/php_logos.c
+--- php5-5.2.9.dfsg.1.orig/main/php_config.h.in
++++ php5-5.2.9.dfsg.1/main/php_config.h.in
+@@ -809,6 +809,9 @@
+ /* Define if the target system has /dev/urandom device */
+ #undef HAVE_DEV_URANDOM
+
++/* Suhosin-Patch for PHP */
++#undef SUHOSIN_PATCH
++
+ /* Whether you have AOLserver */
+ #undef HAVE_AOLSERVER
+
+--- php5-5.2.9.dfsg.1.orig/main/php_logos.c
++++ php5-5.2.9.dfsg.1/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));
}
@@ -1787,11 +1781,9 @@
return SUCCESS;
}
-Index: php5-5.2.6/main/snprintf.c
-===================================================================
---- php5-5.2.6.orig/main/snprintf.c
-+++ php5-5.2.6/main/snprintf.c
-@@ -1080,7 +1080,11 @@ static int format_converter(register buf
+--- php5-5.2.9.dfsg.1.orig/main/snprintf.c
++++ php5-5.2.9.dfsg.1/main/snprintf.c
+@@ -1077,7 +1077,11 @@ static int format_converter(register buf
case 'n':
@@ -1803,11 +1795,9 @@
goto skip_output;
/*
-Index: php5-5.2.6/main/spprintf.c
-===================================================================
---- php5-5.2.6.orig/main/spprintf.c
-+++ php5-5.2.6/main/spprintf.c
-@@ -673,7 +673,11 @@ static void xbuf_format_converter(smart_
+--- 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_
case 'n':
@@ -1819,10 +1809,8 @@
goto skip_output;
/*
-Index: php5-5.2.6/main/suhosin_globals.h
-===================================================================
--- /dev/null
-+++ php5-5.2.6/main/suhosin_globals.h
++++ php5-5.2.9.dfsg.1/main/suhosin_globals.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -1885,10 +1873,8 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.6/main/suhosin_logo.h
-===================================================================
--- /dev/null
-+++ php5-5.2.6/main/suhosin_logo.h
++++ php5-5.2.9.dfsg.1/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"
@@ -2068,10 +2054,8 @@
+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
+ ;
-Index: php5-5.2.6/main/suhosin_patch.c
-===================================================================
--- /dev/null
-+++ php5-5.2.6/main/suhosin_patch.c
++++ php5-5.2.9.dfsg.1/main/suhosin_patch.c
@@ -0,0 +1,380 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2453,10 +2437,8 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.6/main/suhosin_patch.h
-===================================================================
--- /dev/null
-+++ php5-5.2.6/main/suhosin_patch.h
++++ php5-5.2.9.dfsg.1/main/suhosin_patch.h
@@ -0,0 +1,40 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2484,7 +2466,7 @@
+#include "zend.h"
+
+PHPAPI void suhosin_startup();
-+#define SUHOSIN_PATCH_VERSION "0.9.6.2"
++#define SUHOSIN_PATCH_VERSION "0.9.7"
+
+#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18"
+
@@ -2498,10 +2480,8 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.6/main/suhosin_patch.m4
-===================================================================
--- /dev/null
-+++ php5-5.2.6/main/suhosin_patch.m4
++++ php5-5.2.9.dfsg.1/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 $
@@ -2511,10 +2491,8 @@
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-Index: php5-5.2.6/sapi/apache/mod_php5.c
-===================================================================
---- php5-5.2.6.orig/sapi/apache/mod_php5.c
-+++ php5-5.2.6/sapi/apache/mod_php5.c
+--- php5-5.2.9.dfsg.1.orig/sapi/apache/mod_php5.c
++++ php5-5.2.9.dfsg.1/sapi/apache/mod_php5.c
@@ -951,7 +951,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
@@ -2527,11 +2505,9 @@
}
}
#endif
-Index: php5-5.2.6/sapi/apache2filter/sapi_apache2.c
-===================================================================
---- php5-5.2.6.orig/sapi/apache2filter/sapi_apache2.c
-+++ php5-5.2.6/sapi/apache2filter/sapi_apache2.c
-@@ -562,7 +562,11 @@ static void php_apache_add_version(apr_p
+--- php5-5.2.9.dfsg.1.orig/sapi/apache2filter/sapi_apache2.c
++++ php5-5.2.9.dfsg.1/sapi/apache2filter/sapi_apache2.c
+@@ -566,7 +566,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2543,10 +2519,8 @@
}
}
-Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
-===================================================================
---- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+--- php5-5.2.9.dfsg.1.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.9.dfsg.1/sapi/apache2handler/sapi_apache2.c
@@ -370,7 +370,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
@@ -2559,56 +2533,50 @@
}
}
-Index: php5-5.2.6/sapi/cgi/cgi_main.c
-===================================================================
---- php5-5.2.6.orig/sapi/cgi/cgi_main.c
-+++ php5-5.2.6/sapi/cgi/cgi_main.c
-@@ -1726,11 +1726,19 @@ consult the installation file that came
+--- 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
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
+#if SUHOSIN_PATCH
+#if ZEND_DEBUG
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#else
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
+#else
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2008 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
+#endif
php_request_shutdown((void *) 0);
exit_status = 0;
goto out;
-Index: php5-5.2.6/sapi/cli/php_cli.c
-===================================================================
---- php5-5.2.6.orig/sapi/cli/php_cli.c
-+++ php5-5.2.6/sapi/cli/php_cli.c
-@@ -779,8 +779,14 @@ int main(int argc, char *argv[])
+--- 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[])
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
- PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
+#if SUHOSIN_PATCH
-+ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
+ PHP_VERSION, SUHOSIN_PATCH_VERSION,
+#else
-+ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
++ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
+ PHP_VERSION,
+#endif
+ sapi_module.name, __DATE__, __TIME__,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
-Index: php5-5.2.6/win32/build/config.w32
-===================================================================
---- php5-5.2.6.orig/win32/build/config.w32
-+++ php5-5.2.6/win32/build/config.w32
-@@ -299,7 +299,7 @@ ADD_SOURCES("Zend", "zend_language_parse
+--- php5-5.2.9.dfsg.1.orig/win32/build/config.w32
++++ php5-5.2.9.dfsg.1/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 \
zend_object_handlers.c zend_objects_API.c \
@@ -2617,7 +2585,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 \
-@@ -344,6 +344,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
+@@ -350,6 +350,8 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
Modified: php5/trunk/debian/patches/use_embedded_timezonedb.patch
===================================================================
--- php5/trunk/debian/patches/use_embedded_timezonedb.patch 2009-03-22 10:19:40 UTC (rev 1252)
+++ php5/trunk/debian/patches/use_embedded_timezonedb.patch 2009-03-22 10:20:47 UTC (rev 1253)
@@ -8,8 +8,8 @@
r2: add filesystem trawl to set up name alias index
r1: initial revision
---- php-5.2.6/ext/date/lib/parse_tz.c.systzdata
-+++ php-5.2.6/ext/date/lib/parse_tz.c
+--- 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
@@ -20,6 +20,16 @@
#include "timelib.h"
@@ -38,7 +38,7 @@
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
-@@ -206,6 +219,211 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -212,6 +225,211 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
}
@@ -250,7 +250,7 @@
static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
{
int left = 0, right = tzdb->index_size - 1;
-@@ -279,6 +497,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+@@ -285,6 +503,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
return tmp;
}
@@ -258,9 +258,9 @@
static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
{
---- php-5.2.6/ext/date/lib/timelib.h.systzdata
-+++ php-5.2.6/ext/date/lib/timelib.h
-@@ -31,6 +31,10 @@
+--- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.h
++++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.h
+@@ -32,6 +32,10 @@
#define TIMELIB_SPECIAL_WEEKDAY 0x01
@@ -271,8 +271,8 @@
#ifndef LONG_MAX
#define LONG_MAX 2147483647L
#endif
---- php-5.2.6/ext/date/lib/timelib.m4.systzdata
-+++ php-5.2.6/ext/date/lib/timelib.m4
+--- php5-5.2.9.dfsg.1.orig/ext/date/lib/timelib.m4
++++ php5-5.2.9.dfsg.1/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
dnl Check for strtoll, atoll
@@ -291,8 +291,8 @@
+ fi
+fi
+
---- php-5.2.6/ext/date/php_date.c.systzdata
-+++ php-5.2.6/ext/date/php_date.c
+--- 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
if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);
More information about the Pkg-php-commits
mailing list