From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 2 Jun 2015 10:55:37 +0000 (+0000)
Subject: - updated to 5.4.41
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=d8797295764fff2bbb81051992f6862906ecd25d;p=packages%2Fphp.git

- updated to 5.4.41
---

diff --git a/php.spec b/php.spec
index 70e4a5e..200dc0f 100644
--- a/php.spec
+++ b/php.spec
@@ -135,13 +135,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.4.39
+Version:	5.4.41
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	017f7ba7484e738c88bf19eec4369d78
+# Source0-md5:	e00817b920cfc6dde2d01d7a74c654c0
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
diff --git a/suhosin.patch b/suhosin.patch
index 1fb7335..b784bbc 100644
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -876,7 +876,7 @@ the following modifications have been made:
  			heap->cache[index] = best_fit->prev_free_block;
  			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
 -			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
--	
+-
 +			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);                        	
 +#if SUHOSIN_PATCH
 +                        SUHOSIN_MM_SET_CANARIES(best_fit);