ini changes from upstream

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -6,15 +6,23 @@ php-7.*.xz
 php-7.*.xz.asc
 /php-8.0.*.tar.xz
 /php-8.0.*.tar.xz.asc
-/php-8.2.*.tar.xz
-/php-8.2.*.tar.xz.asc
-/php-8.1.12.tar.xz
-/php-8.1.12.tar.xz.asc
-/php-8.1.13.tar.xz
-/php-8.1.13.tar.xz.asc
-/php-8.1.14.tar.xz
-/php-8.1.14.tar.xz.asc
-/php-8.1.15.tar.xz
-/php-8.1.15.tar.xz.asc
-/php-8.1.16.tar.xz
-/php-8.1.16.tar.xz.asc
+/php-8.1.*.tar.xz
+/php-8.1.*.tar.xz.asc
+/php-8.2.0RC5.tar.xz
+/php-8.2.0RC5.tar.xz.asc
+/php-8.2.0RC6.tar.xz
+/php-8.2.0RC6.tar.xz.asc
+/php-8.2.0RC7.tar.xz
+/php-8.2.0RC7.tar.xz.asc
+/php-8.2.0.tar.xz
+/php-8.2.0.tar.xz.asc
+/php-8.2.1RC1.tar.xz
+/php-8.2.1RC1.tar.xz.asc
+/php-8.2.1.tar.xz
+/php-8.2.1.tar.xz.asc
+/php-8.2.2RC1.tar.xz
+/php-8.2.2RC1.tar.xz.asc
+/php-8.2.2.tar.xz
+/php-8.2.2.tar.xz.asc
+/php-8.2.3.tar.xz
+/php-8.2.3.tar.xz.asc

10-opcache.ini

@@ -115,7 +115,12 @@ opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
 ;opcache.file_cache_fallback=1
 
 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
+; Under certain circumstances (if only a single global PHP process is
+; started from which all others fork), this can increase performance
+; by a tiny amount because TLB misses are reduced.  On the other hand, this
+; delays PHP startup, increases memory usage and degrades performance
+; under memory pressure - use with care.
+; Requires appropriate OS configuration.
 opcache.huge_code_pages=0
 
 ; Validate cached file permissions.

news2markdown.php

@@ -24,8 +24,11 @@ foreach ($text as $line) {
 		if ($debug) echo "+ Ignore $line\n";
 		continue;
 	}
+	$github = 'https://github.com/php/php-src';
+
 	$line = preg_replace('/(#[0-9]+)/', 'php\1', $line);
-	$line = preg_replace('/(GH-([0-9]+))/', '[\1](https://github.com/php/php-src/issues/\2)', $line);
+	$line = preg_replace('/(GH-([0-9]+))/', "[\\1]($github/issues/\\2)", $line);
+	$line = preg_replace('/(GHSA-([^ ]+))/', "[\\1]($github/security/advisories/\\1)", $line);
 	$line = preg_replace('/(CVE-[0-9]+-[0-9]+)/', '**\1**', $line);
 	if (empty($line)) {
 		echo "\n\n";

php-8.2.0-parser.patch

@@ -1,7 +1,7 @@
 diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
 --- ./build/gen_stub.php.syslib	2020-06-25 08:11:51.782046813 +0200
 +++ ./build/gen_stub.php	2020-06-25 08:13:11.188860368 +0200
-@@ -1075,6 +1075,12 @@ function initPhpParser() {
+@@ -3265,6 +3265,12 @@ function initPhpParser() {
      }
  
      $isInitialized = true;
@@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
 +        return;
 +    }
 +
-     $version = "4.13.0";
+     $version = "4.15.1";
      $phpParserDir = __DIR__ . "/PHP-Parser-$version";
      if (!is_dir($phpParserDir)) {

php-fpm.conf

@@ -5,11 +5,6 @@
 ; All relative paths in this configuration file are relative to PHP's install
 ; prefix.
 
-; Include one or more files. If glob(3) exists, it is used to include a bunch of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-include=/etc/php-fpm.d/*.conf
-
 ;;;;;;;;;;;;;;;;;;
 ; Global Options ;
 ;;;;;;;;;;;;;;;;;;
@@ -133,5 +128,8 @@ daemonize = yes
 ; used in logs and stats. There is no limitation on the number of pools which
 ; FPM can handle. Your system will tell you anyway :)
 
-; See /etc/php-fpm.d/*.conf
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+include=/etc/php-fpm.d/*.conf
 

php.ini

@@ -9,8 +9,8 @@
 ; PHP attempts to find and load this configuration from a number of locations.
 ; The following is a summary of its search order:
 ; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
+; 2. The PHPRC environment variable.
+; 3. A number of predefined registry keys on Windows
 ; 4. Current working directory (except CLI)
 ; 5. The web server's directory (for SAPI modules), or directory of PHP
 ; (otherwise in Windows)
@@ -425,6 +425,11 @@ max_input_time = 60
 ; How many GET/POST/COOKIE input variables may be accepted
 ;max_input_vars = 1000
 
+; How many multipart body parts (combined input variable and file uploads) may
+; be accepted.
+; Default Value: -1 (Sum of max_input_vars and max_file_uploads)
+;max_multipart_body_parts = 1500
+
 ; Maximum amount of memory a script may consume
 ; https://php.net/memory-limit
 memory_limit = 128M
@@ -449,7 +454,7 @@ memory_limit = 128M
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
+; E_ALL             - All errors and warnings
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)

php.spec

@@ -7,8 +7,8 @@
 #
 
 # API/ABI check
-%global apiver      20210902
-%global zendver     20210902
+%global apiver      20220829
+%global zendver     20220829
 %global pdover      20170320
 
 # we don't want -z defs linker flag
@@ -18,7 +18,7 @@
 %global _hardened_build 1
 
 # version used for php embedded library soname
-%global embed_version 8.1
+%global embed_version 8.2
 
 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
@@ -64,7 +64,7 @@
 %bcond_with      imap
 %bcond_without   lmdb
 
-%global upver        8.1.16
+%global upver        8.2.3
 #global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -109,7 +109,7 @@ Patch8: php-8.1.0-libdb.patch
 
 # Functional changes
 # Use system nikic/php-parser
-Patch41: php-8.1.0-parser.patch
+Patch41: php-8.2.0-parser.patch
 # use system tzdata
 Patch42: php-8.1.0-systzdata-v22.patch
 # See http://bugs.php.net/53436
@@ -236,6 +236,7 @@ The php-dbg package contains the interactive PHP debugger.
 Summary: PHP FastCGI Process Manager
 BuildRequires: libacl-devel
 BuildRequires: pkgconfig(libsystemd) >= 209
+BuildRequires: pkgconfig(libselinux)
 Requires: php-common%{?_isa} = %{version}-%{release}
 %{?systemd_requires}
 # To ensure correct /var/lib/php/session ownership:
@@ -286,6 +287,7 @@ Provides: php-libxml, php-libxml%{?_isa}
 Provides: php-openssl, php-openssl%{?_isa}
 Provides: php-phar, php-phar%{?_isa}
 Provides: php-pcre, php-pcre%{?_isa}
+Provides: php-random, php-random%{?_isa}
 Provides: php-reflection, php-reflection%{?_isa}
 Provides: php-session, php-session%{?_isa}
 Provides: php-sockets, php-sockets%{?_isa}
@@ -318,7 +320,7 @@ Requires: zlib-devel%{?_isa}
 Provides: php-zts-devel = %{version}-%{release}
 Provides: php-zts-devel%{?_isa} = %{version}-%{release}
 %endif
-Recommends: php-nikic-php-parser4 >= 4.13.0
+Recommends: php-nikic-php-parser4 >= 4.15.1
 
 
 %description devel
@@ -707,9 +709,6 @@ in pure PHP.
 
 %setup -q -n php-%{upver}%{?rcver}
 
-# Corrupted MacOS archive
-find . -name '._*' -delete
-
 %patch1 -p1 -b .mpmcheck
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
@@ -1018,6 +1017,7 @@ pushd build-fpm
 build --enable-fpm \
       --with-fpm-acl \
       --with-fpm-systemd \
+      --with-fpm-selinux \
       --libdir=%{_libdir}/php \
       --without-mysqli \
       --disable-pdo \
@@ -1543,24 +1543,58 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
-* Tue Feb 14 2023 Remi Collet <remi@remirepo.net> - 8.1.16-1
-- Update to 8.1.16 - http://www.php.net/releases/8_1_16.php
+* Tue Feb 14 2023 Remi Collet <remi@remirepo.net> - 8.2.3-1
+- Update to 8.2.3 - http://www.php.net/releases/8_2_3.php
 
-* Wed Feb  1 2023 Remi Collet <remi@remirepo.net> - 8.1.15-1
-- Update to 8.1.15 - http://www.php.net/releases/8_1_15.php
+* Wed Feb  1 2023 Remi Collet <remi@remirepo.net> - 8.2.2-1
+- Update to 8.2.2 - http://www.php.net/releases/8_2_2.php
 
-* Wed Jan  4 2023 Remi Collet <remi@remirepo.net> - 8.1.14-1
-- Update to 8.1.14 - http://www.php.net/releases/8_1_14.php
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.2~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Tue Nov 22 2022 Remi Collet <remi@remirepo.net> - 8.1.13-1
-- Update to 8.1.13 - http://www.php.net/releases/8_1_13.php
+* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 8.2.2~RC1-1
+- update to 8.2.2RC1
 
-* Wed Oct 26 2022 Remi Collet <remi@remirepo.net> - 8.1.12-1
-- Update to 8.1.12 - http://www.php.net/releases/8_1_12.php
+* Wed Jan  4 2023 Remi Collet <remi@remirepo.net> - 8.2.1-1
+- Update to 8.2.1 - http://www.php.net/releases/8_2_1.php
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 8.2.1~RC1-3
+- Rebuild for ICU 72
+
+* Mon Dec 19 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-2
+- php-fpm.conf: move include directive after [global] section
+  following upstream example
+
+* Wed Dec 14 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-1
+- update to 8.2.1RC1
+
+* Tue Dec  6 2022 Remi Collet <remi@remirepo.net> - 8.2.0-1
+- update to 8.2.0 GA
+
+* Wed Nov 23 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC7-1
+- update to 8.2.0RC7
+
+* Tue Nov  8 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC6-1
+- update to 8.2.0RC6
+
+* Wed Oct 26 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC5-1
+- update to 8.2.0RC5
+
+* Tue Oct 11 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC4-1
+- update to 8.2.0RC4
+
+* Wed Sep 28 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC3-1
+- update to 8.2.0RC3
+- bump API/ABI
+- new random extension
+- add dependency on libselinux
 
 * Wed Sep 28 2022 Remi Collet <remi@remirepo.net> - 8.1.11-1
 - Update to 8.1.11 - http://www.php.net/releases/8_1_11.php
 
+* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 8.1.11~RC1-1
+- update to 8.1.11RC1
+
 * Thu Sep  8 2022 Remi Collet <remi@remirepo.net> - 8.1.10-1
 - Update to 8.1.10 - http://www.php.net/releases/8_1_10.php
 

sources

@@ -1,2 +1,2 @@
-SHA512 (php-8.1.16.tar.xz) = 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
-SHA512 (php-8.1.16.tar.xz.asc) = 3153be5495fb1c3980513e6365982c553a667bce41bae7e5f9a64a0eb375143f369e58d7901062147db841421b7ee4cf9c7f8a5eb863b6e10e617e394267c1fa
+SHA512 (php-8.2.3.tar.xz) = 4e3ae840ac486868d5bedc2ae771e3ff5d4939ba4c2f7c769b7052322a5eccc8fba253df311a77f3ea852bf42f9dec34653baf828f68c9c191d3a425a8968d4c
+SHA512 (php-8.2.3.tar.xz.asc) = f152a76a428602589e142a0007b73810ece57af9c1455571efd9cd215f97273671b87831b4f9f6396ee156ae3b0c22c06b48dda582acf9e6028fa7a627a4501e