Commit:    614caa0d5734c0ba91a21577e3a22dccce192439
Author:    Ben Ramsey <[email protected]>         Thu, 5 Mar 2020 23:19:44 
-0600
Parents:   1164006fb7f5b6eb45e9b59d2dbc8a02b2ce66d8
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=614caa0d5734c0ba91a21577e3a22dccce192439

Log:
Update old licenses to show they are superseded by 3.01

A few days ago, an email sent to the php.general mailing list pointed
out that the PHP License, version 3.01 is not listed on the Open Source
Initiative list of approved licenses, while the older 3.0 version is
listed[1].

I volunteered[2] to discuss this with the OSI to see what steps we need
to take to get the 3.01 version of the license listed. I followed their
procedures to submit a request for "legacy approval" of the 3.01
license, since it's been in use for over 14 years[3].

After some discussion[4], we were advised to explicitly note the older
version as being deprecated and superceded by the 3.01 version[5].

This pull request updates our past licenses, similar to how Apache
presents their old licenses[6], to note that:

1. The 3.0 license is an OSI approved license, but the 3.01 version
   supercedes this license.
2. The 2.02 and 2.01 licenses are listed for historical purposes
   and are superseded by the 3.01 license.

[1]: https://news-web.php.net/php.general/327010
[2]: https://news-web.php.net/php.internals/108846
[3]: 
http://lists.opensource.org/pipermail/license-review_lists.opensource.org/2020-March/004716.html
[4]: 
http://lists.opensource.org/pipermail/license-review_lists.opensource.org/2020-March/thread.html
[5]: 
http://lists.opensource.org/pipermail/license-review_lists.opensource.org/2020-March/004741.html
[6]: https://www.apache.org/licenses/LICENSE-1.0

Changed paths:
  M  license/2_01.txt
  M  license/2_02.txt
  M  license/3_0.txt


Diff:
diff --git a/license/2_01.txt b/license/2_01.txt
index 2bdf0457b..e87ea981f 100644
--- a/license/2_01.txt
+++ b/license/2_01.txt
@@ -1,3 +1,15 @@
+============= An example PHP License, version 2.01 file ============
+
+This is the original PHP License, version 2.01 which applies only to
+very old versions of PHP software (such as versions 4.0RC2 and earlier).
+
+This license is provided here for historical purposes only.
+
+This license has been superseded by the PHP License, version 3.01,
+available at <https://www.php.net/license/3_01.txt>. All new works
+using the PHP License should use the PHP License, version 3.01.
+
+
 --------------------------------------------------------------------
                   The PHP License, version 2.01
 Copyright (c) 1999 The PHP Group. All rights reserved.
diff --git a/license/2_02.txt b/license/2_02.txt
index 7cce155e7..984a73796 100644
--- a/license/2_02.txt
+++ b/license/2_02.txt
@@ -1,3 +1,15 @@
+============= An example PHP License, version 2.02 file ============
+
+This is the original PHP License, version 2.02 which applies only to
+very old versions of PHP software (such as versions 4.2.2 and earlier).
+
+This license is provided here for historical purposes only.
+
+This license has been superseded by the PHP License, version 3.01,
+available at <https://www.php.net/license/3_01.txt>. All new works
+using the PHP License should use the PHP License, version 3.01.
+
+
 --------------------------------------------------------------------
                   The PHP License, version 2.02
 Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
diff --git a/license/3_0.txt b/license/3_0.txt
index 16d1f57ef..a567f335d 100644
--- a/license/3_0.txt
+++ b/license/3_0.txt
@@ -1,3 +1,17 @@
+============= An example PHP License, version 3.0 file =============
+
+This is the original PHP License, version 3.0 which applies only to
+very old versions of PHP software (such as versions 5.1.1, 4.4.1, and
+earlier).
+
+The PHP License, version 3.0 is an Open Source Initiative approved
+license, available at <https://opensource.org/licenses/PHP-3.0>.
+
+This license has been superseded by the PHP License, version 3.01,
+available at <https://www.php.net/license/3_01.txt>. All new works
+using the PHP License should use the PHP License, version 3.01.
+
+
 --------------------------------------------------------------------
                   The PHP License, version 3.0
 Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to