From dc5b5c095f3f904792339023d1878369f6c4ee85 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 29 Oct 2019 10:36:07 +0100
Subject: [PATCH] update to 7.4.0RC5 set opcache.enable_cli in provided default
 configuration add /usr/share/php/preload as default ffi.preload configuration

---
 .gitignore     |  1 +
 10-opcache.ini |  2 +-
 20-ffi.ini     |  5 +++++
 php.spec       | 10 ++++++++--
 sources        |  4 ++--
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a74c1a..eb106de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ php-7.*.xz
 /php-7.3.10.tar.xz.asc
 /php-7.4.0RC3.tar.xz.asc
 /php-7.4.0RC4.tar.xz.asc
+/php-7.4.0RC5.tar.xz.asc
diff --git a/10-opcache.ini b/10-opcache.ini
index db2ac5e..8c5db66 100644
--- a/10-opcache.ini
+++ b/10-opcache.ini
@@ -5,7 +5,7 @@ zend_extension=opcache
 opcache.enable=1
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
+opcache.enable_cli=1
 
 ; The OPcache shared memory storage size.
 ;opcache.memory_consumption=128
diff --git a/20-ffi.ini b/20-ffi.ini
index 751cdcb..0bce40d 100644
--- a/20-ffi.ini
+++ b/20-ffi.ini
@@ -6,3 +6,8 @@ extension=ffi
 ; "false"   - always disabled
 ; "true"    - always enabled
 ;ffi.enable=preload
+
+; List of headers files to preload, wildcard patterns allowed.
+; /usr/share/php/preload used by for RPM packages
+; /usr/local/share/php/preload may be used for local files
+ffi.preload=/usr/share/php/preload/*.h:/usr/local/share/php/preload/*.h
diff --git a/php.spec b/php.spec
index 5679f3a..e3de60b 100644
--- a/php.spec
+++ b/php.spec
@@ -52,7 +52,7 @@
 %endif
 
 %global upver        7.4.0
-%global rcver        RC4
+%global rcver        RC5
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -1146,7 +1146,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 
 # For third-party packaging:
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php/preload
 
 # install the DSO
 install -m 755 -d $RPM_BUILD_ROOT%{_httpd_moddir}
@@ -1500,9 +1500,15 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %files sodium -f files.sodium
 %endif
 %files ffi -f files.ffi
+%dir %{_datadir}/php/preload
 
 
 %changelog
+* Tue Oct 29 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC5-1
+- update to 7.4.0RC5
+- set opcache.enable_cli in provided default configuration
+- add /usr/share/php/preload as default ffi.preload configuration
+
 * Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-1
 - update to 7.4.0RC4
 
diff --git a/sources b/sources
index 23a45f1..65b11e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-7.4.0RC4.tar.xz) = 473bd7dd021d2377957799b36b410b29b6650c4813431ff27884e6b0511d4af32ed0500f241b449fefeb562538b0db81df76c14d84654c1d6faaee6e4c560a70
-SHA512 (php-7.4.0RC4.tar.xz.asc) = 0e1534f3fc2c6664b1bc97e618c51571f1cb974f539ad1221ea6e17658131a112951ae03ab53cc189257c9761d755720afa78aad35dad785b5a76eca77afd1c2
+SHA512 (php-7.4.0RC5.tar.xz) = a95c1c786ccaa4aac5d1cabc3831775a10b69e806031ddd495d271fafab54c54c3013f2193b4dabedde05047bb18f7d8491e7dee44afcb9a045c049df7ade5ee
+SHA512 (php-7.4.0RC5.tar.xz.asc) = 94a272cb3f87dd64789ccf44797de635d963a12082346146fc1354bdd9c417ad0d4a80af3f59e1808efbc47b4361457c5daf5fc9c49706ed2752b0b59f810f34