Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	php5.spec
@@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.2.10 +# spec file for package php5 (Version 5.2.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: php5 %define suhosin_version 0.9.27 -%define suhosin_php_version 5.2.10 +%define suhosin_php_version 5.2.11 %define suhosin_patch_version 0.9.7 %define with_suhosin_patch 1 %define pkg_name php5 @@ -85,7 +85,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.2.10 +Version: 5.2.11 Release: 30 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -1443,7 +1443,7 @@ # fix deadlock %{__cp} %{S:5} %{buildroot}/%{peardir}/PEAR # reminder: Will be removed when upstream fixes deadlock in pear -test %version = 5.2.10 +test %version = 5.2.11 # for pear XML files %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink
[-] [+]	Changed	suhosin-patch-5.2.11-0.9.7.patch.gz ^
@@ -1,6 +1,6 @@ -diff -Nura php-5.2.10/TSRM/TSRM.h suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h ---- php-5.2.10/TSRM/TSRM.h 2008-12-31 12:17:31.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/TSRM/TSRM.h suhosin-patch-5.2.11-0.9.7/TSRM/TSRM.h +--- php-5.2.11/TSRM/TSRM.h 2008-12-31 12:17:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/TSRM/TSRM.h 2009-09-18 13:34:07.000000000 +0200 @@ -38,6 +38,13 @@ typedef unsigned long tsrm_uintptr_t; #endif @@ -23,9 +23,9 @@ #ifdef __cplusplus extern "C" { #endif -diff -Nura php-5.2.10/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c ---- php-5.2.10/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:31.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.11-0.9.7/TSRM/tsrm_virtual_cwd.c +--- php-5.2.11/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-09-18 13:34:07.000000000 +0200 @@ -273,6 +273,191 @@ } /* }}} / @@ -218,9 +218,9 @@ CWD_API void virtual_cwd_startup(void) / {{{ / { char cwd[MAXPATHLEN]; -diff -Nura php-5.2.10/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.h ---- php-5.2.10/TSRM/tsrm_virtual_cwd.h 2008-12-31 12:17:32.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.11-0.9.7/TSRM/tsrm_virtual_cwd.h +--- php-5.2.11/TSRM/tsrm_virtual_cwd.h 2008-12-31 12:17:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/TSRM/tsrm_virtual_cwd.h 2009-09-18 13:34:07.000000000 +0200 @@ -139,6 +139,22 @@ typedef int (verify_path_func)(const cwd_state ); @@ -244,9 +244,9 @@ 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); -diff -Nura php-5.2.10/Zend/Makefile.am suhosin-patch-5.2.10-0.9.7/Zend/Makefile.am ---- php-5.2.10/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/Makefile.am 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/Makefile.am suhosin-patch-5.2.11-0.9.7/Zend/Makefile.am +--- php-5.2.11/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/Makefile.am 2009-09-18 13:34:07.000000000 +0200 @@ -17,7 +17,7 @@ zend_objects_API.c zend_ts_hash.c zend_stream.c \ zend_default_classes.c \ @@ -256,9 +256,9 @@ libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ -diff -Nura php-5.2.10/Zend/Zend.dsp suhosin-patch-5.2.10-0.9.7/Zend/Zend.dsp ---- php-5.2.10/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/Zend.dsp 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/Zend.dsp suhosin-patch-5.2.11-0.9.7/Zend/Zend.dsp +--- php-5.2.11/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/Zend.dsp 2009-09-18 13:34:07.000000000 +0200 @@ -239,6 +239,10 @@ # End Source File # Begin Source File @@ -270,9 +270,9 @@ SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File -diff -Nura php-5.2.10/Zend/ZendTS.dsp suhosin-patch-5.2.10-0.9.7/Zend/ZendTS.dsp ---- php-5.2.10/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/ZendTS.dsp 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/ZendTS.dsp suhosin-patch-5.2.11-0.9.7/Zend/ZendTS.dsp +--- php-5.2.11/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/ZendTS.dsp 2009-09-18 13:34:07.000000000 +0200 @@ -273,6 +273,10 @@ # End Source File # Begin Source File @@ -284,9 +284,9 @@ SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File -diff -Nura php-5.2.10/Zend/zend.c suhosin-patch-5.2.10-0.9.7/Zend/zend.c ---- php-5.2.10/Zend/zend.c 2009-06-16 18:09:04.000000000 +0200 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend.c suhosin-patch-5.2.11-0.9.7/Zend/zend.c +--- php-5.2.11/Zend/zend.c 2009-06-16 18:09:04.000000000 +0200 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend.c 2009-09-18 13:34:07.000000000 +0200 @@ -57,7 +57,9 @@ 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); @@ -387,9 +387,9 @@ STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals) #ifdef ZEND_MULTIBYTE STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals) -diff -Nura php-5.2.10/Zend/zend.h suhosin-patch-5.2.10-0.9.7/Zend/zend.h ---- php-5.2.10/Zend/zend.h 2009-06-17 10:57:04.000000000 +0200 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend.h suhosin-patch-5.2.11-0.9.7/Zend/zend.h +--- php-5.2.11/Zend/zend.h 2009-09-06 17:56:58.000000000 +0200 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend.h 2009-09-18 13:34:07.000000000 +0200 @@ -550,6 +550,9 @@ 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,9 +414,9 @@ #endif /* ZEND_H / / -diff -Nura php-5.2.10/Zend/zend_alloc.c suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.c ---- php-5.2.10/Zend/zend_alloc.c 2009-05-30 18:42:24.000000000 +0200 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_alloc.c suhosin-patch-5.2.11-0.9.7/Zend/zend_alloc.c +--- php-5.2.11/Zend/zend_alloc.c 2009-05-30 18:42:24.000000000 +0200 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_alloc.c 2009-09-18 13:34:07.000000000 +0200 @@ -316,13 +316,26 @@ #define MEM_BLOCK_GUARD 0x2A8FCC84 #define MEM_BLOCK_LEAK 0x6C5E8F2D @@ -690,9 +690,9 @@ static void alloc_globals_ctor(zend_alloc_globals alloc_globals TSRMLS_DC) { char tmp; -diff -Nura php-5.2.10/Zend/zend_alloc.h suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.h ---- php-5.2.10/Zend/zend_alloc.h 2009-01-25 14:42:39.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_alloc.h suhosin-patch-5.2.11-0.9.7/Zend/zend_alloc.h +--- php-5.2.11/Zend/zend_alloc.h 2009-06-28 11:47:42.000000000 +0200 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_alloc.h 2009-09-18 13:34:07.000000000 +0200 @@ -129,6 +129,9 @@ ZEND_API void start_memory_manager(TSRMLS_D); @@ -703,9 +703,9 @@ ZEND_API int is_zend_mm(TSRMLS_D); #if ZEND_DEBUG -diff -Nura php-5.2.10/Zend/zend_canary.c suhosin-patch-5.2.10-0.9.7/Zend/zend_canary.c ---- php-5.2.10/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_canary.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_canary.c suhosin-patch-5.2.11-0.9.7/Zend/zend_canary.c +--- php-5.2.11/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_canary.c 2009-09-18 13:34:07.000000000 +0200 @@ -0,0 +1,64 @@ +/* + +----------------------------------------------------------------------+ @@ -771,9 +771,9 @@ + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + / -diff -Nura php-5.2.10/Zend/zend_compile.c suhosin-patch-5.2.10-0.9.7/Zend/zend_compile.c ---- php-5.2.10/Zend/zend_compile.c 2009-05-08 19:50:58.000000000 +0200 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_compile.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_compile.c suhosin-patch-5.2.11-0.9.7/Zend/zend_compile.c +--- php-5.2.11/Zend/zend_compile.c 2009-05-08 19:50:58.000000000 +0200 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_compile.c 2009-09-18 13:34:07.000000000 +0200 @@ -54,7 +54,6 @@ property_info->name = zend_strndup(property_info->name, property_info->name_length); } @@ -793,9 +793,9 @@ static void build_runtime_defined_function_key(zval result, char name, int name_length TSRMLS_DC) { -diff -Nura php-5.2.10/Zend/zend_compile.h suhosin-patch-5.2.10-0.9.7/Zend/zend_compile.h ---- php-5.2.10/Zend/zend_compile.h 2009-01-21 11:15:46.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_compile.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_compile.h suhosin-patch-5.2.11-0.9.7/Zend/zend_compile.h +--- php-5.2.11/Zend/zend_compile.h 2009-01-21 11:15:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_compile.h 2009-09-18 13:34:07.000000000 +0200 @@ -564,6 +564,11 @@ int zendlex(znode zendlval TSRMLS_DC); @@ -816,9 +816,9 @@ END_EXTERN_C() #define ZEND_CLONE_FUNC_NAME "__clone" -diff -Nura php-5.2.10/Zend/zend_constants.c suhosin-patch-5.2.10-0.9.7/Zend/zend_constants.c ---- php-5.2.10/Zend/zend_constants.c 2008-12-31 12:17:33.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_constants.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_constants.c suhosin-patch-5.2.11-0.9.7/Zend/zend_constants.c +--- php-5.2.11/Zend/zend_constants.c 2008-12-31 12:17:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_constants.c 2009-09-18 13:34:07.000000000 +0200 @@ -110,6 +110,75 @@ REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT \| CONST_CS); @@ -895,9 +895,9 @@ /* true/false constants / { -diff -Nura php-5.2.10/Zend/zend_errors.h suhosin-patch-5.2.10-0.9.7/Zend/zend_errors.h ---- php-5.2.10/Zend/zend_errors.h 2008-12-31 12:17:33.000000000 +0100 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_errors.h 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_errors.h suhosin-patch-5.2.11-0.9.7/Zend/zend_errors.h +--- php-5.2.11/Zend/zend_errors.h 2008-12-31 12:17:49.000000000 +0100 ++++ suhosin-patch-5.2.11-0.9.7/Zend/zend_errors.h 2009-09-18 13:34:07.000000000 +0200 @@ -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) @@ -919,11 +919,11 @@ #endif / ZEND_ERRORS_H / / -diff -Nura php-5.2.10/Zend/zend_hash.c suhosin-patch-5.2.10-0.9.7/Zend/zend_hash.c ---- php-5.2.10/Zend/zend_hash.c 2009-06-07 21:28:32.000000000 +0200 -+++ suhosin-patch-5.2.10-0.9.7/Zend/zend_hash.c 2009-06-23 22:36:11.000000000 +0200 +diff -Nura php-5.2.11/Zend/zend_hash.c suhosin-patch-5.2.11-0.9.7/Zend/zend_hash.c
	Changed	php-5.2.11.tar.bz2 ^