[packages/php-suhosin] up to 0.9.35, drops PHP<5.4 support. for PHP 5.3, see PHP_5_3 branch

glen glen at pld-linux.org
Mon Apr 28 14:09:57 CEST 2014


commit f1358f7ab2750c8afeb06252c79c4e7aa9ceaf31
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 28 15:08:59 2014 +0300

    up to 0.9.35, drops PHP<5.4 support. for PHP 5.3, see PHP_5_3 branch

 bug-42.patch     | 18 ++++++++++++++++++
 php-suhosin.spec | 11 ++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/php-suhosin.spec b/php-suhosin.spec
index 05bdb4c..2b6e3d5 100644
--- a/php-suhosin.spec
+++ b/php-suhosin.spec
@@ -3,16 +3,16 @@
 Summary:	Advanced protection system for PHP installations
 Summary(pl.UTF-8):	Zaawansowany system zabezpieczeń dla instalacji PHP
 Name:		%{php_name}-%{modname}
-# NOTE: 0.9.35 drops support for PHP < 5.4, so do not upgrade until pld th main php is still 5.3
-# NOTE: can't find tarball for 0.9.34
-Version:	0.9.33
+# for PHP 5.3, see PHP_5_3 branch
+Version:	0.9.35
 Release:	1
 License:	PHP 3.01
 Group:		Development/Languages/PHP
 Source0:	http://download.suhosin.org/%{modname}-%{version}.tgz
-# Source0-md5:	0ce498a02a8281e4274ea8e390c2b487
+# Source0-md5:	51bd404520da650e2da4866898c0ae8c
+Patch0:		bug-42.patch
 URL:		http://www.hardened-php.net/suhosin/
-BuildRequires:	%{php_name}-devel >= 3:5.0.0
+BuildRequires:	%{php_name}-devel >= 3:5.4
 BuildRequires:	rpmbuild(macros) >= 1.650
 %{?requires_php_extension}
 Requires:	php(core) >= 5.0.4
@@ -40,6 +40,7 @@ ZendOptimizer.
 
 %prep
 %setup -q -n suhosin-%{version}
+%patch0 -p1
 
 %build
 phpize
diff --git a/bug-42.patch b/bug-42.patch
new file mode 100644
index 0000000..c86c304
--- /dev/null
+++ b/bug-42.patch
@@ -0,0 +1,18 @@
+
+https://github.com/stefanesser/suhosin/issues/42
+
+--- suhosin-0.9.35/php_suhosin.h~	2014-02-25 00:39:47.000000000 +0200
++++ suhosin-0.9.35/php_suhosin.h	2014-04-28 15:07:18.035583796 +0300
+@@ -286,10 +286,11 @@
+ #define S_MAIL				(1<<7L)
+ #define S_SESSION			(1<<8L)
+ #define S_INTERNAL			(1<<29L)
+-#define S_GETCALLER         (1<<30L)
+ #define S_ALL (S_MEMORY | S_VARS | S_INCLUDE | S_FILES | S_MAIL | S_SESSION | S_MISC | S_SQL | S_EXECUTOR)
+ #endif
+ 
++#define S_GETCALLER         (1<<30L)
++
+ #define SUHOSIN_NORMAL	0
+ #define SUHOSIN_EVAL	1
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-suhosin.git/commitdiff/f1358f7ab2750c8afeb06252c79c4e7aa9ceaf31



More information about the pld-cvs-commit mailing list