[Pkg-php-commits] r1038 - in php5/trunk/debian: . patches
Sean Finney
seanius at alioth.debian.org
Sat May 3 12:07:34 UTC 2008
Author: seanius
Date: 2008-05-03 12:07:33 +0000 (Sat, 03 May 2008)
New Revision: 1038
Modified:
php5/trunk/debian/changelog
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/027-readline_is_editline.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/disable_dl_by_default.patch
php5/trunk/debian/patches/fix_broken_upstream_tests.patch
php5/trunk/debian/patches/libdb_is_-ldb
php5/trunk/debian/patches/manpage_spelling.patch
php5/trunk/debian/patches/suhosin.patch
php5/trunk/debian/patches/use_embedded_timezonedb.patch
Log:
big patch massage/update
Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/changelog 2008-05-03 12:07:33 UTC (rev 1038)
@@ -8,6 +8,8 @@
using the system provided timezone database instead of the one bundled
with PHP. Many thanks to Joe Orten from Red Hat for the patch!
closes: #447174.
+ * Updated the Suhosin patch to v0.9.6 (5.2.6).
+ * Massaged/updated various other patches in debian/patches
* Update copyright information to have information about non-trivial
patches worthy of copyright attributions, and update information about
current debian maintainers.
Modified: php5/trunk/debian/patches/001-libtool_fixes.patch
===================================================================
--- php5/trunk/debian/patches/001-libtool_fixes.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/001-libtool_fixes.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/TSRM/configure.in
+Index: php5-5.2.6/TSRM/configure.in
===================================================================
---- php5-5.2.4.orig/TSRM/configure.in 2007-09-10 20:45:24.000000000 +0200
-+++ php5-5.2.4/TSRM/configure.in 2007-09-10 20:45:26.000000000 +0200
-@@ -13,9 +13,6 @@
+--- php5-5.2.6.orig/TSRM/configure.in
++++ php5-5.2.6/TSRM/configure.in
+@@ -13,9 +13,6 @@ TSRM_BASIC_CHECKS
TSRM_THREADS_CHECKS
AM_PROG_LIBTOOL
@@ -12,11 +12,11 @@
dnl TSRM_PTHREAD
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-10 20:45:24.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-10 20:45:26.000000000 +0200
-@@ -1256,9 +1256,6 @@
+--- 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], [])])
AC_PROG_LIBTOOL
Modified: php5/trunk/debian/patches/002-static_openssl.patch
===================================================================
--- php5/trunk/debian/patches/002-static_openssl.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/002-static_openssl.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/acinclude.m4
+Index: php5-5.2.6/acinclude.m4
===================================================================
---- php5-5.2.4.orig/acinclude.m4 2007-09-10 20:45:23.000000000 +0200
-+++ php5-5.2.4/acinclude.m4 2007-09-10 20:45:32.000000000 +0200
-@@ -2364,9 +2364,7 @@
+--- php5-5.2.6.orig/acinclude.m4
++++ php5-5.2.6/acinclude.m4
+@@ -2364,9 +2364,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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/004-ldap_fix.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/ldap/ldap.c
+Index: php5-5.2.6/ext/ldap/ldap.c
===================================================================
---- php5-5.2.4.orig/ext/ldap/ldap.c 2007-09-10 20:45:23.000000000 +0200
-+++ php5-5.2.4/ext/ldap/ldap.c 2007-09-10 20:45:39.000000000 +0200
-@@ -1334,7 +1334,7 @@
+--- php5-5.2.6.orig/ext/ldap/ldap.c
++++ php5-5.2.6/ext/ldap/ldap.c
+@@ -1334,7 +1334,7 @@ PHP_FUNCTION(ldap_explode_dn)
}
i=0;
@@ -11,7 +11,7 @@
count = i;
array_init(return_value);
-@@ -1344,7 +1344,8 @@
+@@ -1344,7 +1344,8 @@ PHP_FUNCTION(ldap_explode_dn)
add_index_string(return_value, i, ldap_value[i], 1);
}
Modified: php5/trunk/debian/patches/006-debian_quirks.patch
===================================================================
--- php5/trunk/debian/patches/006-debian_quirks.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/006-debian_quirks.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-10 20:45:26.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:23:54.000000000 +0200
-@@ -934,7 +934,7 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -934,7 +934,7 @@ if test "$PHP_CLI" = "no"; then
fi
PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -11,7 +11,7 @@
--without-pear Do not install PEAR], DEFAULT, yes)
if test "$PHP_PEAR" != "no"; then
-@@ -968,7 +968,7 @@
+@@ -968,7 +968,7 @@ dnl
if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
case $PHP_LAYOUT in
GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -20,7 +20,7 @@
esac
fi
-@@ -1023,12 +1023,12 @@
+@@ -1023,12 +1023,12 @@ test "$program_suffix" = "NONE" && progr
case $libdir in
'${exec_prefix}/lib')
@@ -35,7 +35,7 @@
;;
*) ;;
esac
-@@ -1094,7 +1094,7 @@
+@@ -1094,7 +1094,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -44,11 +44,11 @@
exec_prefix=$old_exec_prefix
libdir=$old_libdir
-Index: php5-5.2.4/ext/ext_skel
+Index: php5-5.2.6/ext/ext_skel
===================================================================
---- php5-5.2.4.orig/ext/ext_skel 2004-05-16 14:10:35.000000000 +0200
-+++ php5-5.2.4/ext/ext_skel 2007-09-11 00:23:54.000000000 +0200
-@@ -70,7 +70,7 @@
+--- php5-5.2.6.orig/ext/ext_skel
++++ php5-5.2.6/ext/ext_skel
+@@ -70,7 +70,7 @@ if test -d "$extname" ; then
fi
if test -z "$skel_dir"; then
@@ -57,11 +57,11 @@
fi
## convert skel_dir to full path
-Index: php5-5.2.4/ext/session/session.c
+Index: php5-5.2.6/ext/session/session.c
===================================================================
---- php5-5.2.4.orig/ext/session/session.c 2007-08-03 03:16:40.000000000 +0200
-+++ php5-5.2.4/ext/session/session.c 2007-09-11 00:23:54.000000000 +0200
-@@ -181,11 +181,11 @@
+--- php5-5.2.6.orig/ext/session/session.c
++++ php5-5.2.6/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)
STD_PHP_INI_BOOLEAN("session.bug_compat_warn", "1", PHP_INI_ALL, OnUpdateBool, bug_compat_warn, php_ps_globals, ps_globals)
@@ -75,11 +75,11 @@
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.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-08-22 01:24:18.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:23:54.000000000 +0200
-@@ -466,7 +466,7 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -466,7 +466,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -88,7 +88,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -483,7 +483,7 @@
+@@ -483,7 +483,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -97,7 +97,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 @@
+@@ -596,58 +596,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -156,7 +156,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -988,7 +936,7 @@
+@@ -988,7 +936,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 +165,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1026,7 +974,10 @@
+@@ -1026,7 +974,10 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -177,11 +177,11 @@
session.gc_divisor = 100
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.4/php.ini-recommended
+Index: php5-5.2.6/php.ini-recommended
===================================================================
---- php5-5.2.4.orig/php.ini-recommended 2007-08-22 01:24:18.000000000 +0200
-+++ php5-5.2.4/php.ini-recommended 2007-09-11 00:23:54.000000000 +0200
-@@ -516,7 +516,7 @@
+--- php5-5.2.6.orig/php.ini-recommended
++++ php5-5.2.6/php.ini-recommended
+@@ -516,7 +516,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -190,7 +190,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -533,7 +533,7 @@
+@@ -533,7 +533,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -199,7 +199,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 @@
+@@ -646,58 +646,6 @@ default_socket_timeout = 60
; extension_dir directive above.
@@ -258,7 +258,7 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -1038,7 +986,7 @@
+@@ -1038,7 +986,7 @@ session.save_handler = files
;
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
@@ -267,7 +267,7 @@
; Whether to use cookies.
session.use_cookies = 1
-@@ -1076,7 +1024,10 @@
+@@ -1076,7 +1024,10 @@ session.serialize_handler = php
; e.g. 1/100 means there is a 1% chance that the GC process starts
; on each request.
@@ -279,11 +279,11 @@
session.gc_divisor = 1000
; After this number of seconds, stored data will be seen as 'garbage' and
-Index: php5-5.2.4/sapi/caudium/config.m4
+Index: php5-5.2.6/sapi/caudium/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/caudium/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/caudium/config.m4 2007-09-11 00:23:54.000000000 +0200
-@@ -26,8 +26,8 @@
+--- php5-5.2.6.orig/sapi/caudium/config.m4
++++ php5-5.2.6/sapi/caudium/config.m4
+@@ -26,8 +26,8 @@ if test "$PHP_CAUDIUM" != "no"; then
AC_MSG_ERROR([Could not find a pike in $PHP_CAUDIUM/bin/])
fi
if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
@@ -294,7 +294,7 @@
if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
AC_MSG_ERROR(Failed to figure out Pike module and include directories)
fi
-@@ -84,7 +84,9 @@
+@@ -84,7 +84,9 @@ if test "$PHP_CAUDIUM" != "no"; then
PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support])
PHP_SELECT_SAPI(caudium, shared, caudium.c)
@@ -305,11 +305,11 @@
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
-Index: php5-5.2.4/sapi/cli/php.1.in
+Index: php5-5.2.6/sapi/cli/php.1.in
===================================================================
---- php5-5.2.4.orig/sapi/cli/php.1.in 2007-04-23 22:54:22.000000000 +0200
-+++ php5-5.2.4/sapi/cli/php.1.in 2007-09-11 00:23:54.000000000 +0200
-@@ -306,13 +306,14 @@
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -306,13 +306,14 @@ Shows configuration for extension
.B name
.SH FILES
.TP 15
@@ -329,10 +329,10 @@
.SH EXAMPLES
.TP 5
\fIphp -r 'echo "Hello World\\n";'\fP
-Index: php5-5.2.4/scripts/Makefile.frag
+Index: php5-5.2.6/scripts/Makefile.frag
===================================================================
---- php5-5.2.4.orig/scripts/Makefile.frag 2005-11-22 00:08:02.000000000 +0100
-+++ php5-5.2.4/scripts/Makefile.frag 2007-09-11 00:23:54.000000000 +0200
+--- php5-5.2.6.orig/scripts/Makefile.frag
++++ php5-5.2.6/scripts/Makefile.frag
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -344,11 +344,11 @@
BUILD_FILES = \
scripts/phpize.m4 \
-Index: php5-5.2.4/scripts/php-config.in
+Index: php5-5.2.6/scripts/php-config.in
===================================================================
---- php5-5.2.4.orig/scripts/php-config.in 2007-08-24 13:44:10.000000000 +0200
-+++ php5-5.2.4/scripts/php-config.in 2007-09-11 00:23:54.000000000 +0200
-@@ -5,8 +5,8 @@
+--- php5-5.2.6.orig/scripts/php-config.in
++++ php5-5.2.6/scripts/php-config.in
+@@ -5,8 +5,8 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
vernum="@PHP_VERSION_ID@"
@@ -359,10 +359,10 @@
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
-Index: php5-5.2.4/scripts/phpize.in
+Index: php5-5.2.6/scripts/phpize.in
===================================================================
---- php5-5.2.4.orig/scripts/phpize.in 2007-06-29 03:10:35.000000000 +0200
-+++ php5-5.2.4/scripts/phpize.in 2007-09-11 00:23:54.000000000 +0200
+--- php5-5.2.6.orig/scripts/phpize.in
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/013-force_getaddrinfo.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:24:00.000000000 +0200
-@@ -557,50 +557,50 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -557,50 +557,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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/017-pread_pwrite_disable.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/acinclude.m4
+Index: php5-5.2.6/acinclude.m4
===================================================================
---- php5-5.2.4.orig/acinclude.m4 2007-09-10 20:45:32.000000000 +0200
-+++ php5-5.2.4/acinclude.m4 2007-09-11 00:24:05.000000000 +0200
-@@ -1210,7 +1210,7 @@
+--- php5-5.2.6.orig/acinclude.m4
++++ php5-5.2.6/acinclude.m4
+@@ -1210,7 +1210,7 @@ $1
}
],[
@@ -11,7 +11,7 @@
],[
ac_cv_pwrite=no
],[
-@@ -1239,7 +1239,7 @@
+@@ -1239,7 +1239,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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/019-z_off_t_as_long.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,7 +1,7 @@
-Index: php5-5.2.0/ext/zlib/zconf.h
+Index: php5-5.2.6/ext/zlib/zconf.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.2.0/ext/zlib/zconf.h 2007-03-18 22:58:40.000000000 +0100
+--- /dev/null
++++ php5-5.2.6/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 +329,10 @@
+#endif
+
+#endif /* ZCONF_H */
-Index: php5-5.2.0/ext/zlib/zlib.h
+Index: php5-5.2.6/ext/zlib/zlib.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ php5-5.2.0/ext/zlib/zlib.h 2007-03-18 22:58:40.000000000 +0100
+--- /dev/null
++++ php5-5.2.6/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/027-readline_is_editline.patch
===================================================================
--- php5/trunk/debian/patches/027-readline_is_editline.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/027-readline_is_editline.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/ext/readline/config.m4
+Index: php5-5.2.6/ext/readline/config.m4
===================================================================
---- php5-5.2.0.orig/ext/readline/config.m4 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/ext/readline/config.m4 2007-03-18 22:58:41.000000000 +0100
-@@ -12,7 +12,7 @@
+--- php5-5.2.6.orig/ext/readline/config.m4
++++ php5-5.2.6/ext/readline/config.m4
+@@ -12,7 +12,7 @@ fi
if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
for i in $PHP_READLINE /usr/local /usr; do
@@ -11,7 +11,7 @@
done
if test -z "$READLINE_DIR"; then
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
elif test "$PHP_LIBEDIT" != "no"; then
for i in $PHP_LIBEDIT /usr/local /usr; do
@@ -20,10 +20,10 @@
done
if test -z "$LIBEDIT_DIR"; then
-Index: php5-5.2.0/ext/readline/readline.c
+Index: php5-5.2.6/ext/readline/readline.c
===================================================================
---- php5-5.2.0.orig/ext/readline/readline.c 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/ext/readline/readline.c 2007-03-18 22:58:41.000000000 +0100
+--- php5-5.2.6.orig/ext/readline/readline.c
++++ php5-5.2.6/ext/readline/readline.c
@@ -33,9 +33,9 @@
#define rl_completion_matches completion_matches
#endif
Modified: php5/trunk/debian/patches/029-php.ini_paranoid.patch
===================================================================
--- php5/trunk/debian/patches/029-php.ini_paranoid.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/029-php.ini_paranoid.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,7 +1,7 @@
-Index: foo/php.ini-paranoid
+Index: php5-5.2.6/php.ini-paranoid
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ foo/php.ini-paranoid 2008-05-01 15:58:05.000000000 -0500
+--- /dev/null
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/033-we_WANT_libtool.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/build/build2.mk
+Index: php5-5.2.6/build/build2.mk
===================================================================
---- php5-5.2.0.orig/build/build2.mk 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/build/build2.mk 2007-03-18 22:58:41.000000000 +0100
-@@ -52,6 +52,11 @@
+--- php5-5.2.6.orig/build/build2.mk
++++ php5-5.2.6/build/build2.mk
+@@ -52,6 +52,11 @@ $(TOUCH_FILES):
aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@
Modified: php5/trunk/debian/patches/034-apache2_umask_fix.patch
===================================================================
--- php5/trunk/debian/patches/034-apache2_umask_fix.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/034-apache2_umask_fix.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,11 +1,11 @@
Save and restore umask across requests correctly.
-Index: php5-5.2.4/sapi/apache2handler/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
===================================================================
---- php5-5.2.4.orig/sapi/apache2handler/sapi_apache2.c 2007-06-28 19:23:07.000000000 +0200
-+++ php5-5.2.4/sapi/apache2handler/sapi_apache2.c 2007-09-11 00:24:16.000000000 +0200
-@@ -434,6 +434,19 @@
+--- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
return APR_SUCCESS;
}
@@ -25,7 +25,7 @@
static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
{
char *content_length;
-@@ -622,6 +635,8 @@
+@@ -620,6 +633,8 @@ zend_first_try {
} else {
zend_file_handle zfd;
@@ -34,7 +34,7 @@
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = (char *) r->filename;
zfd.free_filename = 0;
-@@ -633,6 +648,9 @@
+@@ -631,6 +646,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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/036-fd_setsize_fix.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/sockets/sockets.c
+Index: php5-5.2.6/ext/sockets/sockets.c
===================================================================
---- php5-5.2.4.orig/ext/sockets/sockets.c 2007-07-24 13:35:08.000000000 +0200
-+++ php5-5.2.4/ext/sockets/sockets.c 2007-09-11 00:24:23.000000000 +0200
-@@ -566,6 +566,7 @@
+--- 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
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 +10,11 @@
PHP_SAFE_FD_SET(php_sock->bsd_socket, fds);
if (php_sock->bsd_socket > *max_fd) {
-Index: php5-5.2.4/ext/standard/streamsfuncs.c
+Index: php5-5.2.6/ext/standard/streamsfuncs.c
===================================================================
---- php5-5.2.4.orig/ext/standard/streamsfuncs.c 2007-07-09 19:27:24.000000000 +0200
-+++ php5-5.2.4/ext/standard/streamsfuncs.c 2007-09-11 00:24:23.000000000 +0200
-@@ -592,6 +592,9 @@
+--- 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 *
* 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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/043-recode_size_t.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.5/ext/recode/recode.c
+Index: php5-5.2.6/ext/recode/recode.c
===================================================================
---- php5-5.2.5.orig/ext/recode/recode.c 2007-06-22 02:02:15.000000000 +0200
-+++ php5-5.2.5/ext/recode/recode.c 2008-02-21 00:46:54.000000000 +0100
-@@ -136,7 +136,7 @@
+--- php5-5.2.6.orig/ext/recode/recode.c
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/044-strtod_arm_fix.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/Zend/zend_strtod.c
+Index: php5-5.2.6/Zend/zend_strtod.c
===================================================================
---- php5-5.2.4.orig/Zend/zend_strtod.c 2007-07-23 18:17:10.000000000 +0200
-+++ php5-5.2.4/Zend/zend_strtod.c 2007-09-11 00:26:29.000000000 +0200
-@@ -142,14 +142,25 @@
+--- php5-5.2.6.orig/Zend/zend_strtod.c
++++ php5-5.2.6/Zend/zend_strtod.c
+@@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
#define IEEE_LITTLE_ENDIAN
#endif
@@ -35,7 +35,7 @@
#endif
#ifdef __vax__
-@@ -256,8 +267,7 @@
+@@ -266,8 +277,7 @@ BEGIN_EXTERN_C()
#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
defined(IBM) != 1
@@ -45,7 +45,7 @@
#endif
typedef union {
-@@ -277,7 +287,7 @@
+@@ -287,7 +297,7 @@ BEGIN_EXTERN_C()
* An alternative that might be better on some machines is
* #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
*/
Modified: php5/trunk/debian/patches/045-exif_nesting_level.patch
===================================================================
--- php5/trunk/debian/patches/045-exif_nesting_level.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/045-exif_nesting_level.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/exif/exif.c
+Index: php5-5.2.6/ext/exif/exif.c
===================================================================
---- php5-5.2.2.orig/ext/exif/exif.c 2007-02-27 04:04:40.000000000 +0100
-+++ php5-5.2.2/ext/exif/exif.c 2007-05-04 17:42:23.000000000 +0200
-@@ -99,7 +99,7 @@
+--- php5-5.2.6.orig/ext/exif/exif.c
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/047-zts_with_dl.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/standard/dl.c
+Index: php5-5.2.6/ext/standard/dl.c
===================================================================
---- php5-5.2.2.orig/ext/standard/dl.c 2007-02-23 01:37:35.000000000 +0100
-+++ php5-5.2.2/ext/standard/dl.c 2007-05-04 17:42:34.000000000 +0200
-@@ -76,12 +76,7 @@
+--- php5-5.2.6.orig/ext/standard/dl.c
++++ php5-5.2.6/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) &&
(strncmp(sapi_module.name, "embed", 5)!=0)) {
Modified: php5/trunk/debian/patches/052-phpinfo_no_configure.patch
===================================================================
--- php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php-5.2.4/ext/standard/info.c
+Index: php5-5.2.6/ext/standard/info.c
===================================================================
---- php-5.2.4.orig/ext/standard/info.c
-+++ php-5.2.4/ext/standard/info.c
-@@ -461,7 +461,7 @@
+--- 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
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,11 +11,11 @@
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
if (sapi_module.pretty_name) {
-Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
---- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
-@@ -20,7 +20,6 @@
+--- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
+@@ -20,7 +20,6 @@ PHP Version => %s
System => %s
Build Date => %s
Modified: php5/trunk/debian/patches/053-extension_api.patch
===================================================================
--- php5/trunk/debian/patches/053-extension_api.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/053-extension_api.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.4.orig/configure.in 2007-09-11 00:24:00.000000000 +0200
-+++ php5-5.2.4/configure.in 2007-09-11 00:40:32.000000000 +0200
-@@ -1048,8 +1048,13 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -1048,8 +1048,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 +17,7 @@
if test "$oldstyleextdir" = "yes"; then
if test "$PHP_DEBUG" = "1"; then
part1=debug
-@@ -1193,6 +1198,7 @@
+@@ -1193,6 +1198,7 @@ PHP_SUBST(CXX)
PHP_SUBST(CXXFLAGS)
PHP_SUBST(CXXFLAGS_CLEAN)
PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -25,11 +25,11 @@
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
-Index: php5-5.2.4/scripts/php-config.in
+Index: php5-5.2.6/scripts/php-config.in
===================================================================
---- php5-5.2.4.orig/scripts/php-config.in 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/scripts/php-config.in 2007-09-11 00:41:21.000000000 +0200
-@@ -17,6 +17,7 @@
+--- php5-5.2.6.orig/scripts/php-config.in
++++ php5-5.2.6/scripts/php-config.in
+@@ -17,6 +17,7 @@ php_cli_binary=NONE
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
php_sapis="@PHP_INSTALLED_SAPIS@"
@@ -37,7 +37,7 @@
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
-@@ -55,6 +56,8 @@
+@@ -55,6 +56,8 @@ case "$1" in
echo $include_dir;;
--php-binary)
echo $php_binary;;
@@ -46,7 +46,7 @@
--php-sapis)
echo $php_sapis;;
--configure-options)
-@@ -75,6 +78,7 @@
+@@ -75,6 +78,7 @@ Options:
--include-dir [$include_dir]
--php-binary [$php_binary]
--php-sapis [$php_sapis]
Modified: php5/trunk/debian/patches/056-mime_magic_liberal.patch
===================================================================
--- php5/trunk/debian/patches/056-mime_magic_liberal.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/056-mime_magic_liberal.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.2/ext/mime_magic/mime_magic.c
+Index: php5-5.2.6/ext/mime_magic/mime_magic.c
===================================================================
---- php5-5.2.2.orig/ext/mime_magic/mime_magic.c 2007-02-15 01:05:42.000000000 +0100
-+++ php5-5.2.2/ext/mime_magic/mime_magic.c 2007-05-04 17:42:41.000000000 +0200
-@@ -501,7 +501,7 @@
+--- php5-5.2.6.orig/ext/mime_magic/mime_magic.c
++++ php5-5.2.6/ext/mime_magic/mime_magic.c
+@@ -501,7 +501,7 @@ static int is_valid_mimetype(char *p, in
} while (*(++p) != '/');
++p;
do {
@@ -11,7 +11,7 @@
return 0;
}
} while (*(++p));
-@@ -634,6 +634,15 @@
+@@ -634,6 +634,15 @@ static int parse(char *l, int lineno)
else if (strncmp(l, "string", NSTRING) == 0) {
m->type = STRING;
l += NSTRING;
@@ -27,7 +27,7 @@
}
else if (strncmp(l, "date", NDATE) == 0) {
m->type = DATE;
-@@ -727,7 +736,7 @@
+@@ -727,7 +736,7 @@ static int parse(char *l, int lineno)
if (!is_valid_mimetype(l, strlen(l))) {
if(MIME_MAGIC_G(debug))
php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_WARNING, ": (%s:%d) '%s' is not a valid mimetype, entry skipped", MIME_MAGIC_G(magicfile), lineno, l);
Modified: php5/trunk/debian/patches/057-no_apache_installed.patch
===================================================================
--- php5/trunk/debian/patches/057-no_apache_installed.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/057-no_apache_installed.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/sapi/apache2handler/config.m4
+Index: php5-5.2.6/sapi/apache2handler/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache2handler/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache2handler/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -59,13 +59,13 @@
+--- php5-5.2.6.orig/sapi/apache2handler/config.m4
++++ php5-5.2.6/sapi/apache2handler/config.m4
+@@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -23,11 +23,11 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.4/sapi/apache/config.m4
+Index: php5-5.2.6/sapi/apache/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -56,11 +56,11 @@
+--- php5-5.2.6.orig/sapi/apache/config.m4
++++ php5-5.2.6/sapi/apache/config.m4
+@@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -44,11 +44,11 @@
for flag in $APXS_CFLAGS; do
case $flag in
-Index: php5-5.2.4/sapi/apache2filter/config.m4
+Index: php5-5.2.6/sapi/apache2filter/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache2filter/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache2filter/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -60,13 +60,13 @@
+--- php5-5.2.6.orig/sapi/apache2filter/config.m4
++++ php5-5.2.6/sapi/apache2filter/config.m4
+@@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -69,11 +69,11 @@
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-Index: php5-5.2.4/sapi/apache_hooks/config.m4
+Index: php5-5.2.6/sapi/apache_hooks/config.m4
===================================================================
---- php5-5.2.4.orig/sapi/apache_hooks/config.m4 2007-07-12 01:20:36.000000000 +0200
-+++ php5-5.2.4/sapi/apache_hooks/config.m4 2007-09-11 00:41:45.000000000 +0200
-@@ -57,11 +57,11 @@
+--- php5-5.2.6.orig/sapi/apache_hooks/config.m4
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/100-recode_is_shared.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/ext/recode/config9.m4
+Index: php5-5.2.6/ext/recode/config9.m4
===================================================================
---- php5-5.2.0.orig/ext/recode/config9.m4 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/recode/config9.m4 2007-03-18 22:58:44.000000000 +0100
-@@ -8,6 +8,6 @@
+--- php5-5.2.6.orig/ext/recode/config9.m4
++++ php5-5.2.6/ext/recode/config9.m4
+@@ -8,6 +8,6 @@ if test "$PHP_RECODE" != "no"; then
test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql"
if test -n "$recode_conflict"; then
Modified: php5/trunk/debian/patches/101-sqlite_is_shared.patch
===================================================================
--- php5/trunk/debian/patches/101-sqlite_is_shared.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/101-sqlite_is_shared.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/ext/sqlite/config.m4
+Index: php5-5.2.6/ext/sqlite/config.m4
===================================================================
---- php5-5.2.4.orig/ext/sqlite/config.m4 2007-07-03 19:25:35.000000000 +0200
-+++ php5-5.2.4/ext/sqlite/config.m4 2007-09-11 00:41:52.000000000 +0200
-@@ -84,7 +84,7 @@
+--- php5-5.2.6.orig/ext/sqlite/config.m4
++++ php5-5.2.6/ext/sqlite/config.m4
+@@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
])
SQLITE_MODULE_TYPE=external
PHP_SQLITE_CFLAGS=$pdo_inc_path
Modified: php5/trunk/debian/patches/107-reflection_is_ext.patch
===================================================================
--- php5/trunk/debian/patches/107-reflection_is_ext.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/107-reflection_is_ext.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.0/ext/reflection/config.m4
+Index: php5-5.2.6/ext/reflection/config.m4
===================================================================
---- php5-5.2.0.orig/ext/reflection/config.m4 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/reflection/config.m4 2007-03-18 22:58:44.000000000 +0100
-@@ -2,7 +2,7 @@
+--- php5-5.2.6.orig/ext/reflection/config.m4
++++ php5-5.2.6/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
PHP_ARG_ENABLE(reflection, whether to enable reflection support,
Modified: php5/trunk/debian/patches/108-64_bit_datetime.patch
===================================================================
--- php5/trunk/debian/patches/108-64_bit_datetime.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/108-64_bit_datetime.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,10 +1,10 @@
-Index: php5-5.2.4/ext/standard/datetime.c
+Index: php5-5.2.6/ext/standard/datetime.c
===================================================================
---- php5-5.2.4.orig/ext/standard/datetime.c 2007-06-07 10:59:00.000000000 +0200
-+++ php5-5.2.4/ext/standard/datetime.c 2007-09-11 00:41:58.000000000 +0200
+--- php5-5.2.6.orig/ext/standard/datetime.c
++++ php5-5.2.6/ext/standard/datetime.c
@@ -20,6 +20,9 @@
- /* $Id: datetime.c,v 1.134.2.2.2.4 2007/06/07 08:59:00 tony2001 Exp $ */
+ /* $Id: datetime.c,v 1.134.2.2.2.5 2007/12/31 07:20:12 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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/112-proc_open.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,7 +1,7 @@
-Index: php5-5.2.0/ext/standard/proc_open.c
+Index: php5-5.2.6/ext/standard/proc_open.c
===================================================================
---- php5-5.2.0.orig/ext/standard/proc_open.c 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/ext/standard/proc_open.c 2007-03-18 22:58:45.000000000 +0100
+--- php5-5.2.6.orig/ext/standard/proc_open.c
++++ php5-5.2.6/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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/113-php.ini_securitynotes.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:42:09.000000000 +0200
-@@ -166,6 +166,11 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -166,6 +166,11 @@ allow_call_time_pass_reference = On
;
; Safe Mode
;
@@ -14,7 +14,7 @@
safe_mode = Off
; By default, Safe Mode does a UID compare check when
-@@ -202,6 +207,13 @@
+@@ -202,6 +207,13 @@ safe_mode_protected_env_vars = LD_LIBRAR
; and below. This directive makes most sense if used in a per-directory
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -28,7 +28,7 @@
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
-@@ -411,6 +423,11 @@
+@@ -411,6 +423,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/disable_dl_by_default.patch
===================================================================
--- php5/trunk/debian/patches/disable_dl_by_default.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/disable_dl_by_default.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.4/php.ini-dist
+Index: php5-5.2.6/php.ini-dist
===================================================================
---- php5-5.2.4.orig/php.ini-dist 2007-09-11 00:42:09.000000000 +0200
-+++ php5-5.2.4/php.ini-dist 2007-09-11 00:42:13.000000000 +0200
-@@ -505,7 +505,8 @@
+--- php5-5.2.6.orig/php.ini-dist
++++ php5-5.2.6/php.ini-dist
+@@ -505,7 +505,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 +12,11 @@
; 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.4/php.ini-recommended
+Index: php5-5.2.6/php.ini-recommended
===================================================================
---- php5-5.2.4.orig/php.ini-recommended 2007-09-11 00:23:54.000000000 +0200
-+++ php5-5.2.4/php.ini-recommended 2007-09-11 00:42:13.000000000 +0200
-@@ -538,7 +538,9 @@
+--- php5-5.2.6.orig/php.ini-recommended
++++ php5-5.2.6/php.ini-recommended
+@@ -538,7 +538,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 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/fix_broken_upstream_tests.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.5/tests/basic/bug20539.phpt
+Index: php5-5.2.6/tests/basic/bug20539.phpt
===================================================================
---- php5-5.2.5.orig/tests/basic/bug20539.phpt 2005-07-08 09:48:57.000000000 +0200
-+++ php5-5.2.5/tests/basic/bug20539.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -3,6 +3,7 @@
+--- 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
@@ -10,11 +10,11 @@
--FILE--
<?php
print "good :)\n";
-Index: php5-5.2.5/ext/soap/tests/server009.phpt
+Index: php5-5.2.6/ext/soap/tests/server009.phpt
===================================================================
---- php5-5.2.5.orig/ext/soap/tests/server009.phpt 2007-05-07 20:45:01.000000000 +0200
-+++ php5-5.2.5/ext/soap/tests/server009.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -7,6 +7,10 @@
+--- php5-5.2.6.orig/ext/soap/tests/server009.phpt
++++ php5-5.2.6/ext/soap/tests/server009.phpt
+@@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
die('skip this test needs session extension');
}
?>
@@ -25,10 +25,10 @@
--FILE--
<?php
class foo {
-Index: php5-5.2.5/ext/standard/tests/general_functions/phpinfo.phpt
+Index: php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
---- php5-5.2.5.orig/ext/standard/tests/general_functions/phpinfo.phpt 2007-11-13 23:36:17.000000000 +0100
-+++ php5-5.2.5/ext/standard/tests/general_functions/phpinfo.phpt 2007-11-13 23:45:03.000000000 +0100
+--- php5-5.2.6.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php5-5.2.6/ext/standard/tests/general_functions/phpinfo.phpt
@@ -1,5 +1,7 @@
--TEST--
phpinfo()
@@ -37,19 +37,19 @@
--FILE--
<?php
var_dump(phpinfo());
-@@ -24,6 +26,7 @@
+@@ -24,6 +26,7 @@ Server API => Command Line Interface
Virtual Directory Support => %s
Configuration File (php.ini) Path => %s
- Loaded Configuration File => %s
+ Loaded Configuration File => %a
+Scan this dir for additional .ini files => %s
PHP API => %d
PHP Extension => %d
Zend Extension => %d
-Index: php5-5.2.5/ext/standard/tests/strings/moneyformat.phpt
+Index: php5-5.2.6/ext/standard/tests/strings/moneyformat.phpt
===================================================================
---- php5-5.2.5.orig/ext/standard/tests/strings/moneyformat.phpt 2007-06-06 19:46:17.000000000 +0200
-+++ php5-5.2.5/ext/standard/tests/strings/moneyformat.phpt 2007-11-13 23:45:03.000000000 +0100
-@@ -5,6 +5,8 @@
+--- php5-5.2.6.orig/ext/standard/tests/strings/moneyformat.phpt
++++ php5-5.2.6/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/libdb_is_-ldb
===================================================================
--- php5/trunk/debian/patches/libdb_is_-ldb 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/libdb_is_-ldb 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,13 +1,13 @@
-Index: php5-5.2.5/ext/dba/config.m4
+Index: php5-5.2.6/ext/dba/config.m4
===================================================================
---- php5-5.2.5.orig/ext/dba/config.m4
-+++ php5-5.2.5/ext/dba/config.m4
-@@ -301,7 +301,7 @@
+--- php5-5.2.6.orig/ext/dba/config.m4
++++ php5-5.2.6/ext/dba/config.m4
+@@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
done
-- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+ PHP_DBA_DB_CHECK(4, db db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+- PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++ PHP_DBA_DB_CHECK(4, db db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
Modified: php5/trunk/debian/patches/manpage_spelling.patch
===================================================================
--- php5/trunk/debian/patches/manpage_spelling.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/manpage_spelling.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -1,8 +1,8 @@
-Index: php5-5.2.5/sapi/cli/php.1.in
+Index: php5-5.2.6/sapi/cli/php.1.in
===================================================================
---- php5-5.2.5.orig/sapi/cli/php.1.in 2008-05-01 01:04:40.000000000 -0500
-+++ php5-5.2.5/sapi/cli/php.1.in 2008-05-01 01:07:05.000000000 -0500
-@@ -69,7 +69,7 @@
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -69,7 +69,7 @@ specified by \-F to be executed.
You can access the input line by \fB$argn\fP. While processing the input lines
.B $argi
contains the number of the actual line being processed. Further more
@@ -11,7 +11,7 @@
.IR code
(see \-r) before and
after all input lines have been processed respectively. Notice that the
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ The configuration file for the CGI versi
The configuration file for the version of PHP that apache2 uses.
.SH EXAMPLES
.TP 5
@@ -20,7 +20,7 @@
This command simply writes the text "Hello World" to standard out.
.TP
\fIphp \-r 'print_r(gd_info());'\fP
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ configuration information. If you then c
Using this PHP command you can count the lines being input.
.TP
\fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/suhosin.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -3,11 +3,11 @@
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.5/TSRM/TSRM.h
+Index: php5-5.2.6/TSRM/TSRM.h
===================================================================
---- php5-5.2.5.orig/TSRM/TSRM.h
-+++ php5-5.2.5/TSRM/TSRM.h
-@@ -38,6 +38,13 @@
+--- php5-5.2.6.orig/TSRM/TSRM.h
++++ php5-5.2.6/TSRM/TSRM.h
+@@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
typedef unsigned long tsrm_uintptr_t;
#endif
@@ -21,7 +21,7 @@
/* Only compile multi-threading functions if we're in ZTS mode */
#ifdef ZTS
-@@ -93,6 +100,7 @@
+@@ -93,6 +100,7 @@ typedef void (*ts_allocate_dtor)(void *,
#define THREAD_HASH_OF(thr,ts) (unsigned long)thr%(unsigned long)ts
@@ -29,11 +29,11 @@
#ifdef __cplusplus
extern "C" {
#endif
-Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.c
+Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.c
===================================================================
---- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.c
-+++ php5-5.2.5/TSRM/tsrm_virtual_cwd.c
-@@ -273,6 +273,178 @@
+--- 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,
}
/* }}} */
@@ -212,11 +212,11 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
-Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.h
+Index: php5-5.2.6/TSRM/tsrm_virtual_cwd.h
===================================================================
---- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.h
-+++ php5-5.2.5/TSRM/tsrm_virtual_cwd.h
-@@ -139,6 +139,22 @@
+--- php5-5.2.6.orig/TSRM/tsrm_virtual_cwd.h
++++ php5-5.2.6/TSRM/tsrm_virtual_cwd.h
+@@ -139,6 +139,22 @@ typedef struct _cwd_state {
typedef int (*verify_path_func)(const cwd_state *);
@@ -239,11 +239,11 @@
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.5/Zend/Makefile.am
+Index: php5-5.2.6/Zend/Makefile.am
===================================================================
---- php5-5.2.5.orig/Zend/Makefile.am
-+++ php5-5.2.5/Zend/Makefile.am
-@@ -17,7 +17,7 @@
+--- php5-5.2.6.orig/Zend/Makefile.am
++++ php5-5.2.6/Zend/Makefile.am
+@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
@@ -252,11 +252,41 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-Index: php5-5.2.5/Zend/zend.c
+Index: php5-5.2.6/Zend/Zend.dsp
===================================================================
---- php5-5.2.5.orig/Zend/zend.c
-+++ php5-5.2.5/Zend/zend.c
-@@ -57,7 +57,9 @@
+--- php5-5.2.6.orig/Zend/Zend.dsp
++++ php5-5.2.6/Zend/Zend.dsp
+@@ -239,6 +239,10 @@ SOURCE=.\zend_strtod.c
+ # End Source File
+ # Begin Source File
+
++SOURCE=.\zend_canary.c
++# End Source File
++# Begin Source File
++
+ 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
+@@ -273,6 +273,10 @@ SOURCE=.\zend_strtod.c
+ # End Source File
+ # Begin Source File
+
++SOURCE=.\zend_canary.c
++# End Source File
++# Begin Source File
++
+ 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
+@@ -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);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -267,7 +297,7 @@
void (*zend_on_timeout)(int seconds TSRMLS_DC);
static void (*zend_message_dispatcher_p)(long message, void *data);
-@@ -74,9 +76,88 @@
+@@ -74,9 +76,88 @@ static ZEND_INI_MH(OnUpdateErrorReportin
return SUCCESS;
}
@@ -356,11 +386,11 @@
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.5/Zend/zend.h
+Index: php5-5.2.6/Zend/zend.h
===================================================================
---- php5-5.2.5.orig/Zend/zend.h
-+++ php5-5.2.5/Zend/zend.h
-@@ -520,6 +520,9 @@
+--- php5-5.2.6.orig/Zend/zend.h
++++ php5-5.2.6/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);
extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -370,7 +400,7 @@
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -651,6 +654,13 @@
+@@ -663,6 +666,13 @@ END_EXTERN_C()
#include "zend_operators.h"
#include "zend_variables.h"
@@ -384,11 +414,11 @@
#endif /* ZEND_H */
/*
-Index: php5-5.2.5/Zend/zend_alloc.c
+Index: php5-5.2.6/Zend/zend_alloc.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_alloc.c
-+++ php5-5.2.5/Zend/zend_alloc.c
-@@ -311,13 +311,26 @@
+--- php5-5.2.6.orig/Zend/zend_alloc.c
++++ php5-5.2.6/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
@@ -417,7 +447,7 @@
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -423,6 +436,9 @@
+@@ -423,6 +436,9 @@ struct _zend_mm_heap {
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
@@ -427,7 +457,7 @@
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,15 +528,15 @@
+@@ -512,15 +528,15 @@ static unsigned int _zend_mm_cookie = 0;
#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
@@ -446,7 +476,7 @@
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -582,6 +598,48 @@
+@@ -582,6 +598,48 @@ static unsigned int _zend_mm_cookie = 0;
#endif
@@ -495,7 +525,7 @@
#if ZEND_MM_HEAP_PROTECTION
-@@ -780,6 +838,12 @@
+@@ -790,6 +848,12 @@ static inline void zend_mm_remove_from_f
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
@@ -508,7 +538,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -818,6 +882,12 @@
+@@ -828,6 +892,12 @@ subst_block:
}
} else {
@@ -521,7 +551,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -865,6 +935,11 @@
+@@ -875,6 +945,11 @@ static inline void zend_mm_init(zend_mm_
heap->large_free_buckets[i] = NULL;
}
heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
@@ -533,7 +563,7 @@
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1755,6 +1830,11 @@
+@@ -1766,6 +1841,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;
@@ -545,7 +575,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);
-@@ -1889,6 +1969,12 @@
+@@ -1905,6 +1985,12 @@ zend_mm_finished_searching_for_block:
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -558,7 +588,7 @@
heap->size += true_size;
if (heap->peak < heap->size) {
heap->peak = heap->size;
-@@ -1912,6 +1998,9 @@
+@@ -1928,6 +2014,9 @@ static void _zend_mm_free_int(zend_mm_he
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -568,7 +598,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
-@@ -1974,6 +2063,9 @@
+@@ -1990,6 +2079,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);
@@ -578,7 +608,7 @@
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2005,6 +2097,11 @@
+@@ -2021,6 +2113,11 @@ static void *_zend_mm_realloc_int(zend_m
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -590,7 +620,7 @@
return p;
}
-@@ -2024,13 +2121,18 @@
+@@ -2040,13 +2137,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);
@@ -610,7 +640,7 @@
#endif
heap->cached -= true_size - orig_size;
-@@ -2088,6 +2190,11 @@
+@@ -2104,6 +2206,11 @@ static void *_zend_mm_realloc_int(zend_m
if (heap->peak < heap->size) {
heap->peak = heap->size;
}
@@ -622,7 +652,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
-@@ -2191,6 +2298,11 @@
+@@ -2207,6 +2314,11 @@ out_of_memory:
}
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -634,7 +664,7 @@
return ZEND_MM_DATA_OF(mm_block);
}
-@@ -2198,7 +2310,7 @@
+@@ -2214,7 +2326,7 @@ out_of_memory:
#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
memcpy(ptr, p, mm_block->debug.size);
#else
@@ -643,7 +673,7 @@
#endif
_zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
return ptr;
-@@ -2441,6 +2553,17 @@
+@@ -2477,6 +2589,17 @@ ZEND_API void shutdown_memory_manager(in
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
}
@@ -661,11 +691,11 @@
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
char *tmp;
-Index: php5-5.2.5/Zend/zend_alloc.h
+Index: php5-5.2.6/Zend/zend_alloc.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_alloc.h
-+++ php5-5.2.5/Zend/zend_alloc.h
-@@ -128,6 +128,9 @@
+--- 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_
ZEND_API void start_memory_manager(TSRMLS_D);
ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);
@@ -675,10 +705,10 @@
ZEND_API int is_zend_mm(TSRMLS_D);
#if ZEND_DEBUG
-Index: php5-5.2.5/Zend/zend_canary.c
+Index: php5-5.2.6/Zend/zend_canary.c
===================================================================
--- /dev/null
-+++ php5-5.2.5/Zend/zend_canary.c
++++ php5-5.2.6/Zend/zend_canary.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -744,11 +774,11 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.5/Zend/zend_compile.c
+Index: php5-5.2.6/Zend/zend_compile.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_compile.c
-+++ php5-5.2.5/Zend/zend_compile.c
-@@ -54,7 +54,6 @@
+--- php5-5.2.6.orig/Zend/zend_compile.c
++++ php5-5.2.6/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);
}
@@ -756,7 +786,7 @@
static void zend_destroy_property_info(zend_property_info *property_info)
{
efree(property_info->name);
-@@ -68,6 +67,10 @@
+@@ -68,6 +67,10 @@ static void zend_destroy_property_info_i
{
free(property_info->name);
}
@@ -767,11 +797,11 @@
static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
{
-Index: php5-5.2.5/Zend/zend_compile.h
+Index: php5-5.2.6/Zend/zend_compile.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_compile.h
-+++ php5-5.2.5/Zend/zend_compile.h
-@@ -564,6 +564,11 @@
+--- php5-5.2.6.orig/Zend/zend_compile.h
++++ php5-5.2.6/Zend/zend_compile.h
+@@ -564,6 +564,11 @@ ZEND_API int zend_auto_global_disable_ji
int zendlex(znode *zendlval TSRMLS_DC);
@@ -783,7 +813,7 @@
/* BEGIN: OPCODES */
#include "zend_vm_opcodes.h"
-@@ -686,6 +691,7 @@
+@@ -686,6 +691,7 @@ int zendlex(znode *zendlval TSRMLS_DC);
#define ZEND_RETURNS_FUNCTION 1<<0
@@ -791,11 +821,11 @@
END_EXTERN_C()
#define ZEND_CLONE_FUNC_NAME "__clone"
-Index: php5-5.2.5/Zend/zend_constants.c
+Index: php5-5.2.6/Zend/zend_constants.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_constants.c
-+++ php5-5.2.5/Zend/zend_constants.c
-@@ -110,6 +110,75 @@
+--- php5-5.2.6.orig/Zend/zend_constants.c
++++ php5-5.2.6/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);
REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
@@ -871,10 +901,10 @@
/* true/false constants */
{
-Index: php5-5.2.5/Zend/zend_errors.h
+Index: php5-5.2.6/Zend/zend_errors.h
===================================================================
---- php5-5.2.5.orig/Zend/zend_errors.h
-+++ php5-5.2.5/Zend/zend_errors.h
+--- php5-5.2.6.orig/Zend/zend_errors.h
++++ php5-5.2.6/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)
@@ -896,19 +926,19 @@
#endif /* ZEND_ERRORS_H */
/*
-Index: php5-5.2.5/Zend/zend_hash.c
+Index: php5-5.2.6/Zend/zend_hash.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_hash.c
-+++ php5-5.2.5/Zend/zend_hash.c
+--- php5-5.2.6.orig/Zend/zend_hash.c
++++ php5-5.2.6/Zend/zend_hash.c
@@ -20,6 +20,7 @@
- /* $Id: zend_hash.c,v 1.121.2.4.2.8 2007/07/24 18:28:39 dmitry Exp $ */
+ /* $Id: zend_hash.c,v 1.121.2.4.2.9 2007/12/31 07:20:02 sebastian Exp $ */
#include "zend.h"
+#include "zend_compile.h"
#define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
(element)->pNext = (list_head); \
-@@ -132,7 +133,189 @@
+@@ -132,7 +133,189 @@ ZEND_API ulong zend_hash_func(char *arKe
(p)->pDataPtr=NULL; \
}
@@ -1098,7 +1128,7 @@
ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
{
-@@ -153,6 +336,7 @@
+@@ -153,6 +336,7 @@ ZEND_API int _zend_hash_init(HashTable *
ht->nTableMask = ht->nTableSize - 1;
ht->pDestructor = pDestructor;
@@ -1106,7 +1136,7 @@
ht->arBuckets = NULL;
ht->pListHead = NULL;
ht->pListTail = NULL;
-@@ -230,6 +414,8 @@
+@@ -230,6 +414,8 @@ ZEND_API int _zend_hash_add_or_update(Ha
return FAILURE;
}
#endif
@@ -1115,7 +1145,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -295,6 +481,7 @@
+@@ -295,6 +481,7 @@ ZEND_API int _zend_hash_quick_add_or_upd
return FAILURE;
}
#endif
@@ -1123,7 +1153,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -370,6 +557,7 @@
+@@ -370,6 +557,7 @@ ZEND_API int _zend_hash_index_update_or_
return FAILURE;
}
#endif
@@ -1131,7 +1161,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -493,6 +681,7 @@
+@@ -493,6 +681,7 @@ ZEND_API int zend_hash_del_key_or_index(
if (ht->pInternalPointer == p) {
ht->pInternalPointer = p->pListNext;
}
@@ -1139,7 +1169,7 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -518,6 +707,8 @@
+@@ -518,6 +707,8 @@ ZEND_API void zend_hash_destroy(HashTabl
SET_INCONSISTENT(HT_IS_DESTROYING);
@@ -1148,7 +1178,7 @@
p = ht->pListHead;
while (p != NULL) {
q = p;
-@@ -544,6 +735,8 @@
+@@ -544,6 +735,8 @@ ZEND_API void zend_hash_clean(HashTable
SET_INCONSISTENT(HT_CLEANING);
@@ -1157,7 +1187,7 @@
p = ht->pListHead;
while (p != NULL) {
q = p;
-@@ -607,6 +800,7 @@
+@@ -607,6 +800,7 @@ static Bucket *zend_hash_apply_deleter(H
ht->nNumOfElements--;
HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -1165,10 +1195,10 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-Index: php5-5.2.5/Zend/zend_llist.c
+Index: php5-5.2.6/Zend/zend_llist.c
===================================================================
---- php5-5.2.5.orig/Zend/zend_llist.c
-+++ php5-5.2.5/Zend/zend_llist.c
+--- php5-5.2.6.orig/Zend/zend_llist.c
++++ php5-5.2.6/Zend/zend_llist.c
@@ -23,6 +23,184 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -1354,7 +1384,7 @@
ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
{
l->head = NULL;
-@@ -30,6 +208,7 @@
+@@ -30,6 +208,7 @@ ZEND_API void zend_llist_init(zend_llist
l->count = 0;
l->size = size;
l->dtor = dtor;
@@ -1362,7 +1392,7 @@
l->persistent = persistent;
}
-@@ -81,6 +260,7 @@
+@@ -81,6 +260,7 @@ ZEND_API void zend_llist_prepend_element
} else {\
(l)->tail = (current)->prev;\
}\
@@ -1370,7 +1400,7 @@
if ((l)->dtor) {\
(l)->dtor((current)->data);\
}\
-@@ -108,6 +288,7 @@
+@@ -108,6 +288,7 @@ ZEND_API void zend_llist_destroy(zend_ll
{
zend_llist_element *current=l->head, *next;
@@ -1378,7 +1408,7 @@
while (current) {
next = current->next;
if (l->dtor) {
-@@ -133,6 +314,7 @@
+@@ -133,6 +314,7 @@ ZEND_API void *zend_llist_remove_tail(ze
zend_llist_element *old_tail;
void *data;
@@ -1386,11 +1416,11 @@
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-Index: php5-5.2.5/configure.in
+Index: php5-5.2.6/configure.in
===================================================================
---- php5-5.2.5.orig/configure.in
-+++ php5-5.2.5/configure.in
-@@ -227,6 +227,7 @@
+--- php5-5.2.6.orig/configure.in
++++ php5-5.2.6/configure.in
+@@ -227,6 +227,7 @@ sinclude(Zend/Zend.m4)
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -1398,7 +1428,7 @@
divert(2)
-@@ -1304,7 +1305,7 @@
+@@ -1304,7 +1305,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 \
@@ -1407,7 +1437,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 @@
+@@ -1330,7 +1331,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 \
@@ -1416,11 +1446,11 @@
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.5/ext/standard/basic_functions.c
+Index: php5-5.2.6/ext/standard/basic_functions.c
===================================================================
---- php5-5.2.5.orig/ext/standard/basic_functions.c
-+++ php5-5.2.5/ext/standard/basic_functions.c
-@@ -3575,7 +3575,9 @@
+--- php5-5.2.6.orig/ext/standard/basic_functions.c
++++ php5-5.2.6/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)
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1431,11 +1461,11 @@
#endif
#ifdef HAVE_FNMATCH
-Index: php5-5.2.5/ext/standard/dl.c
+Index: php5-5.2.6/ext/standard/dl.c
===================================================================
---- php5-5.2.5.orig/ext/standard/dl.c
-+++ php5-5.2.5/ext/standard/dl.c
-@@ -241,6 +241,19 @@
+--- php5-5.2.6.orig/ext/standard/dl.c
++++ php5-5.2.6/ext/standard/dl.c
+@@ -241,6 +241,19 @@ void php_dl(zval *file, int type, zval *
RETURN_FALSE;
}
}
@@ -1455,11 +1485,11 @@
RETURN_TRUE;
}
/* }}} */
-Index: php5-5.2.5/ext/standard/file.c
+Index: php5-5.2.6/ext/standard/file.c
===================================================================
---- php5-5.2.5.orig/ext/standard/file.c
-+++ php5-5.2.5/ext/standard/file.c
-@@ -2361,7 +2361,7 @@
+--- php5-5.2.6.orig/ext/standard/file.c
++++ php5-5.2.6/ext/standard/file.c
+@@ -2372,7 +2372,7 @@ out:
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
/* {{{ proto string realpath(string path)
Return the resolved path */
@@ -1468,11 +1498,11 @@
{
zval **path;
char resolved_path_buff[MAXPATHLEN];
-Index: php5-5.2.5/ext/standard/file.h
+Index: php5-5.2.6/ext/standard/file.h
===================================================================
---- php5-5.2.5.orig/ext/standard/file.h
-+++ php5-5.2.5/ext/standard/file.h
-@@ -61,7 +61,7 @@
+--- php5-5.2.6.orig/ext/standard/file.h
++++ php5-5.2.6/ext/standard/file.h
+@@ -61,7 +61,7 @@ PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
@@ -1481,11 +1511,11 @@
#endif
#ifdef HAVE_FNMATCH
PHP_FUNCTION(fnmatch);
-Index: php5-5.2.5/ext/standard/info.c
+Index: php5-5.2.6/ext/standard/info.c
===================================================================
---- php5-5.2.5.orig/ext/standard/info.c
-+++ php5-5.2.5/ext/standard/info.c
-@@ -627,6 +627,31 @@
+--- 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
php_info_print_table_end();
@@ -1517,11 +1547,11 @@
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
-Index: php5-5.2.5/ext/standard/syslog.c
+Index: php5-5.2.6/ext/standard/syslog.c
===================================================================
---- php5-5.2.5.orig/ext/standard/syslog.c
-+++ php5-5.2.5/ext/standard/syslog.c
-@@ -42,6 +42,7 @@
+--- php5-5.2.6.orig/ext/standard/syslog.c
++++ php5-5.2.6/ext/standard/syslog.c
+@@ -42,6 +42,7 @@ static void start_syslog(TSRMLS_D);
*/
PHP_MINIT_FUNCTION(syslog)
{
@@ -1529,7 +1559,7 @@
/* error levels */
REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
-@@ -97,6 +98,7 @@
+@@ -97,6 +98,7 @@ PHP_MINIT_FUNCTION(syslog)
/* AIX doesn't have LOG_PERROR */
REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
#endif
@@ -1537,11 +1567,11 @@
BG(syslog_device)=NULL;
return SUCCESS;
-Index: php5-5.2.5/main/fopen_wrappers.c
+Index: php5-5.2.6/main/fopen_wrappers.c
===================================================================
---- php5-5.2.5.orig/main/fopen_wrappers.c
-+++ php5-5.2.5/main/fopen_wrappers.c
-@@ -110,7 +110,7 @@
+--- php5-5.2.6.orig/main/fopen_wrappers.c
++++ php5-5.2.6/main/fopen_wrappers.c
+@@ -110,7 +110,7 @@ PHPAPI int php_check_specific_open_based
/* normalize and expand path */
if (expand_filepath(path, resolved_name TSRMLS_CC) == NULL) {
@@ -1550,7 +1580,7 @@
}
path_len = strlen(resolved_name);
-@@ -179,6 +179,12 @@
+@@ -182,6 +182,12 @@ PHPAPI int php_check_specific_open_based
}
}
@@ -1563,7 +1593,7 @@
/* Check the path */
#if defined(PHP_WIN32) || defined(NETWARE)
if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
-@@ -202,7 +208,7 @@
+@@ -205,7 +211,7 @@ PHPAPI int php_check_specific_open_based
}
} else {
/* Unable to resolve the real path, return -1 */
@@ -1572,7 +1602,7 @@
}
}
/* }}} */
-@@ -221,22 +227,44 @@
+@@ -224,22 +230,44 @@ PHPAPI int php_check_open_basedir_ex(con
char *pathbuf;
char *ptr;
char *end;
@@ -1618,11 +1648,11 @@
ptr = end;
}
-Index: php5-5.2.5/main/main.c
+Index: php5-5.2.6/main/main.c
===================================================================
---- php5-5.2.5.orig/main/main.c
-+++ php5-5.2.5/main/main.c
-@@ -88,6 +88,9 @@
+--- php5-5.2.6.orig/main/main.c
++++ php5-5.2.6/main/main.c
+@@ -89,6 +89,9 @@
#include "SAPI.h"
#include "rfc1867.h"
@@ -1632,7 +1662,7 @@
/* }}} */
#ifndef ZTS
-@@ -1369,7 +1372,7 @@
+@@ -1370,7 +1373,7 @@ void php_request_shutdown_for_exec(void
/* used to close fd's in the 3..255 range here, but it's problematic
*/
@@ -1641,7 +1671,7 @@
}
/* }}} */
-@@ -1410,6 +1413,9 @@
+@@ -1411,6 +1414,9 @@ void php_request_shutdown_for_hook(void
zend_try {
shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
@@ -1651,7 +1681,7 @@
} zend_end_try();
zend_try {
-@@ -1502,6 +1508,9 @@
+@@ -1503,6 +1509,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);
@@ -1661,7 +1691,7 @@
} zend_end_try();
/* 12. Reset max_execution_time */
-@@ -1661,6 +1670,9 @@
+@@ -1662,6 +1671,9 @@ int php_module_startup(sapi_module_struc
#ifdef ZTS
tsrm_ls = ts_resource(0);
#endif
@@ -1671,7 +1701,7 @@
module_shutdown = 0;
module_startup = 1;
-@@ -1790,6 +1802,10 @@
+@@ -1791,6 +1803,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);
@@ -1682,7 +1712,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);
-@@ -1839,7 +1855,9 @@
+@@ -1840,7 +1856,9 @@ int php_module_startup(sapi_module_struc
module_startup = 0;
shutdown_memory_manager(1, 0 TSRMLS_CC);
@@ -1693,7 +1723,7 @@
/* we're done */
return SUCCESS;
}
-@@ -1898,6 +1916,9 @@
+@@ -1899,6 +1917,9 @@ void php_module_shutdown(TSRMLS_D)
#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
@@ -1703,10 +1733,10 @@
core_globals_dtor(&core_globals TSRMLS_CC);
#else
zend_ini_global_shutdown(TSRMLS_C);
-Index: php5-5.2.5/main/php.h
+Index: php5-5.2.6/main/php.h
===================================================================
---- php5-5.2.5.orig/main/php.h
-+++ php5-5.2.5/main/php.h
+--- php5-5.2.6.orig/main/php.h
++++ php5-5.2.6/main/php.h
@@ -40,6 +40,13 @@
#undef sprintf
#define sprintf php_sprintf
@@ -1721,7 +1751,7 @@
/* PHP's DEBUG value must match Zend's ZEND_DEBUG value */
#undef PHP_DEBUG
#define PHP_DEBUG ZEND_DEBUG
-@@ -448,6 +455,10 @@
+@@ -448,6 +455,10 @@ END_EXTERN_C()
#endif
#endif /* !XtOffsetOf */
@@ -1732,11 +1762,11 @@
#endif
/*
-Index: php5-5.2.5/main/php_logos.c
+Index: php5-5.2.6/main/php_logos.c
===================================================================
---- php5-5.2.5.orig/main/php_logos.c
-+++ php5-5.2.5/main/php_logos.c
-@@ -50,6 +50,10 @@
+--- php5-5.2.6.orig/main/php_logos.c
++++ php5-5.2.6/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));
}
@@ -1747,7 +1777,7 @@
int php_init_info_logos(void)
{
if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
-@@ -58,6 +62,9 @@
+@@ -58,6 +62,9 @@ int php_init_info_logos(void)
php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
@@ -1757,11 +1787,11 @@
return SUCCESS;
}
-Index: php5-5.2.5/main/snprintf.c
+Index: php5-5.2.6/main/snprintf.c
===================================================================
---- php5-5.2.5.orig/main/snprintf.c
-+++ php5-5.2.5/main/snprintf.c
-@@ -1080,7 +1080,11 @@
+--- 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
case 'n':
@@ -1773,11 +1803,11 @@
goto skip_output;
/*
-Index: php5-5.2.5/main/spprintf.c
+Index: php5-5.2.6/main/spprintf.c
===================================================================
---- php5-5.2.5.orig/main/spprintf.c
-+++ php5-5.2.5/main/spprintf.c
-@@ -673,7 +673,11 @@
+--- 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_
case 'n':
@@ -1789,10 +1819,10 @@
goto skip_output;
/*
-Index: php5-5.2.5/main/suhosin_globals.h
+Index: php5-5.2.6/main/suhosin_globals.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_globals.h
++++ php5-5.2.6/main/suhosin_globals.h
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -1855,10 +1885,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.5/main/suhosin_logo.h
+Index: php5-5.2.6/main/suhosin_logo.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_logo.h
++++ php5-5.2.6/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"
@@ -2038,10 +2068,10 @@
+ "\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.5/main/suhosin_patch.c
+Index: php5-5.2.6/main/suhosin_patch.c
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.c
++++ php5-5.2.6/main/suhosin_patch.c
@@ -0,0 +1,380 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2423,10 +2453,10 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-Index: php5-5.2.5/main/suhosin_patch.h
+Index: php5-5.2.6/main/suhosin_patch.h
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.h
++++ php5-5.2.6/main/suhosin_patch.h
@@ -0,0 +1,40 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2468,10 +2498,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-Index: php5-5.2.5/main/suhosin_patch.m4
+Index: php5-5.2.6/main/suhosin_patch.m4
===================================================================
--- /dev/null
-+++ php5-5.2.5/main/suhosin_patch.m4
++++ php5-5.2.6/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 $
@@ -2481,11 +2511,11 @@
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-Index: php5-5.2.5/sapi/apache/mod_php5.c
+Index: php5-5.2.6/sapi/apache/mod_php5.c
===================================================================
---- php5-5.2.5.orig/sapi/apache/mod_php5.c
-+++ php5-5.2.5/sapi/apache/mod_php5.c
-@@ -951,7 +951,11 @@
+--- php5-5.2.6.orig/sapi/apache/mod_php5.c
++++ php5-5.2.6/sapi/apache/mod_php5.c
+@@ -951,7 +951,11 @@ static void php_init_handler(server_rec
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2497,11 +2527,11 @@
}
}
#endif
-Index: php5-5.2.5/sapi/apache2filter/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2filter/sapi_apache2.c
===================================================================
---- php5-5.2.5.orig/sapi/apache2filter/sapi_apache2.c
-+++ php5-5.2.5/sapi/apache2filter/sapi_apache2.c
-@@ -562,7 +562,11 @@
+--- 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
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2513,11 +2543,11 @@
}
}
-Index: php5-5.2.5/sapi/apache2handler/sapi_apache2.c
+Index: php5-5.2.6/sapi/apache2handler/sapi_apache2.c
===================================================================
---- php5-5.2.5.orig/sapi/apache2handler/sapi_apache2.c
-+++ php5-5.2.5/sapi/apache2handler/sapi_apache2.c
-@@ -372,7 +372,11 @@
+--- php5-5.2.6.orig/sapi/apache2handler/sapi_apache2.c
++++ php5-5.2.6/sapi/apache2handler/sapi_apache2.c
+@@ -370,7 +370,11 @@ static void php_apache_add_version(apr_p
{
TSRMLS_FETCH();
if (PG(expose_php)) {
@@ -2529,48 +2559,70 @@
}
}
-Index: php5-5.2.5/sapi/cgi/cgi_main.c
+Index: php5-5.2.6/sapi/cgi/cgi_main.c
===================================================================
---- php5-5.2.5.orig/sapi/cgi/cgi_main.c
-+++ php5-5.2.5/sapi/cgi/cgi_main.c
-@@ -1720,11 +1720,19 @@
+--- 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
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-2007 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-2008 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-2007 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-2008 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-2007 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-2008 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-2007 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-2008 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.5/sapi/cli/php_cli.c
+Index: php5-5.2.6/sapi/cli/php_cli.c
===================================================================
---- php5-5.2.5.orig/sapi/cli/php_cli.c
-+++ php5-5.2.5/sapi/cli/php_cli.c
-@@ -779,8 +779,14 @@
+--- 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[])
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 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-2007 The PHP Group\n%s",
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s",
+ PHP_VERSION, SUHOSIN_PATCH_VERSION,
+#else
-+ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
++ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 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
+ 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 \
+- zend_default_classes.c zend_execute.c zend_strtod.c");
++ zend_default_classes.c zend_execute.c zend_strtod.c zend_canary.c");
+
+ 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") {
+ AC_DEFINE('HAVE_USLEEP', 1);
+ AC_DEFINE('HAVE_STRCOLL', 1);
+
++AC_DEFINE('SUHOSIN_PATCH', 1);
++
+ /* For snapshot builders, where can we find the additional
+ * files that make up the snapshot template? */
+ ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
Modified: php5/trunk/debian/patches/use_embedded_timezonedb.patch
===================================================================
--- php5/trunk/debian/patches/use_embedded_timezonedb.patch 2008-05-03 11:52:49 UTC (rev 1037)
+++ php5/trunk/debian/patches/use_embedded_timezonedb.patch 2008-05-03 12:07:33 UTC (rev 1038)
@@ -2,8 +2,10 @@
patch by Joe Orton <jorton at redhat.com> Copyright © 2008 Red Hat, Inc.
and may be used/redistributed/modified under the terms of the rest
of the PHP source
---- php-5.2.5/ext/date/lib/timelib.m4.systzdata
-+++ php-5.2.5/ext/date/lib/timelib.m4
+Index: php5-5.2.6/ext/date/lib/timelib.m4
+===================================================================
+--- php5-5.2.6.orig/ext/date/lib/timelib.m4
++++ php5-5.2.6/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
dnl Check for strtoll, atoll
@@ -22,8 +24,10 @@
+ fi
+fi
+
---- php-5.2.5/ext/date/lib/parse_tz.c.systzdata
-+++ php-5.2.5/ext/date/lib/parse_tz.c
+Index: php5-5.2.6/ext/date/lib/parse_tz.c
+===================================================================
+--- php5-5.2.6.orig/ext/date/lib/parse_tz.c
++++ php5-5.2.6/ext/date/lib/parse_tz.c
@@ -20,6 +20,16 @@
#include "timelib.h"
More information about the Pkg-php-commits
mailing list