summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-04-16 09:35:04 +0200
committerRemi Collet <remi@php.net>2026-04-16 09:35:04 +0200
commitd464e5221935c8b7b2da3f74db9b8a4e31542ea8 (patch)
treeb4afe95701f91c1ee76153bfbe055102999a0646
parent81459163d3f1883f81a6e358322073c3521e3011 (diff)
update PHP License from version 3 to version 4 (BSD-3-Clause)
-rw-r--r--CHANGELOG.md1
-rw-r--r--LICENSE90
-rw-r--r--package.xml3
-rw-r--r--php_xpass.h16
-rw-r--r--xpass.c16
-rw-r--r--xpass.stub.php13
-rw-r--r--xpass_arginfo.h2
7 files changed, 53 insertions, 88 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93c5a08..a7cda1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
# Unreleased
- improve algo availability check
+- update PHP License from version 3 to version 4 (BSD-3-Clause)
# Version 1.2.0 - 2026-01-13
diff --git a/LICENSE b/LICENSE
index 9964e07..0b46971 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,68 +1,26 @@
---------------------------------------------------------------------
- The PHP License, version 3.01
-Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
---------------------------------------------------------------------
+Copyright (c) Remi Collet <remi@php.net>
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 group@php.net.
-
- 4. Products derived from this software may not be called "PHP", nor
- may "PHP" appear in their name, without prior written permission
- from group@php.net. 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 group@php.net.
-
-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>.
+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 copyright holder 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
diff --git a/package.xml b/package.xml
index d171dbc..dbc9846 100644
--- a/package.xml
+++ b/package.xml
@@ -35,9 +35,10 @@ See PHP documentation on https://www.php.net/xpass
<release>stable</release>
<api>stable</api>
</stability>
- <license uri="https://www.php.net/license/3_01.txt" filesource="LICENSE">PHP-3.01</license>
+ <license uri="https://opensource.org/license/BSD-3-Clause" filesource="LICENSE">BSD-3-Clause</license>
<notes><![CDATA[
- improve algo availability check
+- update PHP License from version 3 to version 4 (BSD-3-Clause)
]]></notes>
<contents>
<dir name="/">
diff --git a/php_xpass.h b/php_xpass.h
index 9f0d501..21005e2 100644
--- a/php_xpass.h
+++ b/php_xpass.h
@@ -2,17 +2,13 @@
+----------------------------------------------------------------------+
| xpass extension for PHP |
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | SPDX-FileCopyrightText: Copyright (c) Remi Collet <remi@php.net> |
+----------------------------------------------------------------------+
- | 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 |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Remi Collet <remi@php.net> |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the WWW at <https://opensource.org/license/BSD-3-Clause>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
*/
diff --git a/xpass.c b/xpass.c
index ea9ed07..d2732d1 100644
--- a/xpass.c
+++ b/xpass.c
@@ -2,17 +2,13 @@
+----------------------------------------------------------------------+
| xpass extension for PHP |
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | SPDX-FileCopyrightText: Copyright (c) Remi Collet <remi@php.net> |
+----------------------------------------------------------------------+
- | 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 |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Remi Collet <remi@php.net> |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the WWW at <https://opensource.org/license/BSD-3-Clause>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
*/
diff --git a/xpass.stub.php b/xpass.stub.php
index 18a0b68..b6800a3 100644
--- a/xpass.stub.php
+++ b/xpass.stub.php
@@ -1,4 +1,17 @@
<?php
+/*
+ +----------------------------------------------------------------------+
+ | xpass extension for PHP |
+ +----------------------------------------------------------------------+
+ | SPDX-FileCopyrightText: Copyright (c) Remi Collet <remi@php.net> |
+ +----------------------------------------------------------------------+
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the WWW at <https://opensource.org/license/BSD-3-Clause>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+ +----------------------------------------------------------------------+
+*/
/**
* @generate-class-entries
diff --git a/xpass_arginfo.h b/xpass_arginfo.h
index b3f3e1c..3518013 100644
--- a/xpass_arginfo.h
+++ b/xpass_arginfo.h
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d778eda3c6fd835a9215bde896fbb0c3917c1893 */
+ * Stub hash: 86e4cb41f10b44c2bee99909b4dc1f866fecbb91 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_crypt_gensalt, 0, 0, IS_STRING, 1)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prefix, IS_STRING, 1, "null")