From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Mon, 24 Apr 2023 09:59:55 +0000 (+0200)
Subject: - Up to 8.2.5
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=62221cd287ff4ba409d270fe4498785009a69ab0;p=packages%2Fphp.git

- Up to 8.2.5
---

diff --git a/php-ini.patch b/php-ini.patch
index f03462a..e86eb5f 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-8.2.2/php.ini	2023-01-31 14:31:55.000000000 +0100
-+++ php-8.2.2/php.ini	2023-02-08 22:05:00.850660744 +0100
+--- php-8.2.5/php.ini.orig	2023-04-11 18:16:23.000000000 +0200
++++ php-8.2.5/php.ini	2023-04-24 11:40:19.022838620 +0200
 @@ -82,6 +82,16 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -53,7 +53,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -762,7 +772,7 @@
+@@ -767,7 +777,7 @@
  ; https://php.net/extension-dir
  ;extension_dir = "./"
  ; On windows:
@@ -62,7 +62,7 @@
  
  ; Directory where the temporary files should be placed.
  ; Defaults to the system default (see sys_get_temp_dir)
-@@ -774,64 +784,6 @@
+@@ -779,64 +789,6 @@
  ; https://php.net/enable-dl
  enable_dl = Off
  
@@ -127,7 +127,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -996,19 +948,19 @@
+@@ -1001,19 +953,19 @@
  ; Use of this INI entry is deprecated, use global input_encoding instead.
  ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
  ; The precedence is: default_charset < input_encoding < iconv.input_encoding
@@ -150,7 +150,7 @@
  
  [imap]
  ; rsh/ssh logins are disabled by default. Use this INI entry if you want to
-@@ -1178,6 +1130,9 @@
+@@ -1187,6 +1139,9 @@
  ; https://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -160,7 +160,7 @@
  ; Default host for mysqli_connect() (doesn't apply in safe mode).
  ; https://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1331,7 +1286,7 @@
+@@ -1340,7 +1295,7 @@
  
  [browscap]
  ; https://php.net/browscap
@@ -169,7 +169,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1754,7 +1709,7 @@
+@@ -1763,7 +1718,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; https://php.net/soap.wsdl-cache-dir
@@ -178,7 +178,7 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1775,160 +1730,6 @@
+@@ -1784,165 +1739,6 @@
  [dba]
  ;dba.default_handler=
  
@@ -305,8 +305,13 @@
 -;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.
--;opcache.huge_code_pages=1
+-; 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.
 -;opcache.validate_permission=0
diff --git a/php-silent-session-cleanup.patch b/php-silent-session-cleanup.patch
index 1c004a3..0d37d8d 100644
--- a/php-silent-session-cleanup.patch
+++ b/php-silent-session-cleanup.patch
@@ -1,10 +1,10 @@
---- php-8.2.0RC2/ext/session/mod_files.c~	2022-09-14 12:42:49.000000000 +0300
-+++ php-8.2.0RC2/ext/session/mod_files.c	2022-09-29 01:26:03.341783642 +0300
+--- php-8.2.5/ext/session/mod_files.c.orig	2023-04-24 11:42:37.515845438 +0200
++++ php-8.2.5/ext/session/mod_files.c	2023-04-24 11:45:46.013854719 +0200
 @@ -287,7 +287,6 @@
  
  	dir = opendir(ZSTR_VAL(dirname));
  	if (!dir) {
 -		php_error_docref(NULL, E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %s (%d)", ZSTR_VAL(dirname), strerror(errno), errno);
- 		return (0);
+ 		return -1;
  	}
  
diff --git a/php.spec b/php.spec
index 20c7c5e..26963a7 100644
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	8.2.3
+Version:	8.2.5
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -133,7 +133,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	cb768cf744184e64d48b15305c437336
+# Source0-md5:	802ddeb65a32362a739326eddd1c172f
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini