summaryrefslogtreecommitdiffstats
path: root/php70.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-11-30 07:21:07 +0100
committerRemi Collet <fedora@famillecollet.com>2015-11-30 07:21:07 +0100
commit19e0899efcba24f1c120e824baa39ef56b3ee1d5 (patch)
treef9d58190adfb0fb86067fbc3b83223ab4351a595 /php70.spec
parent05c54474ecb91b7872f948db37d63743d09307b4 (diff)
php 7: set opcache.huge_code_pages=0 on EL-6
Diffstat (limited to 'php70.spec')
-rw-r--r--php70.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/php70.spec b/php70.spec
index 1487fd4..2056cee 100644
--- a/php70.spec
+++ b/php70.spec
@@ -133,7 +133,7 @@
%endif
%global rcver RC8
-%global rpmrel 15
+%global rpmrel 16
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -192,7 +192,6 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-upstream.patch
# Security fixes (200+)
@@ -969,7 +968,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .upstream
# security patches
@@ -1107,8 +1105,10 @@ echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles
# Some extensions have their own configuration file
cp %{SOURCE50} 10-opcache.ini
%ifarch x86_64
+%if 0%{?rhel} != 6
sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini
%endif
+%endif
cp %{SOURCE52} 20-oci8.ini
# Regenerated bison files
@@ -2006,8 +2006,9 @@ fi
%changelog
-* Fri Nov 27 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.15.RC8
-- test build
+* Mon Nov 30 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.16.RC8
+- set opcache.huge_code_pages=0 on EL-6
+ see https://bugs.php.net/70973 and https://bugs.php.net/70977
* Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.12.RC8
- Update to 7.0.0RC8