Skip to content

Commit 00bcc9c

Browse files
committed
Update the license to BSD-2-clause
License content taken from https://opensource.org/licenses/BSD-2-Clause This commit fixes pear#43.
1 parent 43ecb42 commit 00bcc9c

File tree

4 files changed

+51
-78
lines changed

4 files changed

+51
-78
lines changed

LICENSE

+21-67
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,23 @@
1-
--------------------------------------------------------------------
2-
The PHP License, version 3.01
3-
Copyright (c) 2002-2015 Jon Parise and Chuck Hagenbuch.
4-
All rights reserved.
5-
--------------------------------------------------------------------
1+
Copyright 2002-2017 Jon Parise and Chuck Hagenbuch.
2+
All rights reserved.
63

74
Redistribution and use in source and binary forms, with or without
8-
modification, is permitted provided that the following conditions
9-
are met:
10-
11-
1. Redistributions of source code must retain the above copyright
12-
notice, this list of conditions and the following disclaimer.
13-
14-
2. Redistributions in binary form must reproduce the above copyright
15-
notice, this list of conditions and the following disclaimer in
16-
the documentation and/or other materials provided with the
17-
distribution.
18-
19-
3. The name "PHP" must not be used to endorse or promote products
20-
derived from this software without prior written permission. For
21-
written permission, please contact [email protected].
22-
23-
4. Products derived from this software may not be called "PHP", nor
24-
may "PHP" appear in their name, without prior written permission
25-
from [email protected]. You may indicate that your software works in
26-
conjunction with PHP by saying "Foo for PHP" instead of calling
27-
it "PHP Foo" or "phpfoo"
28-
29-
5. The PHP Group may publish revised and/or new versions of the
30-
license from time to time. Each version will be given a
31-
distinguishing version number.
32-
Once covered code has been published under a particular version
33-
of the license, you may always continue to use it under the terms
34-
of that version. You may also choose to use such covered code
35-
under the terms of any subsequent version of the license
36-
published by the PHP Group. No one other than the PHP Group has
37-
the right to modify the terms applicable to covered code created
38-
under this License.
39-
40-
6. Redistributions of any form whatsoever must retain the following
41-
acknowledgment:
42-
"This product includes PHP software, freely available from
43-
<http://www.php.net/software/>".
44-
45-
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
46-
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
47-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
48-
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
49-
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
50-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
51-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
52-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
53-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
54-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
55-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
56-
OF THE POSSIBILITY OF SUCH DAMAGE.
57-
58-
--------------------------------------------------------------------
59-
60-
This software consists of voluntary contributions made by many
61-
individuals on behalf of the PHP Group.
62-
63-
The PHP Group can be contacted via Email at [email protected].
64-
65-
For more information on the PHP Group and the PHP project,
66-
please see <http://www.php.net>.
67-
68-
PHP includes the Zend Engine, freely available at
69-
<http://www.zend.com>.
5+
modification, are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution..
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
15+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
18+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Net/SMTP.php

+28-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,33 @@
33
// +----------------------------------------------------------------------+
44
// | PHP Version 5 and 7 |
55
// +----------------------------------------------------------------------+
6-
// | Copyright (c) 1997-2015 Jon Parise and Chuck Hagenbuch |
7-
// +----------------------------------------------------------------------+
8-
// | This source file is subject to version 3.01 of the PHP license, |
9-
// | that is bundled with this package in the file LICENSE, and is |
10-
// | available at through the world-wide-web at |
11-
// | http://www.php.net/license/3_01.txt. |
12-
// | If you did not receive a copy of the PHP license and are unable to |
13-
// | obtain it through the world-wide-web, please send a note to |
14-
// | [email protected] so we can mail you a copy immediately. |
6+
// | Copyright (c) 1997-2017 Jon Parise and Chuck Hagenbuch |
7+
// | All rights reserved. |
8+
// | |
9+
// | Redistribution and use in source and binary forms, with or without |
10+
// | modification, are permitted provided that the following conditions |
11+
// | are met: |
12+
// | |
13+
// | 1. Redistributions of source code must retain the above copyright |
14+
// | notice, this list of conditions and the following disclaimer. |
15+
// | |
16+
// | 2. Redistributions in binary form must reproduce the above copyright |
17+
// | notice, this list of conditions and the following disclaimer in |
18+
// | the documentation and/or other materials provided with the |
19+
// | distribution. |
20+
// | |
21+
// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
22+
// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
23+
// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
24+
// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
25+
// | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
26+
// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
27+
// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
28+
// | LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
29+
// | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
30+
// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
31+
// | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
32+
// | POSSIBILITY OF SUCH DAMAGE. |
1533
// +----------------------------------------------------------------------+
1634
// | Authors: Chuck Hagenbuch <[email protected]> |
1735
// | Jon Parise <[email protected]> |
@@ -29,6 +47,7 @@
2947
* @author Chuck Hagenbuch <[email protected]>
3048
* @author Jon Parise <[email protected]>
3149
* @author Damian Alejandro Fernandez Sosa <[email protected]>
50+
* @license http://opensource.org/licenses/bsd-license.php BSD-2-Clause
3251
*
3352
* @example basic.php A basic implementation of the Net_SMTP package.
3453
*/

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"include-path": [
2727
"./"
2828
],
29-
"license": "PHP-3.01",
29+
"license": "BSD-2-Clause",
3030
"name": "pear/net_smtp",
3131
"homepage": "http://pear.github.io/Net_SMTP/",
3232
"support": {

package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<release>stable</release>
3030
<api>stable</api>
3131
</stability>
32-
<license uri="http://www.php.net/license/3_01.txt">PHP License</license>
32+
<license uri="https://opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
3333
<notes>- Fix MIME boundary size calculation (#34)
3434
- Workaround E_DEPRECATED warning on Auth_SASL::factory() call (#29)
3535
</notes>

0 commit comments

Comments
 (0)