add /usr/share/php/preload as default ffi.preload configuration

2 files changed, 12 insertions, 3 deletions

diff --git a/20-ffi.ini b/20-ffi.ini
index a4e30cc..0bce40d 100644
--- a/20-ffi.ini
+++ b/20-ffi.ini
@@ -8,4 +8,6 @@ extension=ffi
 ;ffi.enable=preload
 
 ; List of headers files to preload, wildcard patterns allowed.
-;ffi.preload=
+; /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 35ac5cc..9c2b6f4 100644
--- a/php.spec
+++ b/php.spec
@@ -19,6 +19,7 @@
 %global _root_libdir      %{_libdir}
 %global _root_prefix      %{_prefix}
 %global _root_initddir    %{_initddir}
+%global _root_datadir     %{_datadir}
 %endif
 
 # API/ABI check
@@ -108,7 +109,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 31%{?dist}
+Release: 32%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -1066,6 +1067,8 @@ cp %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} .
 
 sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
     -i 10-opcache.ini
+sed -e 's:%{_root_datadir}:%{_datadir}:' \
+    -i 20-ffi.ini
 
 %if 0%{!?scl:1}
 : SCL macro not defined
@@ -1348,7 +1351,7 @@ sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
     -i $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}
@@ -1803,9 +1806,13 @@ fi
 %files json -f files.json
 %files sodium -f files.sodium
 %files ffi -f files.ffi
+%dir %{_datadir}/php/preload
 
 
 %changelog
+* Fri Oct 25 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-32
+- add /usr/share/php/preload as default ffi.preload configuration
+
 * Thu Oct 24 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-31
 - allow wildcards in ffi.preload