From 59a3c91e3ceb1834bdc857a1588a87973efd444f Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Fri, 4 Mar 2016 17:26:24 +0100
Subject: license clarification and amendment

---
 LICENSE | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index cad39fc..92e7dc7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,7 +9,10 @@ and not otherwise stated within the source code.
 Note:
   * Some parts of the PHP License are not applicable to non-PHP code. Whenever
     this is the case, a common sense interpretation of the clause in question
-    should be applied. One interpretation of such a license is included below.
+    should be applied. One interpretation of the PHP license is included below.
+    The PHP license is heavily based on the BSD license. If in doubt and the
+    PHP license is not otherwise applicable to Suhosin7, a New BSD License as
+    included below should be applied instead.
 
   * The Mersenne Twister random number generator included in Suhosin7
     comes with its own license. See execute_rnd.c for details.
@@ -73,9 +76,46 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -------------------------------------------------------------------- 
 
+
+
+--------------------------------------------------------------------
+New BSD License
+  to be applied to Suhosin7 is cases where the PHP license is
+  not applicable
 -------------------------------------------------------------------- 
+Copyright (c) 2006-2007 The Hardened-PHP Project
+Copyright (c) 2007-2016 SektionEins GmbH
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of the SektionEins GmbH nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS 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 <COPYRIGHT HOLDER> 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.
+--------------------------------------------------------------------
+
+
+
+
+--------------------------------------------------------------------
                   The PHP License, version 3.01
-            - common sense interpretation for Suhosin7 -
+      - non-binding common sense interpretation for Suhosin7 -
 Original PHP code copyright notice:
   Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
 Suhosin7 copyright notice for PHP code modifications and original
-- 
cgit v1.3