From 4ab4e7d1d6cf833b91e1dc020d557057339c4e37 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 12 Jun 2024 12:58:05 +0800 Subject: [PATCH] Update licenses declaration (cherry picked from commit 5621e8b95fcd0a78e185d812b69b6d23c5fe0cef) --- php.spec | 61 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/php.spec b/php.spec index 9a91a5e..870e334 100644 --- a/php.spec +++ b/php.spec @@ -26,9 +26,9 @@ Name: php Version: %{upver} -Release: 4 +Release: 5 Summary: PHP scripting language for creating dynamic web sites -License: PHP-3.01 and Zend-2.0 and BSD and MIT and ASL 1.0 and NCSA +License: PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND NCSA AND BSL-1.0 URL: http://www.php.net/ Source0: http://www.php.net/distributions/php-%{upver}.tar.xz Source1: php.conf @@ -93,7 +93,7 @@ which adds support for the PHP language to Apache HTTP Server. %package cli Summary: Command-line interface for PHP -License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and PostgreSQL +License: PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND NCSA AND PostgreSQL Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release}, php-pcntl, php-pcntl%{?_isa} Provides: php-readline, php-readline%{?_isa} @@ -126,7 +126,7 @@ any size, especially busier sites. %package common Summary: Common files for PHP -License: PHP and BSD +License: PHP-3.01 AND BSD-2-Clause Provides: php(api) = %{apiver}-%{__isa_bits}, php(zend-abi) = %{zendver}-%{__isa_bits} Provides: php(language) = %{version}, php(language)%{?_isa} = %{version}, php-bz2, php-bz2%{?_isa} Provides: php-calendar, php-calendar%{?_isa}, php-core = %{version}, php-core%{?_isa} = %{version} @@ -163,7 +163,7 @@ need to install this package. %package opcache Summary: The Zend OPcache -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-pecl-zendopcache = %{version}, php-pecl-zendopcache%{?_isa} = %{version}, php-pecl(opcache) = %{version} Provides: php-pecl(opcache)%{?_isa} = %{version} @@ -178,7 +178,7 @@ bytecode optimization patterns that make code execution faster. %if %{with_imap} %package imap Summary: A module for PHP applications that use IMAP -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: krb5-devel, openssl-devel, libc-client-devel @@ -190,7 +190,7 @@ messages on mail servers. PHP is an HTML-embedded scripting language. %package ldap Summary: A module for PHP applications that use LDAP -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel @@ -202,7 +202,7 @@ language. %package pdo Summary: A database access abstraction module for PHP applications -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-pdo-abi = %{pdover}-%{__isa_bits}, php(pdo-abi) = %{pdover}-%{__isa_bits}, php-sqlite3, php-sqlite3%{?_isa} Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa} @@ -215,7 +215,7 @@ databases. %package mysqlnd Summary: A module for PHP applications that use MySQL databases -License: PHP +License: PHP-3.01 Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database, php-mysqli = %{version}-%{release}, php-mysqli%{?_isa} = %{version}-%{release},php-pdo_mysql Provides: php-pdo_mysql%{?_isa} @@ -230,7 +230,7 @@ This package use the MySQL Native Driver %package pgsql Summary: A PostgreSQL database module for PHP -License: PHP +License: PHP-3.01 Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database, php-pdo_pgsql, php-pdo_pgsql%{?_isa} BuildRequires: krb5-devel, openssl-devel, postgresql-devel @@ -245,7 +245,7 @@ php package. %package process Summary: Modules for PHP script using system process interfaces -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-posix, php-posix%{?_isa}, php-shmop, php-shmop%{?_isa}, php-sysvsem, php-sysvsem%{?_isa} Provides: php-sysvshm, php-sysvshm%{?_isa}, php-sysvmsg, php-sysvmsg%{?_isa} @@ -257,7 +257,7 @@ communication. %package odbc Summary: A module for PHP applications that use ODBC databases -License: PHP +License: PHP-3.01 Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database, php-pdo_odbc, php-pdo_odbc%{?_isa} BuildRequires: unixODBC-devel @@ -273,7 +273,7 @@ package. %package soap Summary: A module for PHP applications that use the SOAP protocol -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libxml2-devel @@ -284,7 +284,7 @@ support to PHP for using the SOAP web services protocol. %if %{with_firebird} %package interbase Summary: A module for PHP applications that use Interbase/Firebird databases -License: PHP +License: PHP-3.01 BuildRequires: firebird-devel Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database, php-firebird, php-firebird%{?_isa}, php-pdo_firebird, php-pdo_firebird%{?_isa} @@ -303,7 +303,7 @@ License. %package snmp Summary: A module for PHP applications that query SNMP-managed devices -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp BuildRequires: net-snmp-devel @@ -315,7 +315,7 @@ will need to install this package and the php package. %package xml Summary: A module for PHP applications which use XML -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-dom, php-dom%{?_isa}, php-domxml, php-domxml%{?_isa}, php-simplexml, php-simplexml%{?_isa} Provides: php-xmlreader, php-xmlreader%{?_isa}, php-xmlwriter, php-xmlwriter%{?_isa} @@ -330,7 +330,7 @@ and performing XSL transformations on XML documents. %package mbstring Summary: A module for PHP applications which need multi-byte string handling -License: PHP and LGPLv2 and OpenLDAP +License: PHP-3.01 AND LGPL-2.1-only AND OLDAP-2.8 BuildRequires: oniguruma-devel Provides: bundled(libmbfl) = 1.3.2 Requires: php-common%{?_isa} = %{version}-%{release} @@ -342,9 +342,9 @@ support for multi-byte string handling to PHP. %package gd Summary: A module for PHP applications for using the gd graphics library %if %{with_libgd} -License: PHP +License: PHP-3.0.1 %else -License: PHP and BSD +License: PHP-3.0.1 and BSD-2-Clause %endif Requires: php-common%{?_isa} = %{version}-%{release} %if %{with_libgd} @@ -360,7 +360,7 @@ support for using the gd graphics library to PHP. %package bcmath Summary: A module for PHP applications for using the bcmath library -License: PHP and LGPLv2+ +License: PHP-3.01 AND LGPL-2.1-or-later Requires: php-common%{?_isa} = %{version}-%{release} %description bcmath @@ -369,7 +369,7 @@ support for using the bcmath library to PHP. %package gmp Summary: A module for PHP applications for using the GNU MP library -License: PHP +License: PHP-3.01 BuildRequires: gmp-devel Requires: php-common%{?_isa} = %{version}-%{release} @@ -379,7 +379,7 @@ using the GNU MP library. %package dba Summary: A database abstraction layer module for PHP applications -License: PHP +License: PHP-3.01 BuildRequires: lmdb-devel, tokyocabinet-devel Requires: php-common%{?_isa} = %{version}-%{release} @@ -389,7 +389,7 @@ support for using the DBA database abstraction layer to PHP. %package tidy Summary: Standard PHP module provides tidy library support -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libtidy-devel @@ -400,7 +400,7 @@ support for using the tidy library to PHP. %if %{with_freetds} %package pdo-dblib Summary: PDO driver Microsoft SQL Server and Sybase databases -License: PHP +License: PHP-3.01 Requires: php-pdo%{?_isa} = %{version}-%{release} BuildRequires: freetds-devel Provides: php-pdo_dblib, php-pdo_dblib%{?_isa} @@ -423,7 +423,7 @@ into applications to provide PHP scripting language support. %if %{with_pspell} %package pspell Summary: A module for PHP applications for using pspell interfaces -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: aspell-devel >= 0.50.0 @@ -434,7 +434,7 @@ support for using the pspell library to PHP. %package intl Summary: Internationalization extension for PHP applications -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libicu-devel >= 4.0 @@ -444,7 +444,7 @@ support for using the ICU library to PHP. %package enchant Summary: Enchant spelling extension for PHP applications -License: PHP +License: PHP-3.01 Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: enchant2-devel @@ -455,7 +455,7 @@ support for using the enchant library to PHP. %if %{with_sodium} %package sodium Summary: Wrapper for the Sodium cryptographic library -License: PHP +License: PHP-3.01 BuildRequires: pkgconfig(libsodium) >= 1.0.9 Requires: php-common%{?_isa} = %{version}-%{release} @@ -470,7 +470,7 @@ low-level PHP extension for the libsodium cryptographic library. %package ffi Summary: Foreign Function Interface # All files licensed under PHP version 3.0.1 -License: PHP +License: PHP-3.01 Group: System Environment/Libraries BuildRequires: pkgconfig(libffi) Requires: php-common%{?_isa} = %{version}-%{release} @@ -1086,6 +1086,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Wed Jun 12 2024 Funda Wang - 8.0.30-5 +- Update licenses declaration + * Fri Jun 07 2024 Funda Wang - 8.0.30-4 - fix CVE-2024-5458 -- Gitee