From fd83cc8f1b59a15042e5a712ab5c1bfb1c2d53bc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sat, 3 Oct 2020 12:57:54 +0300
Subject: [PATCH] Update php-ini.patch and opcache.ini

---
 opcache.ini   |  5 +++++
 php-ini.patch | 33 ++++++++++++++++-----------------
 php.spec      |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/opcache.ini b/opcache.ini
index b2931f6..67c0381 100644
--- a/opcache.ini
+++ b/opcache.ini
@@ -40,6 +40,11 @@
 ; size of the optimized code.
 ;opcache.save_comments=1
 
+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
 
diff --git a/php-ini.patch b/php-ini.patch
index a6c58b5..6022546 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.4.0RC2/php.ini~	2019-09-23 10:43:53.000000000 +0300
-+++ php-7.4.0RC2/php.ini	2019-09-23 11:52:45.049464720 +0300
+--- php-8.0.0beta4/php.ini~	2020-10-03 12:50:10.000000000 +0300
++++ php-8.0.0beta4/php.ini	2020-10-03 12:54:30.499681036 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -127,24 +127,16 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -856,50 +856,10 @@ default_socket_timeout = 60
- ; deprecated in a future PHP major version. So, when it is possible, please
- ; move to the new ('extension=<ext>) syntax.
- ;
--; Notes for Windows environments :
- ;
--; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
--;   extension folders as well as the separate PECL DLL download (PHP 5+).
--;   Be sure to appropriately set the extension_dir directive.
-+; Ideally in PLD Linux you should install appropriate php74-<extension> or
-+; php74-pecl-<extension> package.
+@@ -871,44 +871,8 @@
+ ;   extension folders as well as the separate PECL DLL download (PHP 5+).
+ ;   Be sure to appropriately set the extension_dir directive.
  ;
 -;extension=bz2
 -;extension=curl
 -;extension=ffi
 -;extension=ftp
 -;extension=fileinfo
--;extension=gd2
+-;extension=gd
 -;extension=gettext
 -;extension=gmp
 -;extension=intl
@@ -174,12 +166,14 @@
 -;extension=sodium
 -;extension=sqlite3
 -;extension=tidy
--;extension=xmlrpc
 -;extension=xsl
 -
+-;zend_extension=opcache
++; In PLD Linux you can install appropriate php80-<extension> or php80-pecl-<extension> package.
++;
+ 
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
 @@ -954,8 +867,9 @@
  
  [Date]
@@ -233,7 +227,7 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1670,155 +1670,6 @@
+@@ -1674,160 +1674,6 @@
  [dba]
  ;dba.default_handler=
  
@@ -279,6 +273,11 @@
 -; size of the optimized code.
 -;opcache.save_comments=1
 -
+-; If enabled, compilation warnings (including notices and deprecations) will
+-; be recorded and replayed each time a file is included. Otherwise, compilation
+-; warnings will only be emitted when the file is first cached.
+-;opcache.record_warnings=0
+-
 -; Allow file existence override (file_exists, etc.) performance feature.
 -;opcache.enable_file_override=0
 -
diff --git a/php.spec b/php.spec
index 3446c77..870530c 100644
--- a/php.spec
+++ b/php.spec
@@ -1864,7 +1864,7 @@ cp -p php.ini-production php.ini
 
 #%patch7 -p1 -b .sapi-ini-file
 %patch9 -p1
-#%patch10 -p1 -b .ini
+%patch10 -p1 -b .ini
 %patch14 -p1
 #%patch17 -p1 -b readline
 %patch18 -p1
-- 
2.44.0