Update to 8.2.6 - http://www.php.net/releases/8_2_6.phpv8.2.6

3 files changed, 51 insertions, 49 deletions

diff --git a/failed.txt b/failed.txt
index 1882289..9641272 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.2.6RC1 (2023-04-27)
+===== 8.2.6 (2023-05-11)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/macros.php b/macros.php
index c49070a..d3e937f 100644
--- a/macros.php
+++ b/macros.php
@@ -17,3 +17,4 @@
 %@SCL@__phpize     @BINDIR@/phpize
 
 %@SCL@__phpconfig  @BINDIR@/php-config
+
diff --git a/php.spec b/php.spec
index 6144cf7..30e9fff 100644
--- a/php.spec
+++ b/php.spec
@@ -123,12 +123,12 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.2.6
-%global rcver        RC1
+#global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -136,7 +136,7 @@ Release: 2%{?dist}
 # ext/date/lib is MIT
 # Zend/zend_sort is NCSA
 # Zend/asm is Boost
-License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and Boost
+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/
 
 %if 0%{?gh_date}
@@ -297,7 +297,7 @@ which adds support for the PHP language to system Apache HTTP Server.
 %package cli
 Summary: Command-line interface for PHP
 # sapi/cli/ps_title.c is PostgreSQL
-License:  PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and Boost 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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-cgi = %{version}-%{release}, %{?scl_prefix}php-cgi%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-pcntl, %{?scl_prefix}php-pcntl%{?_isa}
@@ -370,7 +370,7 @@ Summary: Common files for PHP
 # All files licensed under PHP version 3.01, except
 # fileinfo is licensed under PHP version 3.0
 # regex, libmagic are licensed under BSD
-License: PHP and BSD
+License: PHP-3.01 AND BSD-2-Clause
 
 %if %{with libpcre}
 %global pcre2_buildver %(pkg-config --silence-errors --modversion libpcre2-8 2>/dev/null || echo 10.30)
@@ -448,7 +448,7 @@ need to install this package.
 
 %package opcache
 Summary:   The Zend OPcache
-License:   PHP
+License:   PHP-3.01
 Requires:  %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides:  %{?scl_prefix}php-pecl-zendopcache = %{version}
 Provides:  %{?scl_prefix}php-pecl-zendopcache%{?_isa} = %{version}
@@ -466,7 +466,7 @@ bytecode optimization patterns that make code execution faster.
 %package imap
 Summary: A module for PHP applications that use IMAP
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(krb5)
 BuildRequires: pkgconfig(krb5-gssapi)
@@ -482,7 +482,7 @@ messages on mail servers. PHP is an HTML-embedded scripting language.
 %package ldap
 Summary: A module for PHP applications that use LDAP
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libsasl2)
 BuildRequires: openldap-devel
@@ -497,7 +497,7 @@ language.
 %package pdo
 Summary: A database access abstraction module for PHP applications
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 # ABI/API check - Arch specific
 Provides: %{?scl_prefix}php-pdo-abi = %{pdover}-%{__isa_bits}
@@ -516,7 +516,7 @@ databases.
 %package mysqlnd
 Summary: A module for PHP applications that use MySQL databases
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-mysqli = %{version}-%{release}
@@ -535,7 +535,7 @@ This package use the MySQL Native Driver
 %package pgsql
 Summary: A PostgreSQL database module for PHP
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-pdo_pgsql, %{?scl_prefix}php-pdo_pgsql%{?_isa}
@@ -554,7 +554,7 @@ php package.
 %package process
 Summary: Modules for PHP script using system process interfaces
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-posix, %{?scl_prefix}php-posix%{?_isa}
 Provides: %{?scl_prefix}php-shmop, %{?scl_prefix}php-shmop%{?_isa}
@@ -571,7 +571,7 @@ communication.
 Summary: A module for PHP applications that use ODBC databases
 # All files licensed under PHP version 3.01, except
 # pdo_odbc is licensed under PHP version 3.0
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-pdo_odbc, %{?scl_prefix}php-pdo_odbc%{?_isa}
@@ -590,7 +590,7 @@ package.
 %package soap
 Summary: A module for PHP applications that use the SOAP protocol
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libxml-2.0)
 
@@ -602,7 +602,7 @@ support to PHP for using the SOAP web services protocol.
 %package pdo-firebird
 Summary: PDO driver for Interbase/Firebird databases
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 BuildRequires:  firebird-devel
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
@@ -627,7 +627,7 @@ License.
 %package oci8
 Summary:        A module for PHP applications that use OCI8 databases
 # All files licensed under PHP version 3.01
-License:        PHP
+License:        PHP-3.01
 BuildRequires:  oracle-instantclient-devel >= %{oraclever}
 Requires:       %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides:       %{?scl_prefix}php_database
@@ -662,7 +662,7 @@ Documentation is at http://php.net/oci8 and http://php.net/pdo_oci
 %package snmp
 Summary: A module for PHP applications that query SNMP-managed devices
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}, net-snmp
 BuildRequires: net-snmp-devel
 
@@ -675,7 +675,7 @@ will need to install this package and the php package.
 %package xml
 Summary: A module for PHP applications which use XML
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php-dom, %{?scl_prefix}php-dom%{?_isa}
 Provides: %{?scl_prefix}php-domxml, %{?scl_prefix}php-domxml%{?_isa}
@@ -698,7 +698,7 @@ Summary: A module for PHP applications which need multi-byte string handling
 # libmbfl is licensed under LGPLv2
 # onigurama is licensed under BSD
 # ucgendat is licensed under OpenLDAP
-License: PHP and LGPLv2 and BSD and OpenLDAP
+License: PHP-3.01 AND LGPL-2.1-only AND OLDAP-2.8
 %if 0%{?rhel}
 BuildRequires: oniguruma5php-devel
 %else
@@ -715,10 +715,10 @@ support for multi-byte string handling to PHP.
 Summary: A module for PHP applications for using the gd graphics library
 # All files licensed under PHP version 3.01
 %if %{with libgd}
-License: PHP
+License: PHP-3.01
 %else
-# bundled libgd is licensed under BSD
-License: PHP and BSD
+# bundled libgd is licensed under MIT
+License: PHP-3.01 and MIT
 %endif
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 %if %{with libgd}
@@ -743,7 +743,7 @@ support for using the gd graphics library to PHP.
 Summary: A module for PHP applications for using the bcmath library
 # All files licensed under PHP version 3.01, except
 # libbcmath is licensed under LGPLv2+
-License: PHP and LGPLv2+
+License:  PHP-3.01 AND LGPL-2.1-or-later
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Provides: bundled(libbcmath)
 
@@ -754,7 +754,7 @@ support for using the bcmath library to PHP.
 %package gmp
 Summary: A module for PHP applications for using the GNU MP library
 # All files licensed under PHP version 3.01
-License: PHP
+License: PHP-3.01
 BuildRequires: gmp-devel
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 
@@ -765,7 +765,7 @@ using the GNU MP library.
 %package dba
 Summary: A database abstraction layer module for PHP applications
 # All files licensed under PHP version 3.01
-License: PHP
+License: PHP-3.01
 BuildRequires: libdb-devel
 BuildRequires: tokyocabinet-devel
 BuildRequires: lmdb-devel
@@ -783,7 +783,7 @@ support for using the DBA database abstraction layer to PHP.
 %package tidy
 Summary: Standard PHP module provides tidy library support
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: libtidy-devel
 
@@ -796,7 +796,7 @@ support for using the tidy library to PHP.
 %package pdo-dblib
 Summary: PDO driver for Microsoft SQL Server and Sybase databases
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 BuildRequires: freetds-devel
 Provides: %{?scl_prefix}php-pdo_dblib, %{?scl_prefix}php-pdo_dblib%{?_isa}
@@ -810,7 +810,7 @@ PHP to Microsoft SQL Server and Sybase databases through the FreeTDS library.
 %package pspell
 Summary: A module for PHP applications for using pspell interfaces
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: aspell-devel >= 0.50.0
 
@@ -821,7 +821,7 @@ support for using the pspell library to PHP.
 %package intl
 Summary: Internationalization extension for PHP applications
 # All files licensed under PHP version 3.01
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(icu-i18n) >= 72
 BuildRequires: pkgconfig(icu-io)   >= 72
@@ -835,7 +835,7 @@ support for using the ICU library to PHP.
 %package enchant
 Summary: Enchant spelling extension for PHP applications
 # All files licensed under PHP version 3.0
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(enchant-2)
 
@@ -848,7 +848,7 @@ support for using the enchant library to PHP.
 %package zip
 Summary: ZIP archive management extension for PHP
 # All files licensed under PHP version 3.0.1
-License: PHP
+License:  PHP-3.01
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libzip) >= 0.11
 
@@ -861,7 +861,7 @@ support for ZIP archive management to PHP.
 %package sodium
 Summary: Wrapper for the Sodium cryptographic library
 # All files licensed under PHP version 3.0.1
-License: PHP
+License:  PHP-3.01
 # Minimal is 1.0.8, 1.0.14 is needed for argon2 password
 BuildRequires:  pkgconfig(libsodium) >= 1.0.14
 
@@ -878,7 +878,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
 BuildRequires:  pkgconfig(libffi)
 
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -950,34 +950,32 @@ in pure PHP.
 %setup -q -n php-%{upver}%{?rcver}
 %endif
 
-%patch1 -p1 -b .mpmcheck
-%patch5 -p1 -b .includedir
-%patch6 -p1 -b .embed
-%patch8 -p1 -b .libdb
+%patch -P1 -p1 -b .mpmcheck
+%patch -P5 -p1 -b .includedir
+%patch -P6 -p1 -b .embed
+%patch -P8 -p1 -b .libdb
 %if 0%{?rhel} == 7
-%patch10 -p1 -b .curltls
+%patch -P10 -p1 -b .curltls
 %endif
 
-%patch41 -p1 -b .syslib
+%patch -P41 -p1 -b .syslib
 %if %{with tzdata}
-%patch43 -p1 -b .systzdata
+%patch -P43 -p1 -b .systzdata
 %endif
-%patch44 -p1 -b .headers
+%patch -P44 -p1 -b .headers
 sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%patch45 -p1 -b .ldap_r
-%endif
-%patch46 -p1 -b .argon2
-%patch47 -p1 -b .phpinfo
+%patch -P45 -p1 -b .ldap_r
+%patch -P46 -p1 -b .argon2
+%patch -P47 -p1 -b .phpinfo
 
-%patch91 -p1 -b .remi-oci8
+%patch -P91 -p1 -b .remi-oci8
 
 # upstream patches
 
 # security patches
 
 # Fixes for tests
-%patch300 -p1 -b .datetests
+%patch -P300 -p1 -b .datetests
 
 # WIP patch
 
@@ -1853,6 +1851,9 @@ fi
 
 
 %changelog
+* Wed May 10 2023 Remi Collet <remi@remirepo.net> - 8.2.6-1
+- Update to 8.2.6 - http://www.php.net/releases/8_2_6.php
+
 * Tue Apr 25 2023 Remi Collet <remi@remirepo.net> - 8.2.6~RC1-2
 - define %%php82___phpize and %%php82___phpconfig