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

Signed-off-by: Peter Kjellerstedt <[email protected]>
---
 meta/files/common-licenses/PHP-3.0 | 76 +++++++-----------------------
 1 file changed, 17 insertions(+), 59 deletions(-)

diff --git a/meta/files/common-licenses/PHP-3.0 
b/meta/files/common-licenses/PHP-3.0
index ef0b20306a..d6e8ae61a7 100644
--- a/meta/files/common-licenses/PHP-3.0
+++ b/meta/files/common-licenses/PHP-3.0
@@ -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>.
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#238442): 
https://lists.openembedded.org/g/openembedded-core/message/238442
Mute This Topic: https://lists.openembedded.org/mt/119757494/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

  • [OE-core] [PATCH 1/2] common... Peter Kjellerstedt via lists.openembedded.org

Reply via email to