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.3.0 # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,9 +12,9 @@ Name: php5 %define suhosin_version 0.9.27 -%define suhosin_php_version 5.2.9 +%define suhosin_php_version 5.2.10 %define suhosin_patch_version 0.9.7 -%define with_suhosin_patch 1 +%define with_suhosin_patch 0 %define pkg_name php5 %define with_spell 1 %if 0%{?suse_version} < 930 @@ -77,7 +77,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.2.10 +Version: 5.3.0 Release: 30 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -94,7 +94,7 @@ #until it gets fixed in upstream... Source5: Registry.php #SUSE specific stuff -Patch1: php5-config.patch +##Patch1: php5-config.patch Patch2: php5-phpize.patch Patch3: php5-apache_sapi_install.patch Patch4: php5-php-config.patch @@ -106,7 +106,7 @@ Patch7: php-5.2.5-system-tzdb.patch #bugs # compiler warnings -Patch9: php5-warnings.patch +Patch9: php5-%{version}-warnings.patch #please use patch30 and up for security fixes Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1435,7 +1435,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.3.0 # for pear XML files %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink
[-] [+]	Added	php5-5.3.0-warnings.patch ^
@@ -0,0 +1,34 @@ +--- ext/xmlrpc/xmlrpc-epi-php.c.orig ++++ ext/xmlrpc/xmlrpc-epi-php.c +@@ -170,7 +170,7 @@ typedef struct _xmlrpc_callback_data { + + #define ENCODING_KEY "encoding" + #define ENCODING_KEY_LEN (sizeof(ENCODING_KEY) - 1) +-#define ENCODING_DEFAULT "iso-8859-1" ++static const char ENCODING_DEFAULT = "iso-8859-1"; + + / value types */ + #define OBJECT_TYPE_ATTR "xmlrpc_type" +--- Zend/zend_canary.c.orig ++++ Zend/zend_canary.c +@@ -21,6 +21,9 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <unistd.h> ++#include <time.h> ++#include <fcntl.h> + + + #if SUHOSIN_PATCH +--- TSRM/tsrm_virtual_cwd.c.orig 2009-07-05 18:57:25.000000000 +0200 ++++ TSRM/tsrm_virtual_cwd.c 2009-07-05 19:00:47.000000000 +0200 +@@ -1053,7 +1053,7 @@ + int start = 1; + int ll = 0; + time_t t; +- int ret; ++ int ret = 0; + int add_slash; + TSRMLS_FETCH(); +
[-] [+]	Changed	suhosin-patch-5.2.10-0.9.7.patch.gz ^
@@ -1,6 +1,6 @@ -diff -Nura php-5.2.9/TSRM/TSRM.h suhosin-patch-5.2.9-0.9.7/TSRM/TSRM.h ---- php-5.2.9/TSRM/TSRM.h 2008-12-31 12:17:31.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/TSRM/TSRM.h 2009-03-05 21:11:35.000000000 +0100 +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 @@ -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.9/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.c ---- php-5.2.9/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:31.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-03-05 21:37:36.000000000 +0100 +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 @@ -273,6 +273,191 @@ } /* }}} / @@ -218,9 +218,9 @@ CWD_API void virtual_cwd_startup(void) / {{{ / { char cwd[MAXPATHLEN]; -diff -Nura php-5.2.9/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.h ---- php-5.2.9/TSRM/tsrm_virtual_cwd.h 2008-12-31 12:17:32.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.h 2009-03-05 21:11:35.000000000 +0100 +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 @@ -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.9/Zend/Makefile.am suhosin-patch-5.2.9-0.9.7/Zend/Makefile.am ---- php-5.2.9/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/Makefile.am 2009-03-05 21:11:35.000000000 +0100 +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 @@ -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.9/Zend/Zend.dsp suhosin-patch-5.2.9-0.9.7/Zend/Zend.dsp ---- php-5.2.9/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/Zend.dsp 2009-03-05 21:15:17.000000000 +0100 +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 @@ -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.9/Zend/ZendTS.dsp suhosin-patch-5.2.9-0.9.7/Zend/ZendTS.dsp ---- php-5.2.9/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/ZendTS.dsp 2009-03-05 21:15:17.000000000 +0100 +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 @@ -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.9/Zend/zend.c suhosin-patch-5.2.9-0.9.7/Zend/zend.c ---- php-5.2.9/Zend/zend.c 2008-12-31 12:17:32.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/zend.c 2009-03-05 21:11:35.000000000 +0100 +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 @@ -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,10 +387,10 @@ 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.9/Zend/zend.h suhosin-patch-5.2.9-0.9.7/Zend/zend.h ---- php-5.2.9/Zend/zend.h 2008-12-31 12:17:32.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/zend.h 2009-03-05 21:11:35.000000000 +0100 -@@ -532,6 +532,9 @@ +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 +@@ -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); extern ZEND_API char (zend_getenv)(char name, size_t name_len TSRMLS_DC); @@ -400,7 +400,7 @@ ZEND_API void zend_error(int type, const char format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); -@@ -663,6 +666,13 @@ +@@ -681,6 +684,13 @@ #include "zend_operators.h" #include "zend_variables.h" @@ -414,10 +414,10 @@ #endif /* ZEND_H / / -diff -Nura php-5.2.9/Zend/zend_alloc.c suhosin-patch-5.2.9-0.9.7/Zend/zend_alloc.c ---- php-5.2.9/Zend/zend_alloc.c 2009-01-25 15:04:09.000000000 +0100 -+++ suhosin-patch-5.2.9-0.9.7/Zend/zend_alloc.c 2009-03-05 21:11:35.000000000 +0100 -@@ -311,13 +311,26 @@ +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 +@@ -316,13 +316,26 @@ #define MEM_BLOCK_GUARD 0x2A8FCC84 #define MEM_BLOCK_LEAK 0x6C5E8F2D @@ -446,7 +446,7 @@ } zend_mm_block_info; #if ZEND_DEBUG -@@ -423,6 +436,9 @@ +@@ -428,6 +441,9 @@ int miss; } cache_stat[ZEND_MM_NUM_BUCKETS+1]; #endif @@ -456,7 +456,7 @@ }; #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \ -@@ -512,15 +528,15 @@ +@@ -517,15 +533,15 @@ #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)) @@ -475,7 +475,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 @@ +@@ -587,6 +603,48 @@ #endif @@ -524,7 +524,7 @@ #if ZEND_MM_HEAP_PROTECTION -@@ -790,6 +848,12 @@ +@@ -795,6 +853,12 @@ if (EXPECTED(prev == mm_block)) { zend_mm_free_block rp, cp; @@ -537,7 +537,7 @@ #if ZEND_MM_SAFE_UNLINKING if (UNEXPECTED(next != mm_block)) { zend_mm_panic("zend_mm_heap corrupted"); -@@ -828,6 +892,12 @@ +@@ -833,6 +897,12 @@ } } else { @@ -550,7 +550,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"); -@@ -875,6 +945,11 @@ +@@ -880,6 +950,11 @@ heap->large_free_buckets[i] = NULL; } heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap); @@ -562,7 +562,7 @@ } static void zend_mm_del_segment(zend_mm_heap heap, zend_mm_segment segment) -@@ -1779,6 +1854,11 @@ +@@ -1784,6 +1859,11 @@ best_fit = heap->cache[index]; heap->cache[index] = best_fit->prev_free_block; heap->cached -= true_size; @@ -574,7 +574,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); -@@ -1918,6 +1998,12 @@ +@@ -1923,6 +2003,12 @@ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1); @@ -587,7 +587,7 @@
	Changed	php-5.3.0.tar.bz2 ^