From 79da1beefb237eeae495337d21eab1d83cd35211 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 24 Aug 2017 07:52:23 +0200
Subject: disable httpd MPM check

---
 failed.txt |  4 ++++
 php.spec   | 23 ++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/failed.txt b/failed.txt
index 8554c6f..5a7fb40 100644
--- a/failed.txt
+++ b/failed.txt
@@ -8,12 +8,16 @@ $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc25x/build.log:Tests failed    :    1
 /var/lib/mock/scl70fc26x/build.log:Tests failed    :    0
+/var/lib/mock/scl70fc27x/build.log:Tests failed    :    1
 
 
 fc25x
 	1	Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+fc27x
+	5	substr_compare() [ext/standard/tests/strings/substr_compare.phpt]
 
 
 1	proc_open give erratic test results :(
 2	test issue (fixed upstream)
 3	known issue
+5	need investigation
diff --git a/php.spec b/php.spec
index 559c2f9..e3359f0 100644
--- a/php.spec
+++ b/php.spec
@@ -90,11 +90,7 @@
 %global isasuffix %nil
 %endif
 
-%if 0%{?fedora} < 12 && 0%{?rhel} < 6
-%global with_dtrace 0
-%else
 %global with_dtrace 1
-%endif
 
 # build with system libgd (gd-last in remi repo)
 %global  with_libgd 1
@@ -130,7 +126,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -162,6 +158,7 @@ Source51: opcache-default.blacklist
 Source52: 20-oci8.ini
 
 # Build fixes
+Patch1: php-7.1.7-httpd.patch
 Patch5: php-7.0.0-includedir.patch
 Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
@@ -868,6 +865,7 @@ support for JavaScript Object Notation (JSON) to PHP.
 %setup -q -n php-%{upver}%{?rcver}
 %endif
 
+%patch1 -p1 -b .mpmcheck
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -877,7 +875,7 @@ support for JavaScript Object Notation (JSON) to PHP.
 %endif
 
 %patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
 %endif
 %patch43 -p1 -b .headers
@@ -1041,17 +1039,11 @@ exit 1
 %{?dtsenable}
 
 # aclocal workaround - to be improved
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
-%endif
 
 # Force use of system libtool:
 libtoolize --force --copy
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4
-%else
-cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4
-%endif
 
 %if 0%{?gh_date}
 # Bison files
@@ -1114,7 +1106,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_root_prefix} \
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1404,6 +1396,8 @@ sed -e 's:/run:%{_localstatedir}/run:' \
     -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \
     -e 's:/usr/sbin:%{_sbindir}:' \
     -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service
+sed -e 's/^pid/;pid/' \
+    -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
 # this folder requires systemd >= 204
 install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
 %else
@@ -1812,6 +1806,9 @@ fi
 
 
 %changelog
+* Wed Aug 16 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9~RC1-2
+- disable httpd MPM check
+
 * Wed Aug 16 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9~RC1-1
 - Update to 7.1.9RC1
 - oci8 version is now 2.1.7
-- 
cgit