diff options
| -rw-r--r-- | 3_01.txt | 68 | ||||
| -rw-r--r-- | REFLECTION-PHP7 | 8 | ||||
| -rw-r--r-- | php-suhosin-php7.spec | 27 |
3 files changed, 22 insertions, 81 deletions
diff --git a/3_01.txt b/3_01.txt deleted file mode 100644 index 6059c80..0000000 --- a/3_01.txt +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2014 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - <http://www.php.net/software/>". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see <http://www.php.net>. - -PHP includes the Zend Engine, freely available at -<http://www.zend.com>. diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 index 8e07747..283392d 100644 --- a/REFLECTION-PHP7 +++ b/REFLECTION-PHP7 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #77 suhosin7 version 0.10.0dev ] { +Extension [ <persistent> extension #89 suhosin7 version 0.10.0dev ] { - INI { Entry [ suhosin.perdir <SYSTEM> ] @@ -49,6 +49,9 @@ Extension [ <persistent> extension #77 suhosin7 version 0.10.0dev ] { Entry [ suhosin.executor.disable_emodifier <PERDIR,SYSTEM> ] Current = '0' } + Entry [ suhosin.executor.allow_symlink <PERDIR,SYSTEM> ] + Current = '0' + } Entry [ suhosin.executor.max_depth <PERDIR,SYSTEM> ] Current = '750' } @@ -172,6 +175,9 @@ Extension [ <persistent> extension #77 suhosin7 version 0.10.0dev ] { Entry [ suhosin.post.disallow_ws <PERDIR,SYSTEM> ] Current = '0' } + Entry [ suhosin.session.cryptkey <ALL> ] + Current = '' + } Entry [ suhosin.cookie.encrypt <PERDIR,SYSTEM> ] Current = '0' } diff --git a/php-suhosin-php7.spec b/php-suhosin-php7.spec index 078b094..295e7e4 100644 --- a/php-suhosin-php7.spec +++ b/php-suhosin-php7.spec @@ -12,35 +12,35 @@ %global sub_prefix %{scl_prefix} %endif -%global gh_commit 6eb6633aa1816fc6774eaa8a77ae1d6e791760f3 +%global gh_commit 5c0b5f357fb9dc38e21513d4d19ea6925e81a3f4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sektioneins %global gh_project suhosin7 -%global gh_date 20160303 +%global gh_date 20160304 %{?scl: %scl_package php-suhosin} %global ext_name suhosin7 # https://github.com/sektioneins/suhosin7/issues/4 -%global with_zts 0 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{ext_name}.ini Name: %{?sub_prefix}php-suhosin Version: 0.10.0 %if 0%{?gh_date} -Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz %else Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: http://download.suhosin.org/suhosin-%{version}.tar.gz %endif -# From headers, see https://github.com/sektioneins/suhosin7/issues/1 -Source1: http://php.net/license/3_01.txt Summary: Suhosin is an advanced protection system for PHP installations Group: Development/Languages -License: PHP +# The Mersenne Twister random number generator is BSD +# Suhosin is PHP variant, which is a BSD variant +License: BSD URL: http://www.hardened-php.net/suhosin/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -98,8 +98,6 @@ mv %{ext_name}-%{version} NTS %endif cd NTS -cp %{SOURCE1} LICENSE - # Check extension version ver=$(sed -n '/SUHOSIN7_EXT_VERSION/{s/.* "//;s/".*$//;p}' php_suhosin7.h) if test "$ver" != "%{version}%{?gh_date:dev}"; then @@ -123,8 +121,8 @@ EOF %build -# https://github.com/sektioneins/suhosin7/issues/3 -export CFLAGS="$RPM_OPT_FLAGS -std=c99" +# https://github.com/sektioneins/suhosin7/pull/7 +sed -e s/c11/c99/ -i ?TS/config.m4 cd NTS %{_bindir}/phpize @@ -163,7 +161,7 @@ install -Dpm 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} : Minimal load test for NTS extension %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{ext_name}.so \ - --modules + --modules | grep suhosin7 %endif : Upstream test suite for NTS extension @@ -206,6 +204,11 @@ EOF %changelog +* Fri Mar 4 2016 Remi Collet <remi@fedoraproject.org> - 0.10.0-0.2.20160304git5c0b5f3 +- refresh +- open https://github.com/sektioneins/suhosin7/pull/7 - gcc < 4.8 +- enable ZTS build + * Thu Mar 3 2016 Remi Collet <remi@fedoraproject.org> - 0.10.0-0.1.20160303git6eb6633 - update to 0.10.0 for php 7 - open https://github.com/sektioneins/suhosin7/issues/1 - License |