[Pkg-php-commits] r918 - php5/trunk/debian/patches
Sean Finney
seanius at alioth.debian.org
Tue Nov 13 22:51:32 UTC 2007
Author: seanius
Date: 2007-11-13 22:51:32 +0000 (Tue, 13 Nov 2007)
New Revision: 918
Modified:
php5/trunk/debian/patches/suhosin.patch
Log:
another massage on suhosin patch
Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch 2007-11-13 22:45:30 UTC (rev 917)
+++ php5/trunk/debian/patches/suhosin.patch 2007-11-13 22:51:32 UTC (rev 918)
@@ -1,6 +1,7 @@
-diff -Nura php-5.2.5/TSRM/TSRM.h suhosin-patch-5.2.5-0.9.6.2/TSRM/TSRM.h
---- php-5.2.5/TSRM/TSRM.h 2007-04-17 08:26:32.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/TSRM/TSRM.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/TSRM/TSRM.h
+===================================================================
+--- php5-5.2.5.orig/TSRM/TSRM.h 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/TSRM/TSRM.h 2007-11-13 23:51:13.000000000 +0100
@@ -38,6 +38,13 @@
typedef unsigned long tsrm_uintptr_t;
#endif
@@ -23,9 +24,10 @@
#ifdef __cplusplus
extern "C" {
#endif
-diff -Nura php-5.2.5/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.5-0.9.6.2/TSRM/tsrm_virtual_cwd.c
---- php-5.2.5/TSRM/tsrm_virtual_cwd.c 2007-10-23 07:57:35.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/TSRM/tsrm_virtual_cwd.c 2007-11-10 02:45:52.000000000 +0100
+Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.c
+===================================================================
+--- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/TSRM/tsrm_virtual_cwd.c 2007-11-13 23:51:13.000000000 +0100
@@ -273,6 +273,178 @@
}
/* }}} */
@@ -205,9 +207,10 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
-diff -Nura php-5.2.5/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.5-0.9.6.2/TSRM/tsrm_virtual_cwd.h
---- php-5.2.5/TSRM/tsrm_virtual_cwd.h 2007-01-22 10:31:46.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/TSRM/tsrm_virtual_cwd.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/TSRM/tsrm_virtual_cwd.h
+===================================================================
+--- php5-5.2.5.orig/TSRM/tsrm_virtual_cwd.h 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/TSRM/tsrm_virtual_cwd.h 2007-11-13 23:51:13.000000000 +0100
@@ -139,6 +139,22 @@
typedef int (*verify_path_func)(const cwd_state *);
@@ -231,9 +234,10 @@
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.5/Zend/Makefile.am suhosin-patch-5.2.5-0.9.6.2/Zend/Makefile.am
---- php-5.2.5/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/Makefile.am 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/Makefile.am
+===================================================================
+--- php5-5.2.5.orig/Zend/Makefile.am 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/Makefile.am 2007-11-13 23:51:13.000000000 +0100
@@ -17,7 +17,7 @@
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
@@ -243,9 +247,10 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-diff -Nura php-5.2.5/Zend/Zend.dsp suhosin-patch-5.2.5-0.9.6.2/Zend/Zend.dsp
---- php-5.2.5/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/Zend.dsp 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/Zend.dsp
+===================================================================
+--- php5-5.2.5.orig/Zend/Zend.dsp 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/Zend.dsp 2007-11-13 23:51:13.000000000 +0100
@@ -239,6 +239,10 @@
# End Source File
# Begin Source File
@@ -257,9 +262,10 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-diff -Nura php-5.2.5/Zend/ZendTS.dsp suhosin-patch-5.2.5-0.9.6.2/Zend/ZendTS.dsp
---- php-5.2.5/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/ZendTS.dsp 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/ZendTS.dsp
+===================================================================
+--- php5-5.2.5.orig/Zend/ZendTS.dsp 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/ZendTS.dsp 2007-11-13 23:51:13.000000000 +0100
@@ -273,6 +273,10 @@
# End Source File
# Begin Source File
@@ -271,9 +277,10 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-diff -Nura php-5.2.5/Zend/zend.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend.c
---- php-5.2.5/Zend/zend.c 2007-07-21 02:35:14.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend.c 2007-11-13 23:51:13.000000000 +0100
@@ -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);
@@ -374,9 +381,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.5/Zend/zend.h suhosin-patch-5.2.5-0.9.6.2/Zend/zend.h
---- php-5.2.5/Zend/zend.h 2007-07-23 18:17:10.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend.h
+===================================================================
+--- php5-5.2.5.orig/Zend/zend.h 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend.h 2007-11-13 23:51:13.000000000 +0100
@@ -520,6 +520,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);
@@ -401,9 +409,10 @@
#endif /* ZEND_H */
/*
-diff -Nura php-5.2.5/Zend/zend_alloc.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_alloc.c
---- php-5.2.5/Zend/zend_alloc.c 2007-10-25 09:30:29.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_alloc.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_alloc.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_alloc.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_alloc.c 2007-11-13 23:51:13.000000000 +0100
@@ -311,13 +311,26 @@
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -677,9 +686,10 @@
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
char *tmp;
-diff -Nura php-5.2.5/Zend/zend_alloc.h suhosin-patch-5.2.5-0.9.6.2/Zend/zend_alloc.h
---- php-5.2.5/Zend/zend_alloc.h 2007-03-20 07:46:48.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_alloc.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_alloc.h
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_alloc.h 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_alloc.h 2007-11-13 23:51:13.000000000 +0100
@@ -128,6 +128,9 @@
ZEND_API void start_memory_manager(TSRMLS_D);
@@ -690,9 +700,10 @@
ZEND_API int is_zend_mm(TSRMLS_D);
#if ZEND_DEBUG
-diff -Nura php-5.2.5/Zend/zend_canary.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_canary.c
---- php-5.2.5/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_canary.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_canary.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/Zend/zend_canary.c 2007-11-13 23:51:13.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
@@ -758,9 +769,10 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-diff -Nura php-5.2.5/Zend/zend_compile.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_compile.c
---- php-5.2.5/Zend/zend_compile.c 2007-09-20 16:11:31.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_compile.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_compile.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_compile.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_compile.c 2007-11-13 23:51:13.000000000 +0100
@@ -54,7 +54,6 @@
property_info->name = zend_strndup(property_info->name, property_info->name_length);
}
@@ -780,9 +792,10 @@
static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
{
-diff -Nura php-5.2.5/Zend/zend_compile.h suhosin-patch-5.2.5-0.9.6.2/Zend/zend_compile.h
---- php-5.2.5/Zend/zend_compile.h 2007-05-18 15:12:04.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_compile.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_compile.h
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_compile.h 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_compile.h 2007-11-13 23:51:13.000000000 +0100
@@ -564,6 +564,11 @@
int zendlex(znode *zendlval TSRMLS_DC);
@@ -803,9 +816,10 @@
END_EXTERN_C()
#define ZEND_CLONE_FUNC_NAME "__clone"
-diff -Nura php-5.2.5/Zend/zend_constants.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_constants.c
---- php-5.2.5/Zend/zend_constants.c 2007-07-27 18:29:11.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_constants.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_constants.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_constants.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_constants.c 2007-11-13 23:51:13.000000000 +0100
@@ -110,6 +110,75 @@
REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
@@ -882,9 +896,10 @@
/* true/false constants */
{
-diff -Nura php-5.2.5/Zend/zend_errors.h suhosin-patch-5.2.5-0.9.6.2/Zend/zend_errors.h
---- php-5.2.5/Zend/zend_errors.h 2007-01-01 10:35:46.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_errors.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_errors.h
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_errors.h 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_errors.h 2007-11-13 23:51:13.000000000 +0100
@@ -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)
@@ -906,9 +921,10 @@
#endif /* ZEND_ERRORS_H */
/*
-diff -Nura php-5.2.5/Zend/zend_hash.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_hash.c
---- php-5.2.5/Zend/zend_hash.c 2007-07-24 20:28:39.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_hash.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_hash.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_hash.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_hash.c 2007-11-13 23:51:13.000000000 +0100
@@ -20,6 +20,7 @@
/* $Id: zend_hash.c,v 1.121.2.4.2.8 2007/07/24 18:28:39 dmitry Exp $ */
@@ -1174,9 +1190,10 @@
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-diff -Nura php-5.2.5/Zend/zend_llist.c suhosin-patch-5.2.5-0.9.6.2/Zend/zend_llist.c
---- php-5.2.5/Zend/zend_llist.c 2007-02-16 09:33:28.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/Zend/zend_llist.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/Zend/zend_llist.c
+===================================================================
+--- php5-5.2.5.orig/Zend/zend_llist.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/Zend/zend_llist.c 2007-11-13 23:51:13.000000000 +0100
@@ -23,6 +23,184 @@
#include "zend_llist.h"
#include "zend_qsort.h"
@@ -1394,9 +1411,10 @@
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-diff -Nura php-5.2.5/configure.in suhosin-patch-5.2.5-0.9.6.2/configure.in
---- php-5.2.5/configure.in 2007-11-08 14:44:11.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/configure.in 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/configure.in
+===================================================================
+--- php5-5.2.5.orig/configure.in 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/configure.in 2007-11-13 23:51:13.000000000 +0100
@@ -227,6 +227,7 @@
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
@@ -1405,7 +1423,7 @@
divert(2)
-@@ -1301,7 +1302,7 @@
+@@ -1304,7 +1305,7 @@
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 \
@@ -1414,7 +1432,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)
-@@ -1327,7 +1328,7 @@
+@@ -1330,7 +1331,7 @@
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 \
@@ -1423,9 +1441,10 @@
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 \
-diff -Nura php-5.2.5/ext/standard/basic_functions.c suhosin-patch-5.2.5-0.9.6.2/ext/standard/basic_functions.c
---- php-5.2.5/ext/standard/basic_functions.c 2007-10-22 09:37:20.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/basic_functions.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/ext/standard/basic_functions.c
+===================================================================
+--- php5-5.2.5.orig/ext/standard/basic_functions.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/basic_functions.c 2007-11-13 23:51:13.000000000 +0100
@@ -3575,7 +3575,9 @@
PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
@@ -1437,10 +1456,11 @@
#endif
#ifdef HAVE_FNMATCH
-diff -Nura php-5.2.5/ext/standard/dl.c suhosin-patch-5.2.5-0.9.6.2/ext/standard/dl.c
---- php-5.2.5/ext/standard/dl.c 2007-09-18 22:19:34.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/dl.c 2007-11-10 01:38:46.000000000 +0100
-@@ -246,6 +246,19 @@
+Index: php5-5.2.5/ext/standard/dl.c
+===================================================================
+--- php5-5.2.5.orig/ext/standard/dl.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/dl.c 2007-11-13 23:51:13.000000000 +0100
+@@ -241,6 +241,19 @@
RETURN_FALSE;
}
}
@@ -1460,9 +1480,10 @@
RETURN_TRUE;
}
/* }}} */
-diff -Nura php-5.2.5/ext/standard/file.c suhosin-patch-5.2.5-0.9.6.2/ext/standard/file.c
---- php-5.2.5/ext/standard/file.c 2007-09-04 14:51:49.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/file.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/ext/standard/file.c
+===================================================================
+--- php5-5.2.5.orig/ext/standard/file.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/file.c 2007-11-13 23:51:13.000000000 +0100
@@ -2361,7 +2361,7 @@
#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
/* {{{ proto string realpath(string path)
@@ -1472,9 +1493,10 @@
{
zval **path;
char resolved_path_buff[MAXPATHLEN];
-diff -Nura php-5.2.5/ext/standard/file.h suhosin-patch-5.2.5-0.9.6.2/ext/standard/file.h
---- php-5.2.5/ext/standard/file.h 2007-01-10 15:40:06.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/file.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/ext/standard/file.h
+===================================================================
+--- php5-5.2.5.orig/ext/standard/file.h 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/file.h 2007-11-13 23:51:13.000000000 +0100
@@ -61,7 +61,7 @@
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
@@ -1484,9 +1506,10 @@
#endif
#ifdef HAVE_FNMATCH
PHP_FUNCTION(fnmatch);
-diff -Nura php-5.2.5/ext/standard/info.c suhosin-patch-5.2.5-0.9.6.2/ext/standard/info.c
---- php-5.2.5/ext/standard/info.c 2007-07-21 03:24:26.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/info.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/ext/standard/info.c
+===================================================================
+--- php5-5.2.5.orig/ext/standard/info.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/info.c 2007-11-13 23:51:13.000000000 +0100
@@ -627,6 +627,31 @@
php_info_print_table_end();
@@ -1519,9 +1542,10 @@
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
-diff -Nura php-5.2.5/ext/standard/syslog.c suhosin-patch-5.2.5-0.9.6.2/ext/standard/syslog.c
---- php-5.2.5/ext/standard/syslog.c 2007-05-17 08:38:13.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/ext/standard/syslog.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/ext/standard/syslog.c
+===================================================================
+--- php5-5.2.5.orig/ext/standard/syslog.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/ext/standard/syslog.c 2007-11-13 23:51:13.000000000 +0100
@@ -42,6 +42,7 @@
*/
PHP_MINIT_FUNCTION(syslog)
@@ -1538,9 +1562,10 @@
BG(syslog_device)=NULL;
return SUCCESS;
-diff -Nura php-5.2.5/main/fopen_wrappers.c suhosin-patch-5.2.5-0.9.6.2/main/fopen_wrappers.c
---- php-5.2.5/main/fopen_wrappers.c 2007-10-09 12:06:34.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/main/fopen_wrappers.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/fopen_wrappers.c
+===================================================================
+--- php5-5.2.5.orig/main/fopen_wrappers.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/main/fopen_wrappers.c 2007-11-13 23:51:13.000000000 +0100
@@ -110,7 +110,7 @@
/* normalize and expand path */
@@ -1618,9 +1643,10 @@
ptr = end;
}
-diff -Nura php-5.2.5/main/main.c suhosin-patch-5.2.5-0.9.6.2/main/main.c
---- php-5.2.5/main/main.c 2007-10-18 15:11:30.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/main/main.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/main.c
+===================================================================
+--- php5-5.2.5.orig/main/main.c 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/main/main.c 2007-11-13 23:51:13.000000000 +0100
@@ -88,6 +88,9 @@
#include "SAPI.h"
@@ -1702,9 +1728,10 @@
core_globals_dtor(&core_globals TSRMLS_CC);
#else
zend_ini_global_shutdown(TSRMLS_C);
-diff -Nura php-5.2.5/main/php.h suhosin-patch-5.2.5-0.9.6.2/main/php.h
---- php-5.2.5/main/php.h 2007-08-31 09:48:05.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/main/php.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/php.h
+===================================================================
+--- php5-5.2.5.orig/main/php.h 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/main/php.h 2007-11-13 23:51:13.000000000 +0100
@@ -40,6 +40,13 @@
#undef sprintf
#define sprintf php_sprintf
@@ -1730,9 +1757,10 @@
#endif
/*
-diff -Nura php-5.2.5/main/php_config.h.in suhosin-patch-5.2.5-0.9.6.2/main/php_config.h.in
---- php-5.2.5/main/php_config.h.in 2007-11-08 16:36:36.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/php_config.h.in 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/php_config.h.in
+===================================================================
+--- php5-5.2.5.orig/main/php_config.h.in 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/main/php_config.h.in 2007-11-13 23:51:13.000000000 +0100
@@ -803,6 +803,9 @@
/* Define if the target system has /dev/urandom device */
#undef HAVE_DEV_URANDOM
@@ -1743,9 +1771,10 @@
/* Whether you have AOLserver */
#undef HAVE_AOLSERVER
-diff -Nura php-5.2.5/main/php_logos.c suhosin-patch-5.2.5-0.9.6.2/main/php_logos.c
---- php-5.2.5/main/php_logos.c 2007-01-06 21:44:51.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/php_logos.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/php_logos.c
+===================================================================
+--- php5-5.2.5.orig/main/php_logos.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/main/php_logos.c 2007-11-13 23:51:13.000000000 +0100
@@ -50,6 +50,10 @@
return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
}
@@ -1767,9 +1796,10 @@
return SUCCESS;
}
-diff -Nura php-5.2.5/main/snprintf.c suhosin-patch-5.2.5-0.9.6.2/main/snprintf.c
---- php-5.2.5/main/snprintf.c 2007-10-01 17:23:15.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/main/snprintf.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/snprintf.c
+===================================================================
+--- php5-5.2.5.orig/main/snprintf.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/main/snprintf.c 2007-11-13 23:51:13.000000000 +0100
@@ -1080,7 +1080,11 @@
@@ -1782,9 +1812,10 @@
goto skip_output;
/*
-diff -Nura php-5.2.5/main/spprintf.c suhosin-patch-5.2.5-0.9.6.2/main/spprintf.c
---- php-5.2.5/main/spprintf.c 2007-10-01 17:23:15.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/main/spprintf.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/spprintf.c
+===================================================================
+--- php5-5.2.5.orig/main/spprintf.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/main/spprintf.c 2007-11-13 23:51:13.000000000 +0100
@@ -673,7 +673,11 @@
@@ -1797,9 +1828,10 @@
goto skip_output;
/*
-diff -Nura php-5.2.5/main/suhosin_globals.h suhosin-patch-5.2.5-0.9.6.2/main/suhosin_globals.h
---- php-5.2.5/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/suhosin_globals.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/suhosin_globals.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/main/suhosin_globals.h 2007-11-13 23:51:13.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
@@ -1862,9 +1894,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-diff -Nura php-5.2.5/main/suhosin_logo.h suhosin-patch-5.2.5-0.9.6.2/main/suhosin_logo.h
---- php-5.2.5/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/suhosin_logo.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/suhosin_logo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/main/suhosin_logo.h 2007-11-13 23:51:13.000000000 +0100
@@ -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"
@@ -2044,9 +2077,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"
+ ;
-diff -Nura php-5.2.5/main/suhosin_patch.c suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.c
---- php-5.2.5/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/suhosin_patch.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/main/suhosin_patch.c 2007-11-13 23:51:13.000000000 +0100
@@ -0,0 +1,380 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2428,9 +2462,10 @@
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-diff -Nura php-5.2.5/main/suhosin_patch.h suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.h
---- php-5.2.5/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.h 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/suhosin_patch.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/main/suhosin_patch.h 2007-11-13 23:51:13.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ +----------------------------------------------------------------------+
@@ -2472,9 +2507,10 @@
+ * c-basic-offset: 4
+ * End:
+ */
-diff -Nura php-5.2.5/main/suhosin_patch.m4 suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.m4
---- php-5.2.5/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/main/suhosin_patch.m4 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/main/suhosin_patch.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ php5-5.2.5/main/suhosin_patch.m4 2007-11-13 23:51:13.000000000 +0100
@@ -0,0 +1,8 @@
+dnl
+dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
@@ -2484,9 +2520,10 @@
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-diff -Nura php-5.2.5/sapi/apache/mod_php5.c suhosin-patch-5.2.5-0.9.6.2/sapi/apache/mod_php5.c
---- php-5.2.5/sapi/apache/mod_php5.c 2007-08-06 14:54:57.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/sapi/apache/mod_php5.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/sapi/apache/mod_php5.c
+===================================================================
+--- php5-5.2.5.orig/sapi/apache/mod_php5.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/sapi/apache/mod_php5.c 2007-11-13 23:51:13.000000000 +0100
@@ -951,7 +951,11 @@
{
TSRMLS_FETCH();
@@ -2499,9 +2536,10 @@
}
}
#endif
-diff -Nura php-5.2.5/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.2.5-0.9.6.2/sapi/apache2filter/sapi_apache2.c
---- php-5.2.5/sapi/apache2filter/sapi_apache2.c 2007-01-01 10:36:12.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/sapi/apache2filter/sapi_apache2.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/sapi/apache2filter/sapi_apache2.c
+===================================================================
+--- php5-5.2.5.orig/sapi/apache2filter/sapi_apache2.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/sapi/apache2filter/sapi_apache2.c 2007-11-13 23:51:13.000000000 +0100
@@ -562,7 +562,11 @@
{
TSRMLS_FETCH();
@@ -2514,9 +2552,10 @@
}
}
-diff -Nura php-5.2.5/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.2.5-0.9.6.2/sapi/apache2handler/sapi_apache2.c
---- php-5.2.5/sapi/apache2handler/sapi_apache2.c 2007-06-28 19:23:07.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/sapi/apache2handler/sapi_apache2.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/sapi/apache2handler/sapi_apache2.c
+===================================================================
+--- php5-5.2.5.orig/sapi/apache2handler/sapi_apache2.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/sapi/apache2handler/sapi_apache2.c 2007-11-13 23:51:13.000000000 +0100
@@ -372,7 +372,11 @@
{
TSRMLS_FETCH();
@@ -2529,9 +2568,10 @@
}
}
-diff -Nura php-5.2.5/sapi/cgi/cgi_main.c suhosin-patch-5.2.5-0.9.6.2/sapi/cgi/cgi_main.c
---- php-5.2.5/sapi/cgi/cgi_main.c 2007-11-01 16:23:14.000000000 +0100
-+++ suhosin-patch-5.2.5-0.9.6.2/sapi/cgi/cgi_main.c 2007-11-10 01:40:43.000000000 +0100
+Index: php5-5.2.5/sapi/cgi/cgi_main.c
+===================================================================
+--- php5-5.2.5.orig/sapi/cgi/cgi_main.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/sapi/cgi/cgi_main.c 2007-11-13 23:51:13.000000000 +0100
@@ -1720,11 +1720,19 @@
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
@@ -2552,9 +2592,10 @@
php_request_shutdown((void *) 0);
exit_status = 0;
goto out;
-diff -Nura php-5.2.5/sapi/cli/php_cli.c suhosin-patch-5.2.5-0.9.6.2/sapi/cli/php_cli.c
---- php-5.2.5/sapi/cli/php_cli.c 2007-08-09 01:51:24.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/sapi/cli/php_cli.c 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/sapi/cli/php_cli.c
+===================================================================
+--- php5-5.2.5.orig/sapi/cli/php_cli.c 2007-11-13 23:51:08.000000000 +0100
++++ php5-5.2.5/sapi/cli/php_cli.c 2007-11-13 23:51:13.000000000 +0100
@@ -779,8 +779,14 @@
}
@@ -2572,9 +2613,10 @@
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
#elif ZEND_DEBUG
-diff -Nura php-5.2.5/win32/build/config.w32 suhosin-patch-5.2.5-0.9.6.2/win32/build/config.w32
---- php-5.2.5/win32/build/config.w32 2007-04-18 11:38:59.000000000 +0200
-+++ suhosin-patch-5.2.5-0.9.6.2/win32/build/config.w32 2007-11-10 01:38:46.000000000 +0100
+Index: php5-5.2.5/win32/build/config.w32
+===================================================================
+--- php5-5.2.5.orig/win32/build/config.w32 2007-11-13 23:51:09.000000000 +0100
++++ php5-5.2.5/win32/build/config.w32 2007-11-13 23:51:13.000000000 +0100
@@ -299,7 +299,7 @@
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 \
More information about the Pkg-php-commits
mailing list