packages: php/php.spec, php/suhosin.patch - make suhosin patch to apply

[glen]

Author: glen                         Date: Tue May 19 16:28:32 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make suhosin patch to apply

---- Files affected:
packages/php:
   php.spec (1.793 -> 1.794) , suhosin.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.793 packages/php/php.spec:1.794
--- packages/php/php.spec:1.793	Tue May 19 13:15:48 2009
+++ packages/php/php.spec	Tue May 19 18:28:27 2009
@@ -1613,6 +1613,9 @@
 
 %prep
 %setup -q
+# for suhosin patch
+%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -2893,6 +2896,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.794  2009/05/19 16:28:27  glen
+- make suhosin patch to apply
+
 Revision 1.793  2009/05/19 11:15:48  glen
 - add suhosin patch (bcond off for now)
 

================================================================
Index: packages/php/suhosin.patch
diff -u packages/php/suhosin.patch:1.1 packages/php/suhosin.patch:1.2
--- packages/php/suhosin.patch:1.1	Tue May 19 13:15:37 2009
+++ packages/php/suhosin.patch	Tue May 19 18:28:27 2009
@@ -1801,10 +1801,10 @@
  int php_init_info_logos(void)
  {
  	if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) 
-@@ -58,6 +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));
 +#endif	
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.793&r2=1.794&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/suhosin.patch?r1=1.1&r2=1.2&f=u