packages: php/php-pdo_mysql-charsetphpini.patch, php/php.spec, php/suhosin....

glen glen at pld-linux.org
Fri Feb 26 18:28:20 CET 2010


Author: glen                         Date: Fri Feb 26 17:28:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to php-5.3.2RC3

---- Files affected:
packages/php:
   php-pdo_mysql-charsetphpini.patch (1.4 -> 1.5) , php.spec (1.845 -> 1.846) , suhosin.patch (1.7 -> 1.8) , php-bug-50458.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php/php-pdo_mysql-charsetphpini.patch
diff -u packages/php/php-pdo_mysql-charsetphpini.patch:1.4 packages/php/php-pdo_mysql-charsetphpini.patch:1.5
--- packages/php/php-pdo_mysql-charsetphpini.patch:1.4	Sat Feb 20 01:11:18 2010
+++ packages/php/php-pdo_mysql-charsetphpini.patch	Fri Feb 26 18:28:14 2010
@@ -26,56 +26,28 @@
  	if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
  						port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
  #else
---- php-5.3.1/ext/pdo_mysql/pdo_mysql.c	2010-02-20 02:06:52.781846977 +0200
-+++ php-5.3.1/ext/pdo_mysql/pdo_mysql.c	2010-02-20 02:06:52.781846977 +0200
-@@ -44,10 +44,13 @@
- # endif
- #endif
- 
-+#endif /* PDO_USE_MYSQLND */
-+
- 
- /* {{{ PHP_INI_BEGIN
- */
- PHP_INI_BEGIN()
-+#if PDO_USE_MYSQLND
- #ifndef PHP_WIN32
- 	STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateString, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals)
- #endif
-@@ -55,9 +58,10 @@
+--- php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c~	2010-02-04 11:37:38.000000000 +0200
++++ php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c	2010-02-26 19:09:36.784902389 +0200
+@@ -56,6 +56,7 @@
+ #if PDO_DBG_ENABLED
  	STD_PHP_INI_ENTRY("pdo_mysql.debug",	NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
  #endif
- 	STD_PHP_INI_ENTRY("pdo_mysql.cache_size",			"2000",	PHP_INI_SYSTEM,		OnUpdateLong,		cache_size,			zend_pdo_mysql_globals,		pdo_mysql_globals)
-+#endif
 +	STD_PHP_INI_ENTRY("pdo_mysql.connect_charset",	NULL,	PHP_INI_ALL,	OnUpdateString,	connect_charset,	zend_pdo_mysql_globals,	pdo_mysql_globals)
  PHP_INI_END()
  /* }}} */
--#endif
  
- /* true global environment */
- #ifdef PDO_USE_MYSQLND
-@@ -69,9 +73,7 @@
-  */
- static PHP_MINIT_FUNCTION(pdo_mysql)
+@@ -89,9 +90,7 @@
+ static PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
  {
+ 	php_pdo_unregister_driver(&pdo_mysql_driver);
 -#if PDO_USE_MYSQLND
- 	REGISTER_INI_ENTRIES();
+ 	UNREGISTER_INI_ENTRIES();
 -#endif
  
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY);
- 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (long)PDO_MYSQL_ATTR_LOCAL_INFILE);	
-@@ -101,8 +103,8 @@
- 	php_pdo_unregister_driver(&pdo_mysql_driver);
- #if PDO_USE_MYSQLND
- 	mysqlnd_palloc_free_cache(pdo_mysqlnd_zval_cache);
--	UNREGISTER_INI_ENTRIES();
- #endif
-+	UNREGISTER_INI_ENTRIES();
- 
  	return SUCCESS;
  }
-@@ -133,9 +135,7 @@
- #endif
+@@ -108,9 +107,7 @@
+ 
  	php_info_print_table_end();
  
 -#ifdef PDO_USE_MYSQLND
@@ -84,22 +56,21 @@
  }
  /* }}} */
  
-@@ -182,11 +182,14 @@
- }
+@@ -154,10 +151,13 @@
  /* }}} */
  
+ 
 +#endif /* PDO_USE_MYSQLND */
 +
- 
  /* {{{ PHP_GINIT_FUNCTION
   */
  static PHP_GINIT_FUNCTION(pdo_mysql)
  {
-+#if PDO_USE_MYSQLND
- 	pdo_mysql_globals->mysqlnd_thd_zval_cache = NULL; /* zval cache */
- 	pdo_mysql_globals->cache_size = 0;
++#ifdef PDO_USE_MYSQLND
  #ifndef PHP_WIN32
-@@ -196,10 +199,10 @@
+ 	pdo_mysql_globals->default_socket = NULL;
+ #endif
+@@ -165,10 +165,10 @@
  	pdo_mysql_globals->debug = NULL;	/* The actual string */
  	pdo_mysql_globals->dbg = NULL;	/* The DBG object*/
  #endif
@@ -112,7 +83,7 @@
  
  /* {{{ pdo_mysql_functions[] */
  const zend_function_entry pdo_mysql_functions[] = {
-@@ -242,15 +245,11 @@
+@@ -205,15 +205,11 @@
  #endif
  	PHP_MINFO(pdo_mysql),
  	"1.0.2",
@@ -128,28 +99,13 @@
  };
  /* }}} */
  
---- php-5.3.1/ext/pdo_mysql/php_pdo_mysql_int.h~	2009-10-14 16:51:25.000000000 +0300
-+++ php-5.3.1/ext/pdo_mysql/php_pdo_mysql_int.h	2010-02-20 02:04:48.918516081 +0200
-@@ -61,8 +61,8 @@
- #include "ext/mysqlnd/mysqlnd_debug.h"
- #endif
- 
--#ifdef PDO_USE_MYSQLND
- ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
-+#ifdef PDO_USE_MYSQLND
- 	MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
- 	long          cache_size;
- #ifndef PHP_WIN32
-@@ -72,10 +72,11 @@
+--- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~	2010-02-04 11:37:38.000000000 +0200
++++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h	2010-02-26 19:11:47.484055898 +0200
+@@ -69,6 +69,7 @@
  	char          *debug; /* The actual string */
  	MYSQLND_DEBUG *dbg;	/* The DBG object */
  #endif
-+#endif /* PDO_USE_MYSQLND */
 +	char          *connect_charset;
- ZEND_END_MODULE_GLOBALS(pdo_mysql)
- 
- ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);
--#endif
- 
- #ifdef ZTS
- #define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v)
+ #if defined(PHP_WIN32) && !PDO_DBG_ENABLED
+ 	/* dummy member so we get at least one member in the struct
+ 	 * and avoids build errors.

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.845 packages/php/php.spec:1.846
--- packages/php/php.spec:1.845	Mon Feb 22 10:07:00 2010
+++ packages/php/php.spec	Fri Feb 26 18:28:14 2010
@@ -93,7 +93,8 @@
 %undefine	with_filter
 %endif
 
-%define		rel		1.13
+%define		subver	RC3
+%define		rel		0.14
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -101,13 +102,14 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.3.1
+Version:	5.3.2
 Release:	%{rel}%{?with_type_hints:th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
-Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	63e97ad450f0f7259e785100b634c797
+#Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.php.net/johannes/%{name}-%{version}%{subver}.tar.bz2
+# Source0-md5:	7d9a716e5c18763572f214dcac216be0
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -127,8 +129,6 @@
 Patch8:		%{name}-config-file-scan-dir.patch
 Patch9:		%{name}-sh.patch
 Patch10:	%{name}-ini.patch
-# until 5.3.2 when this gets released
-Patch111:	%{name}-bug-50458.patch
 %if %{with type_hints}
 Patch12:	http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -1701,7 +1701,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{subver}
 # prep for suhosin patch
 %{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
 %patch0 -p1
@@ -1762,8 +1762,6 @@
 %patch51 -p1
 %patch52 -p1
 
-%patch111 -p4
-
 %if "%{pld_release}" != "ac"
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 %endif
@@ -2983,6 +2981,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.846  2010/02/26 17:28:14  glen
+- up to php-5.3.2RC3
+
 Revision 1.845  2010/02/22 09:07:00  glen
 - libtool patch not compatible with ac
 

================================================================
Index: packages/php/suhosin.patch
diff -u packages/php/suhosin.patch:1.7 packages/php/suhosin.patch:1.8
--- packages/php/suhosin.patch:1.7	Wed Nov 25 17:47:05 2009
+++ packages/php/suhosin.patch	Fri Feb 26 18:28:14 2010
@@ -1,4 +1,3 @@
-diff -Nura php-5.3.1RC1/Zend/Makefile.am suhosin-patch-5.3.1RC1-0.9.8/Zend/Makefile.am
 --- php-5.3.1RC1/Zend/Makefile.am	2009-03-18 11:18:10.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/Makefile.am	2009-09-27 19:04:06.000000000 +0200
 @@ -17,7 +17,7 @@
@@ -10,7 +9,6 @@
  
  libZend_la_LDFLAGS =
  libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-diff -Nura php-5.3.1RC1/Zend/Zend.dsp suhosin-patch-5.3.1RC1-0.9.8/Zend/Zend.dsp
 --- php-5.3.1RC1/Zend/Zend.dsp	2009-03-18 11:18:10.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/Zend.dsp	2009-09-27 19:04:06.000000000 +0200
 @@ -247,6 +247,14 @@
@@ -28,7 +26,6 @@
  SOURCE=.\zend_ts_hash.c
  # End Source File
  # Begin Source File
-diff -Nura php-5.3.1RC1/Zend/ZendTS.dsp suhosin-patch-5.3.1RC1-0.9.8/Zend/ZendTS.dsp
 --- php-5.3.1RC1/Zend/ZendTS.dsp	2008-07-14 11:49:03.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/ZendTS.dsp	2009-09-27 19:04:06.000000000 +0200
 @@ -277,6 +277,14 @@
@@ -46,7 +43,6 @@
  SOURCE=.\zend_ts_hash.c
  # End Source File
  # Begin Source File
-diff -Nura php-5.3.1RC1/Zend/zend.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.c
 --- php-5.3.1RC1/Zend/zend.c	2009-06-16 18:10:15.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.c	2009-09-27 19:04:06.000000000 +0200
 @@ -60,6 +60,10 @@
@@ -135,7 +131,6 @@
  ZEND_INI_BEGIN()
  	ZEND_INI_ENTRY("error_reporting",				NULL,		ZEND_INI_ALL,		OnUpdateErrorReporting)
  	STD_ZEND_INI_BOOLEAN("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled,      gc_enabled,     zend_gc_globals,        gc_globals)
-diff -Nura php-5.3.1RC1/Zend/zend.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.h
 --- php-5.3.1RC1/Zend/zend.h	2009-08-06 03:33:54.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.h	2009-09-27 19:04:06.000000000 +0200
 @@ -627,6 +627,9 @@
@@ -163,18 +158,8 @@
  #endif /* ZEND_H */
  
  /*
-diff -Nura php-5.3.1RC1/Zend/zend_alloc.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.c
 --- php-5.3.1RC1/Zend/zend_alloc.c	2009-09-03 16:33:11.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.c	2009-09-27 19:08:35.000000000 +0200
-@@ -18,7 +18,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id$ */
-+/* $Id$ */
- 
- #include "zend.h"
- #include "zend_alloc.h"
 @@ -32,6 +32,10 @@
  # include <unistd.h>
  #endif
@@ -904,7 +889,6 @@
  
  /*
   * Local variables:
-diff -Nura php-5.3.1RC1/Zend/zend_alloc.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.h
 --- php-5.3.1RC1/Zend/zend_alloc.h	2009-09-03 16:33:11.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.h	2009-09-27 19:04:06.000000000 +0200
 @@ -203,6 +203,8 @@
@@ -916,7 +900,6 @@
  
  ZEND_API zend_mm_heap *zend_mm_startup(void);
  ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC);
-diff -Nura php-5.3.1RC1/Zend/zend_alloc_canary.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc_canary.c
 --- php-5.3.1RC1/Zend/zend_alloc_canary.c	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc_canary.c	2009-09-27 19:08:51.000000000 +0200
 @@ -0,0 +1,2443 @@
@@ -3363,7 +3346,6 @@
 + * End:
 + */
 +
-diff -Nura php-5.3.1RC1/Zend/zend_canary.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_canary.c
 --- php-5.3.1RC1/Zend/zend_canary.c	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_canary.c	2009-09-27 19:04:06.000000000 +0200
 @@ -0,0 +1,64 @@
@@ -3431,7 +3413,6 @@
 + * vim600: sw=4 ts=4 fdm=marker
 + * vim<600: sw=4 ts=4
 + */
-diff -Nura php-5.3.1RC1/Zend/zend_compile.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.c
 --- php-5.3.1RC1/Zend/zend_compile.c	2009-09-03 16:33:11.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.c	2009-09-27 19:09:53.000000000 +0200
 @@ -73,6 +73,11 @@
@@ -3446,7 +3427,6 @@
  static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */
  {
  	char char_pos_buf[32];
-diff -Nura php-5.3.1RC1/Zend/zend_compile.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.h
 --- php-5.3.1RC1/Zend/zend_compile.h	2009-06-06 01:20:59.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.h	2009-09-27 19:04:06.000000000 +0200
 @@ -606,6 +606,11 @@
@@ -3461,7 +3441,6 @@
  int zendlex(znode *zendlval TSRMLS_DC);
  
  /* BEGIN: OPCODES */
-diff -Nura php-5.3.1RC1/Zend/zend_constants.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_constants.c
 --- php-5.3.1RC1/Zend/zend_constants.c	2009-01-12 22:54:37.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_constants.c	2009-09-27 19:04:06.000000000 +0200
 @@ -113,6 +113,76 @@
@@ -3541,7 +3520,6 @@
  	/* true/false constants */
  	{
  		zend_constant c;
-diff -Nura php-5.3.1RC1/Zend/zend_errors.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_errors.h
 --- php-5.3.1RC1/Zend/zend_errors.h	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_errors.h	2009-09-27 19:04:06.000000000 +0200
 @@ -41,6 +41,20 @@
@@ -3565,7 +3543,6 @@
  #endif /* ZEND_ERRORS_H */
  
  /*
-diff -Nura php-5.3.1RC1/Zend/zend_hash.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_hash.c
 --- php-5.3.1RC1/Zend/zend_hash.c	2009-06-07 21:28:15.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_hash.c	2009-09-27 19:10:51.000000000 +0200
 @@ -20,6 +20,7 @@
@@ -3832,7 +3809,6 @@
  	if (ht->pDestructor) {
  		ht->pDestructor(p->pData);
  	}
-diff -Nura php-5.3.1RC1/Zend/zend_llist.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_llist.c
 --- php-5.3.1RC1/Zend/zend_llist.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_llist.c	2009-09-27 19:11:28.000000000 +0200
 @@ -23,6 +23,186 @@
@@ -4054,7 +4030,6 @@
  	if ((old_tail = l->tail)) {
  		if (old_tail->prev) {
  			old_tail->prev->next = NULL;
-diff -Nura php-5.3.1RC1/Zend/zend_operators.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_operators.c
 --- php-5.3.1RC1/Zend/zend_operators.c	2009-06-04 20:20:45.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_operators.c	2009-09-27 19:04:06.000000000 +0200
 @@ -152,9 +152,14 @@
@@ -4144,7 +4119,6 @@
  	switch (type) {
  		case IS_ARRAY:
  			ALLOC_HASHTABLE(Z_ARRVAL_P(op));
-diff -Nura php-5.3.1RC1/Zend/zend_variables.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_variables.c
 --- php-5.3.1RC1/Zend/zend_variables.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_variables.c	2009-09-27 19:04:06.000000000 +0200
 @@ -34,6 +34,9 @@
@@ -4167,7 +4141,6 @@
  			break;
  		case IS_ARRAY:
  		case IS_CONSTANT_ARRAY:
-diff -Nura php-5.3.1RC1/configure suhosin-patch-5.3.1RC1-0.9.8/configure
 --- php-5.3.1RC1/configure	2009-09-04 01:11:27.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/configure	2009-09-27 19:04:06.000000000 +0200
 @@ -17600,6 +17600,9 @@
@@ -4198,7 +4171,6 @@
    
        IFS=.
        set $ac_src
-diff -Nura php-5.3.1RC1/configure.in suhosin-patch-5.3.1RC1-0.9.8/configure.in
 --- php-5.3.1RC1/configure.in	2009-09-03 23:30:56.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/configure.in	2009-09-27 19:04:06.000000000 +0200
 @@ -304,6 +304,7 @@
@@ -4227,7 +4199,6 @@
  
  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 zend_default_classes.c)
-diff -Nura php-5.3.1RC1/ext/standard/dl.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/dl.c
 --- php-5.3.1RC1/ext/standard/dl.c	2009-08-06 03:33:54.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/dl.c	2009-09-27 19:04:06.000000000 +0200
 @@ -244,6 +244,23 @@
@@ -4254,7 +4225,6 @@
  	return SUCCESS;
  }
  /* }}} */
-diff -Nura php-5.3.1RC1/ext/standard/info.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/info.c
 --- php-5.3.1RC1/ext/standard/info.c	2009-01-17 03:05:13.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/info.c	2009-09-27 19:04:06.000000000 +0200
 @@ -842,6 +842,33 @@
@@ -4291,7 +4261,6 @@
  		/* Zend Engine */
  		php_info_print_box_start(0);
  		if (expose_php && !sapi_module.phpinfo_as_text) {
-diff -Nura php-5.3.1RC1/ext/standard/syslog.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/syslog.c
 --- php-5.3.1RC1/ext/standard/syslog.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/syslog.c	2009-09-27 19:04:06.000000000 +0200
 @@ -42,6 +42,7 @@
@@ -4310,7 +4279,6 @@
  	BG(syslog_device)=NULL;
  
  	return SUCCESS;
-diff -Nura php-5.3.1RC1/main/fopen_wrappers.c suhosin-patch-5.3.1RC1-0.9.8/main/fopen_wrappers.c
 --- php-5.3.1RC1/main/fopen_wrappers.c	2009-07-31 23:09:45.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/fopen_wrappers.c	2009-09-27 19:32:39.000000000 +0200
 @@ -85,13 +85,8 @@
@@ -4328,7 +4296,6 @@
  
  	if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
  		/* We're in a PHP_INI_SYSTEM context, no restrictions */
-diff -Nura php-5.3.1RC1/main/main.c suhosin-patch-5.3.1RC1-0.9.8/main/main.c
 --- php-5.3.1RC1/main/main.c	2009-07-29 02:17:10.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/main.c	2009-09-27 19:04:06.000000000 +0200
 @@ -90,6 +90,9 @@
@@ -4385,7 +4352,6 @@
  	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);
  
-diff -Nura php-5.3.1RC1/main/php.h suhosin-patch-5.3.1RC1-0.9.8/main/php.h
 --- php-5.3.1RC1/main/php.h	2009-06-26 17:44:19.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/php.h	2009-09-27 19:04:06.000000000 +0200
 @@ -450,6 +450,10 @@
@@ -4399,7 +4365,6 @@
  #endif
  
  /*
-diff -Nura php-5.3.1RC1/main/php_config.h.in suhosin-patch-5.3.1RC1-0.9.8/main/php_config.h.in
 --- php-5.3.1RC1/main/php_config.h.in	2009-09-04 01:11:30.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/php_config.h.in	2009-09-27 19:04:06.000000000 +0200
 @@ -833,6 +833,9 @@
@@ -4412,7 +4377,6 @@
  /* Whether you have AOLserver */
  #undef HAVE_AOLSERVER
  
-diff -Nura php-5.3.1RC1/main/php_logos.c suhosin-patch-5.3.1RC1-0.9.8/main/php_logos.c
 --- php-5.3.1RC1/main/php_logos.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/php_logos.c	2009-09-27 19:04:06.000000000 +0200
 @@ -50,6 +50,10 @@
@@ -4436,7 +4400,6 @@
  
  	return SUCCESS;
  }
-diff -Nura php-5.3.1RC1/main/snprintf.c suhosin-patch-5.3.1RC1-0.9.8/main/snprintf.c
 --- php-5.3.1RC1/main/snprintf.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/snprintf.c	2009-09-27 19:04:06.000000000 +0200
 @@ -1091,7 +1091,11 @@
@@ -4451,7 +4414,6 @@
  					goto skip_output;
  
  					/*
-diff -Nura php-5.3.1RC1/main/spprintf.c suhosin-patch-5.3.1RC1-0.9.8/main/spprintf.c
 --- php-5.3.1RC1/main/spprintf.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/spprintf.c	2009-09-27 19:04:06.000000000 +0200
 @@ -698,7 +698,11 @@
@@ -4466,7 +4428,6 @@
  					goto skip_output;
  
  					/*
-diff -Nura php-5.3.1RC1/main/suhosin_globals.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_globals.h
 --- php-5.3.1RC1/main/suhosin_globals.h	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_globals.h	2009-09-27 19:04:06.000000000 +0200
 @@ -0,0 +1,61 @@
@@ -4531,7 +4492,6 @@
 + * c-basic-offset: 4
 + * End:
 + */
-diff -Nura php-5.3.1RC1/main/suhosin_logo.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_logo.h
 --- php-5.3.1RC1/main/suhosin_logo.h	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_logo.h	2009-09-27 19:04:06.000000000 +0200
 @@ -0,0 +1,178 @@
@@ -4713,7 +4673,6 @@
 +	"\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.3.1RC1/main/suhosin_patch.c suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.c
 --- php-5.3.1RC1/main/suhosin_patch.c	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.c	2009-09-27 19:44:00.000000000 +0200
 @@ -0,0 +1,458 @@
@@ -5175,7 +5134,6 @@
 + * vim600: sw=4 ts=4 fdm=marker
 + * vim<600: sw=4 ts=4
 + */
-diff -Nura php-5.3.1RC1/main/suhosin_patch.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.h
 --- php-5.3.1RC1/main/suhosin_patch.h	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.h	2009-09-27 19:40:08.000000000 +0200
 @@ -0,0 +1,63 @@
@@ -5242,7 +5200,6 @@
 + * c-basic-offset: 4
 + * End:
 + */
-diff -Nura php-5.3.1RC1/main/suhosin_patch.m4 suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.m4
 --- php-5.3.1RC1/main/suhosin_patch.m4	1970-01-01 01:00:00.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.m4	2009-09-27 19:04:06.000000000 +0200
 @@ -0,0 +1,8 @@
@@ -5254,7 +5211,6 @@
 +
 +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
 +
-diff -Nura php-5.3.1RC1/sapi/apache/mod_php5.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache/mod_php5.c
 --- php-5.3.1RC1/sapi/apache/mod_php5.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache/mod_php5.c	2009-09-27 19:04:06.000000000 +0200
 @@ -967,7 +967,11 @@
@@ -5269,7 +5225,6 @@
  		}
  	}
  #endif
-diff -Nura php-5.3.1RC1/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2filter/sapi_apache2.c
 --- php-5.3.1RC1/sapi/apache2filter/sapi_apache2.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2filter/sapi_apache2.c	2009-09-27 19:04:06.000000000 +0200
 @@ -581,7 +581,11 @@
@@ -5284,7 +5239,6 @@
  	}
  }
  
-diff -Nura php-5.3.1RC1/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2handler/sapi_apache2.c
 --- php-5.3.1RC1/sapi/apache2handler/sapi_apache2.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2handler/sapi_apache2.c	2009-09-27 19:04:06.000000000 +0200
 @@ -386,7 +386,11 @@
@@ -5299,7 +5253,6 @@
  	}
  }
  
-diff -Nura php-5.3.1RC1/sapi/apache_hooks/mod_php5.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache_hooks/mod_php5.c
 --- php-5.3.1RC1/sapi/apache_hooks/mod_php5.c	2008-12-31 12:15:49.000000000 +0100
 +++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache_hooks/mod_php5.c	2009-09-27 19:04:06.000000000 +0200
 @@ -1256,7 +1256,11 @@
@@ -5314,46 +5267,43 @@
  		}
  	}
  #endif
-diff -Nura php-5.3.1RC1/sapi/cgi/cgi_main.c suhosin-patch-5.3.1RC1-0.9.8/sapi/cgi/cgi_main.c
---- php-5.3.1RC1/sapi/cgi/cgi_main.c	2009-06-22 16:10:40.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/cgi/cgi_main.c	2009-09-27 19:04:06.000000000 +0200
-@@ -1907,11 +1907,19 @@
+--- php-5.3.2RC3/sapi/cgi/cgi_main.c~	2010-02-26 19:12:38.000000000 +0200
++++ php-5.3.2RC3/sapi/cgi/cgi_main.c	2010-02-26 19:20:35.820461203 +0200
+@@ -1939,11 +1939,19 @@
  								SG(headers_sent) = 1;
  								SG(request_info).no_headers = 1;
  							}
 +#if SUHOSIN_PATCH
 +#if ZEND_DEBUG
-+							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#else
-+							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_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-2009 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-2010 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-2009 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-2010 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;
-diff -Nura php-5.3.1RC1/sapi/cli/php_cli.c suhosin-patch-5.3.1RC1-0.9.8/sapi/cli/php_cli.c
---- php-5.3.1RC1/sapi/cli/php_cli.c	2009-09-02 22:02:17.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/cli/php_cli.c	2009-09-27 19:04:06.000000000 +0200
-@@ -829,7 +829,11 @@
+--- php-5.3.2RC3/sapi/cli/php_cli.c~	2010-01-03 11:23:27.000000000 +0200
++++ php-5.3.2RC3/sapi/cli/php_cli.c	2010-02-26 19:23:14.547384213 +0200
+@@ -831,7 +831,11 @@
  				}
  
  				request_started = 1;
--				php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
+-				php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2010 The PHP Group\n%s",
 +				php_printf("PHP %s "
 +#if SUHOSIN_PATCH
 +                                        "with Suhosin-Patch "
 +#endif
-+				        "(%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
++				        "(%s) (built: %s %s) %s\nCopyright (c) 1997-2010 The PHP Group\n%s",
  					PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
  #if ZEND_DEBUG && defined(HAVE_GCOV)
  					"(DEBUG GCOV)",
-diff -Nura php-5.3.1RC1/sapi/litespeed/lsapi_main.c suhosin-patch-5.3.1RC1-0.9.8/sapi/litespeed/lsapi_main.c
 --- php-5.3.1RC1/sapi/litespeed/lsapi_main.c	2008-08-27 00:05:17.000000000 +0200
 +++ suhosin-patch-5.3.1RC1-0.9.8/sapi/litespeed/lsapi_main.c	2009-09-27 19:04:06.000000000 +0200
 @@ -545,11 +545,19 @@
@@ -5376,22 +5326,20 @@
  #ifdef PHP_OUTPUT_NEWAPI
                      php_output_end_all(TSRMLS_C);
  #else
-diff -Nura php-5.3.1RC1/sapi/milter/php_milter.c suhosin-patch-5.3.1RC1-0.9.8/sapi/milter/php_milter.c
---- php-5.3.1RC1/sapi/milter/php_milter.c	2008-12-31 12:15:49.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-pdo_mysql-charsetphpini.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.845&r2=1.846&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/suhosin.patch?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list