php 7+: disable pcre.jit as it raise selinux AVC

2 files changed, 3 insertions, 7 deletions

diff --git a/php.ini b/php.ini
index 569e807..a21ead4 100644
--- a/php.ini
+++ b/php.ini
@@ -941,7 +941,7 @@ cli_server.color = On
 
 ;Enables or disables JIT compilation of patterns. This requires the PCRE
 ;library to be compiled with JIT support.
-;pcre.jit=1
+pcre.jit=0
 
 [Pdo]
 ; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
diff --git a/php70.spec b/php70.spec
index 869e9c2..8268de5 100644
--- a/php70.spec
+++ b/php70.spec
@@ -1513,12 +1513,6 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install -m 755 -d $RPM_BUILD_ROOT%{_httpd_contentdir}/icons
 install -m 644 php.gif $RPM_BUILD_ROOT%{_httpd_contentdir}/icons/php.gif
 
-%if %{with_libpcre}
-if ! pkg-config libpcre --atleast-version 8.38 ; then
-   sed -e 's/;pcre.jit=1/pcre.jit=0/' -i $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-fi
-%endif
-
 # For third-party packaging:
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php
 
@@ -1994,6 +1988,8 @@ fi
 
 
 %changelog
+- disable pcre.jit everywhere as it raise AVC #1398474
+
 * Wed Nov 23 2016 Remi Collet <remi@fedoraproject.org> 7.0.14-0.1.RC1
 - Update to 7.0.14RC1