20232660 PHP suhosin extension needs a little license work s11u2-sru
authorCraig Mohrman <craig.mohrman@oracle.com>
Fri, 09 Jan 2015 13:49:31 -0800
branchs11u2-sru
changeset 3615 65fee2788831
parent 3614 70b5255e2745
child 3617 6ac3649b964f
20232660 PHP suhosin extension needs a little license work
components/php-5_3/php-suhosin.license
--- a/components/php-5_3/php-suhosin.license	Fri Jan 09 13:47:34 2015 -0800
+++ b/components/php-5_3/php-suhosin.license	Fri Jan 09 13:49:31 2015 -0800
@@ -1,234 +1,91 @@
-/*
- * -------------------------------------------------------------------- 
- *                   The PHP License, version 3.01
- * Copyright (c) 1999 - 2010 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 [email protected]
- *   
- *   4. Products derived from this software may not be called "PHP", nor
- *      may "PHP" appear in their name, without prior written permission
- *      from [email protected]  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 [email protected]
- * 
- * 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>.
- */
+This product includes PHP software, freely available from <http://www.php.net/software/> The Zend Engine is freely available at http://www.zend.com
 
-/*
- *  +----------------------------------------------------------------------+
- *  | PHP Version 4                                                        |
- *  +----------------------------------------------------------------------+
- *  | Copyright (c) 1997-2003 The PHP Group                                |
- *  +----------------------------------------------------------------------+
- *  | This source file is subject to version 2.02 of the PHP license,      |
- *  | that is bundled with this package in the file LICENSE, and is        |
- *  | available at through the world-wide-web at                           |
- *  | http://www.php.net/license/2_02.txt.                                 |
- *  | If you did not receive a copy of the PHP license and are unable to   |
- *  | obtain it through the world-wide-web, please send a note to          |
- *  | [email protected] so we can mail you a copy immediately.               |
- *  +----------------------------------------------------------------------+
- *  | Author: Marcin Gibula <[email protected]>                                  |
- *  +----------------------------------------------------------------------+
- *
- *
- */
-
-/*
- *  +----------------------------------------------------------------------+
- *  | PHP Version 5                                                        |
- *  +----------------------------------------------------------------------+
- *  | Copyright (c) 1997-2005 The PHP Group                                |
- *  +----------------------------------------------------------------------+
- *  | This source file is subject to version 3.0 of the PHP license,       |
- *  | that is bundled with this package in the file LICENSE, and is        |
- *  | available through the world-wide-web at the following url:           |
- *  | http://www.php.net/license/3_0.txt.                                  |
- *  | If you did not receive a copy of the PHP license and are unable to   |
- *  | obtain it through the world-wide-web, please send a note to          |
- *  | [email protected] so we can mail you a copy immediately.               |
- *  +----------------------------------------------------------------------+
- *  | Author: Wez Furlong <[email protected]>                                 |
- *  +----------------------------------------------------------------------+
-*/
-
-For Suhosin extension (covered under multiple licenses):
-/*
- *  +----------------------------------------------------------------------+
- *  | Suhosin Version 1                                                    |
- *  +----------------------------------------------------------------------+
- *  | Copyright (c) 2006 The Hardened-PHP Project                          |
- *  | Copyright (c) 2007 SektionEins GmbH                                  |
- *  +----------------------------------------------------------------------+
- *  | This source file is subject to version 3.01 of the PHP license,      |
- *  | that is bundled with this package in the file LICENSE, and is        |
- *  | available through the world-wide-web at the following url:           |
- *  | http://www.php.net/license/3_01.txt                                  |
- *  | If you did not receive a copy of the PHP license and are unable to   |
- *  | obtain it through the world-wide-web, please send a note to          |
- *  | [email protected] so we can mail you a copy immediately.               |
- *  +----------------------------------------------------------------------+
- *  | Author: Stefan Esser <[email protected]>                       |
- *  +----------------------------------------------------------------------+
-*/
-
-/*
- *  +----------------------------------------------------------------------+
- *  | PHP Version 5                                                        |
- *  +----------------------------------------------------------------------+
- *  | Copyright (c) 1997-2005 The PHP Group                                |
- *  +----------------------------------------------------------------------+
- *  | This source file is subject to version 3.0 of the PHP license,       |
- *  | that is bundled with this package in the file LICENSE, and is        |
- *  | available through the world-wide-web at the following url:           |
- *  | http://www.php.net/license/3_0.txt.                                  |
- *  | If you did not receive a copy of the PHP license and are unable to   |
- *  | obtain it through the world-wide-web, please send a note to          |
- *  | [email protected] so we can mail you a copy immediately.               |
- *  +----------------------------------------------------------------------+
- *  | Author: Wez Furlong <[email protected]>                                 |
- *  +----------------------------------------------------------------------+
-*/
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <[email protected]> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * from FreeBSD: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp
- * via OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp
- * via NetBSD: md5crypt.c,v 1.4.2.1 2002/01/22 19:31:59 he Exp
- *
- */
-
-/*
+  +----------------------------------------------------------------------+
+  | Suhosin Version 1                                                    |
   +----------------------------------------------------------------------+
-  | PHP Version 4                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2003 The PHP Group                                |
+  | Copyright (c) 2006-2007 The Hardened-PHP Project                     |
+  | Copyright (c) 2007-2012 SektionEins GmbH                             |
   +----------------------------------------------------------------------+
-  | This source file is subject to version 2.02 of the PHP license,      |
+  | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
-  | available at through the world-wide-web at                           |
-  | http://www.php.net/license/2_02.txt.                                 |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.txt                                  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to          |
   | [email protected] so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author:                                                              |
+  | Author: Stefan Esser <[email protected]>                         |
   +----------------------------------------------------------------------+
 */
 
-/* ====================================================================
- * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are 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. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 5. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 APACHE GROUP 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 Apache Group and was originally based
- * on public domain software written at the National Center for
- * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- * This code is based on, and used with the permission of, the
- * SIO stdio-replacement strx_* functions by Panos Tsirigotis
- * <[email protected]> for xinetd.
- */
+
+text from http://www.php.net/license/3_01.txt
+---------------------------------------------
+--------------------------------------------------------------------
+                  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 [email protected]
+
+  4. Products derived from this software may not be called "PHP", nor
+     may "PHP" appear in their name, without prior written permission
+     from [email protected]  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 [email protected]
+
+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>.