From 02d06c8caa37bef453a81b7d7e10ba4fa42e3a0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 19 May 2009 16:28:27 +0000 Subject: [PATCH] - make suhosin patch to apply Changed files: php.spec -> 1.794 suhosin.patch -> 1.2 --- php.spec | 3 +++ suhosin.patch | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/php.spec b/php.spec index 70c3832..a0d3ddc 100644 --- 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 d644413..4a3beb2 100644 --- 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 -- 2.44.0