diff options
| author | Remi Collet <remi@remirepo.net> | 2026-04-16 09:42:50 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-04-16 09:42:50 +0200 |
| commit | 7dc9318668806c772fc9f86317138e42ee156bbc (patch) | |
| tree | c49aee028a9bff05b388193a61c61e147e3e02f3 | |
| parent | 7489e86a955e483b9aac65aab4a8394d761ec671 (diff) | |
update PHP License from version 3 to version 4 (BSD-3-Clause)
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | LICENSE | 90 | ||||
| -rw-r--r-- | package.xml | 4 | ||||
| -rw-r--r-- | php_rpminfo.h | 18 | ||||
| -rw-r--r-- | rpminfo.c | 16 | ||||
| -rw-r--r-- | rpminfo.stub.php | 13 | ||||
| -rw-r--r-- | rpminfo_arginfo.h | 4 |
7 files changed, 54 insertions, 93 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 676cb3d..8456037 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Unreleased -- +- update PHP License from version 3 to version 4 (BSD-3-Clause) # Version 1.2.1 - 2025-09-25 @@ -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 40b3d5d..9250438 100644 --- a/package.xml +++ b/package.xml @@ -22,9 +22,9 @@ Documentation: https://www.php.net/rpminfo <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[ -- +- update PHP License from version 3 to version 4 (BSD-3-Clause) ]]></notes> <contents> <dir name="/"> diff --git a/php_rpminfo.h b/php_rpminfo.h index 15e44e1..1ac2b5f 100644 --- a/php_rpminfo.h +++ b/php_rpminfo.h @@ -2,17 +2,13 @@ +----------------------------------------------------------------------+ | rpminfo 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 | +----------------------------------------------------------------------+ */ @@ -24,7 +20,7 @@ extern zend_module_entry rpminfo_module_entry; #define PHP_RPMINFO_VERSION "1.2.2-dev" #define PHP_RPMINFO_AUTHOR "Remi Collet" -#define PHP_RPMINFO_LICENSE "PHP-3.01" +#define PHP_RPMINFO_LICENSE "BSD-3-Clause" #ifdef ZTS #include "TSRM.h" @@ -2,17 +2,13 @@ +----------------------------------------------------------------------+ | rpminfo 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/rpminfo.stub.php b/rpminfo.stub.php index 026df4b..afaa2fa 100644 --- a/rpminfo.stub.php +++ b/rpminfo.stub.php @@ -1,4 +1,17 @@ <?php +/* + +----------------------------------------------------------------------+ + | rpminfo 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-function-entries */ diff --git a/rpminfo_arginfo.h b/rpminfo_arginfo.h index 6db4fed..e07f9ce 100644 --- a/rpminfo_arginfo.h +++ b/rpminfo_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: dc980a56084190700162f5a8c70b54fcdbc30ced */ + * Stub hash: 5ae46dc3cb77804d128641a8032d01723c369066 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rpmaddtag, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, rpmtag, IS_LONG, 0) @@ -46,7 +46,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rpmdefine, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, macro, IS_STRING, 0) ZEND_END_ARG_INFO() - ZEND_FUNCTION(rpmaddtag); ZEND_FUNCTION(rpmdbinfo); ZEND_FUNCTION(rpmdbsearch); @@ -57,7 +56,6 @@ ZEND_FUNCTION(rpmexpand); ZEND_FUNCTION(rpmexpandnumeric); ZEND_FUNCTION(rpmdefine); - static const zend_function_entry ext_functions[] = { ZEND_FE(rpmaddtag, arginfo_rpmaddtag) ZEND_FE(rpmdbinfo, arginfo_rpmdbinfo) |
