php-suhosin: 0.9.36

3 files changed, 13 insertions, 78 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 b/REFLECTION
index 7986af9..edbe860 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #16 suhosin version 0.9.35 ] {
+Extension [ <persistent> extension #16 suhosin version 0.9.36 ] {
 
   - INI {
     Entry [ suhosin.log.syslog <PERDIR,SYSTEM> ]
@@ -292,6 +292,12 @@ Extension [ <persistent> extension #16 suhosin version 0.9.35 ] {
     Entry [ suhosin.server.strip <SYSTEM> ]
       Current = '1'
     }
+    Entry [ suhosin.rand.seedingkey <PERDIR,SYSTEM> ]
+      Current = ''
+    }
+    Entry [ suhosin.rand.reseed_every_request <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
     Entry [ suhosin.srand.ignore <PERDIR,SYSTEM> ]
       Current = '1'
     }
diff --git a/php-suhosin.spec b/php-suhosin.spec
index 54df0b7..9bcb597 100644
--- a/php-suhosin.spec
+++ b/php-suhosin.spec
@@ -22,8 +22,8 @@
 %endif
 
 Name:           %{?scl_prefix}php-suhosin
-Version:        0.9.35
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        0.9.36
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Summary:        Suhosin is an advanced protection system for PHP installations
 
 Group:          Development/Languages
@@ -31,10 +31,6 @@ License:        PHP
 URL:            http://www.hardened-php.net/suhosin/
 Source0:        http://download.suhosin.org/suhosin-%{version}.tgz
 
-# https://github.com/stefanesser/suhosin/issues/38
-# URL from sources headers
-Source1:        http://www.php.net/license/3_01.txt
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel
 
@@ -71,8 +67,6 @@ and the PHP core.
 %setup -q -c
 mv %{ext_name}-%{version} NTS
 
-cp %{SOURCE1} LICENSE
-
 # Check extension version
 ver=$(sed -n '/SUHOSIN_EXT_VERSION/{s/.* "//;s/".*$//;p}' NTS/php_suhosin.h)
 if test "$ver" != "%{version}%{?prever}"; then
@@ -155,7 +149,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NTS/{Changelog,CREDITS}
+%doc NTS/{Changelog,CREDITS,LICENSE}
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{ext_name}.so
@@ -167,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 11 2014 Remi Collet <remi@fedoraproject.org> - 0.9.36-1
+- update to 0.9.35
+
 * Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 0.9.35-2
 - add numerical prefix to extension configuration file (php 5.6)