Skip to contentSkip to conversation

common-licenses/PHP-3.0: Correct the license text

PATCH New Peter Kjellerstedt 1 participant 2 messages Jun 11

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 common-licenses/PHP-3.0: Correct the license text

For some reason, this previously contained the licenses text for the PHP-3.01 license.

---
 meta/files/common-licenses/PHP-3.0 | 76 +++++++-----------------------
 1 file changed, 17 insertions(+), 59 deletions(-)
meta/files/common-licenses/PHP-3.0 +17 -59
index ef0b20306a..d6e8ae61a7 100644
@@ -1,70 +1,28 @@
+The PHP License, version 3.0
 
--------------------------------------------------------------------- 
-                  The PHP License, version 3.01
-Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
--------------------------------------------------------------------- 
+Copyright (c) 1999 - 2006 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:
+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.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-  6. Redistributions of any form whatsoever must retain the following
-     acknowledgment:
-     "This product includes PHP software, freely available from
-     <http://www.php.net/software/>".
+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.
 
-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.
+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"
 
-This software consists of voluntary contributions made by many
-individuals on behalf of the PHP Group.
+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, freely available from <http://www.php.net/>".
+
+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.
 
-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>.
+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].
 
-PHP includes the Zend Engine, freely available at
-<http://www.zend.com>.
+For more information on the PHP Group and the PHP project, please see <http://www.php.net>.
 
+This product includes the Zend Engine, freely available at <http://www.zend.com>.
#1 lore raw

PATCH 2/2 common-licenses: Remove unused licenses

These are licenses that are not used by any recipe in OE Core or meta-openembedded, and are not in the SPDX database.

---
 meta/files/common-licenses/Adobe              |  14 -
 meta/files/common-licenses/BitstreamVera      | 160 -------
 meta/files/common-licenses/DSSSL              |  49 --
 .../GPL-2-with-bison-exception                |   7 -
 .../LGPL-3.0-with-zeromq-exception            | 181 --------
 meta/files/common-licenses/RHeCos-1           | 401 ----------------
 meta/files/common-licenses/Simple-2.0         |  27 --
 meta/files/common-licenses/SugarCRM-1         | 431 ------------------
 meta/files/common-licenses/UCB                |  26 --
 meta/files/common-licenses/XFree86-1.0        |  22 -
 meta/files/common-licenses/XSL                |  48 --
 meta/files/common-licenses/bzip2-1.0.4        |  43 --
 meta/files/common-licenses/gSOAP-1            | 380 ---------------
 meta/files/common-licenses/unfs3              |  24 -
 14 files changed, 1813 deletions(-)
 delete mode 100644 meta/files/common-licenses/Adobe
 delete mode 100644 meta/files/common-licenses/BitstreamVera
 delete mode 100644 meta/files/common-licenses/DSSSL
 delete mode 100644 meta/files/common-licenses/GPL-2-with-bison-exception
 delete mode 100644 meta/files/common-licenses/LGPL-3.0-with-zeromq-exception
 delete mode 100644 meta/files/common-licenses/RHeCos-1
 delete mode 100644 meta/files/common-licenses/Simple-2.0
 delete mode 100644 meta/files/common-licenses/SugarCRM-1
 delete mode 100644 meta/files/common-licenses/UCB
 delete mode 100644 meta/files/common-licenses/XFree86-1.0
 delete mode 100644 meta/files/common-licenses/XSL
 delete mode 100644 meta/files/common-licenses/bzip2-1.0.4
 delete mode 100644 meta/files/common-licenses/gSOAP-1
 delete mode 100644 meta/files/common-licenses/unfs3
meta/files/common-licenses/Adobe deleted +0 -14
deleted file mode 100644
index 64779da1df..0000000000
@@ -1,14 +0,0 @@
-Copyright 1990-1998 Adobe Systems Incorporated.
-All Rights Reserved.
-  
-Patents Pending
-
-NOTICE: All information contained herein is the property of Adobe
-Systems Incorporated.
-
-Permission is granted for redistribution of this file provided
-this copyright notice is maintained intact and that the contents
-of this file are not altered in any way from its original form.
-
-PostScript and Display PostScript are trademarks of Adobe Systems
-Incorporated which may be registered in certain jurisdictions.
meta/files/common-licenses/BitstreamVera deleted +0 -160

160 lines not on this page · raw message

meta/files/common-licenses/DSSSL deleted +0 -49

49 lines not on this page · raw message

meta/files/common-licenses/GPL-2-with-bison-exception deleted +0 -7
deleted file mode 100644
index dd3427397c..0000000000
@@ -1,7 +0,0 @@
-
-insert GPL v2 text here
-
-Bison Exception
-As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn`t itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception.
-This special exception was added by the Free Software Foundation in version 2.2 of Bison.
-
meta/files/common-licenses/LGPL-3.0-with-zeromq-exception deleted +0 -181

181 lines not on this page · raw message

meta/files/common-licenses/RHeCos-1 deleted +0 -401

401 lines not on this page · raw message

meta/files/common-licenses/Simple-2.0 deleted +0 -27
deleted file mode 100644
index d28357d5f2..0000000000
@@ -1,27 +0,0 @@
-
-Simple Public License (SimPL)
-
-Preamble
-This Simple Public License 2.0 (SimPL 2.0 for short) is a plain language implementation of GPL 2.0.  The words are different, but the goal is the same - to guarantee for all users the freedom to share and change software.  If anyone wonders about the meaning of the SimPL, they should interpret it as consistent with GPL 2.0.
-Simple Public License (SimPL) 2.0
-The SimPL applies to the software`s source and object code and comes with any rights that I have in it (other than trademarks). You agree to the SimPL by copying, distributing, or making a derivative work of the software.
-
-You get the royalty free right to:
-Use the software for any purpose;
-Make derivative works of it (this is called a "Derived Work");
-Copy and distribute it and any Derived Work.
-If you distribute the software or a Derived Work, you must give back to the community by:
-Prominently noting the date of any changes you make;
-Leaving other people`s copyright notices, warranty disclaimers, and license terms  in place;
-Providing the source code, build scripts, installation scripts, and interface definitions in a form that is easy to get and best to modify;
-Licensing it to everyone under SimPL, or substantially similar terms (such as GPL 2.0), without adding further restrictions to the rights provided;
-Conspicuously announcing that it is available under that license.
-There are some things that you must shoulder:
-You get NO WARRANTIES. None of any kind;
-If the software damages you in any way, you may only recover direct damages up to the amount you paid for it (that is zero if you did not pay anything). You may not recover any other damages, including those called "consequential damages." (The state or country where you live may not allow you to limit your liability in this way, so this may not apply to you);
-The SimPL continues perpetually, except that your license rights end automatically if:
-You do not abide by the "give back to the community" terms (your licensees get to keep their rights if they abide);
-Anyone prevents you from distributing the software under the terms of the SimPL.
-License for the License
-You may do anything that you want with the SimPL text; it`s a license form to use in any way that you find helpful.  To avoid confusion, however, if you change the terms in any way then you may not call your license the Simple Public License or the SimPL (but feel free to acknowledge that your license is "based on the Simple Public License").
-
meta/files/common-licenses/SugarCRM-1 deleted +0 -431

431 lines not on this page · raw message

meta/files/common-licenses/UCB deleted +0 -26
deleted file mode 100644
index 79a757af95..0000000000
@@ -1,26 +0,0 @@
-   Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994
-        The Regents of the University of California.  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. Neither the name of the University 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 REGENTS 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 THE REGENTS OR 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.
meta/files/common-licenses/XFree86-1.0 deleted +0 -22
deleted file mode 100644
index b1f3bf45b0..0000000000
@@ -1,22 +0,0 @@
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
meta/files/common-licenses/XSL deleted +0 -48

48 lines not on this page · raw message

meta/files/common-licenses/bzip2-1.0.4 deleted +0 -43

43 lines not on this page · raw message

meta/files/common-licenses/gSOAP-1 deleted +0 -380

380 lines not on this page · raw message

meta/files/common-licenses/unfs3 deleted +0 -24
deleted file mode 100644
index 7f2b53f167..0000000000
@@ -1,24 +0,0 @@
-UNFS3 user-space NFSv3 server
-(C) 2003, Pascal Schmidt <[email protected]>
-
-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. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.