packages: php/php.spec, php/suhosin.patch - add suhosin patch

[glen]

Author: glen                         Date: Wed Nov 25 16:47:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add suhosin patch

---- Files affected:
packages/php:
   php.spec (1.819 -> 1.820) , suhosin.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.819 packages/php/php.spec:1.820
--- packages/php/php.spec:1.819	Mon Nov 23 08:45:07 2009
+++ packages/php/php.spec	Wed Nov 25 17:47:04 2009
@@ -56,7 +56,8 @@
 %bcond_without	xmlrpc		# without XML-RPC extension module
 %bcond_without	apache1		# disable building apache 1.3.x module
 %bcond_without	apache2		# disable building apache 2.x module
-%bcond_without	zts		# disable experimental-zts
+%bcond_without	zts		# disable Zend Thread Safety
+%bcond_without	suhosin		# with suhosin patch
 %bcond_with	tests		# default off; test process very often hangs on buildersl; perform "make test"
 %bcond_with	type_hints	# experimental support for strict typing/casting
 
@@ -126,6 +127,7 @@
 Patch32:	%{name}-m4-divert.patch
 Patch38:	%{name}-tds.patch
 Patch43:	%{name}-use-prog_sendmail.patch
+Patch47:	suhosin.patch
 %if %{with type_hints}
 Patch50:	http://ilia.ws/patch/type_hint_53_v2.txt
 %endif
@@ -1586,6 +1588,9 @@
 %prep
 %setup -q
 
+# for suhosin patch
+%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
+
 %if %{with type_hints}
 %patch50 -p0
 %endif
@@ -1627,6 +1632,10 @@
 
 %patch43 -p1
 
+%if %{with suhosin}
+%patch47 -p1
+%endif
+
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
 
@@ -2728,6 +2737,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.820  2009/11/25 16:47:04  glen
+- add suhosin patch
+
 Revision 1.819  2009/11/23 07:45:07  arekm
 - fix config installation
 

================================================================
Index: packages/php/suhosin.patch
diff -u packages/php/suhosin.patch:1.6 packages/php/suhosin.patch:1.7
--- packages/php/suhosin.patch:1.6	Wed Nov 25 10:06:44 2009
+++ packages/php/suhosin.patch	Wed Nov 25 17:47:05 2009
@@ -4426,17 +4426,16 @@
  int php_init_info_logos(void)
  {
  	if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) 
-@@ -58,7 +62,9 @@
- 	php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
+@@ -63,6 +63,9 @@
  	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));
--
+ 	php_register_info_logo(PLD_LOGO_GUID    , "image/png", pld_logo    , sizeof(pld_logo));
 +#if SUHOSIN_PATCH
-+	php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo   , sizeof(suhosin_logo));
++ 	php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo   , sizeof(suhosin_logo));
 +#endif
+ 
  	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.819&r2=1.820&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/suhosin.patch?r1=1.6&r2=1.7&f=u