- make suhosin patch to apply

Changed files:
    php.spec -> 1.794
    suhosin.patch -> 1.2

diff --git a/php.spec b/php.spec
index 70c38321efdffba5fcaca5ddf3877b6a3279b235..a0d3ddc9ededa21e03c28f0acf33a8433c91a855 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1612,6 +1612,9 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
 %setup -q
+# for suhosin patch
+%{__sed} -i -e 's,\r$,,' Zend/Zend.dsp Zend/ZendTS.dsp
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

diff --git a/suhosin.patch b/suhosin.patch
index d644413fbfae26442fa60c4017f785cc38d47067..4a3beb21cd57909db0f7a1b35b5d4e8b77e648ed 100644 (file)
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -1801,10 +1801,10 @@ diff -Nura php-5.2.9/main/php_logos.c suhosin-patch-5.2.9-0.9.7/main/php_logos.c
  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