From 06e34180d7d63ae5ff48d9ae7fb18fb7986d4a1d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 24 Aug 2017 14:09:57 +0200
Subject: disable httpd MPM check

---
 failed.txt | 10 ++++++++--
 php.spec   | 22 ++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/failed.txt b/failed.txt
index 31ac844..489df21 100644
--- a/failed.txt
+++ b/failed.txt
@@ -8,9 +8,15 @@ $ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc25x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc26x/build.log:Tests failed    :    0
+/var/lib/mock/scl70fc27x/build.log:Tests failed    :    1
 
 
+fc27x
+	4	substr_compare() [ext/standard/tests/strings/substr_compare.phpt]
 
 
-(1)	proc_open give erratic test results :(
-(2)	fixed upstream
+1	proc_open give erratic test results :(
+2	fixed upstream
+3	test issue
+4	fixed upstream
+5	need investigation
diff --git a/php.spec b/php.spec
index 901b324..b328abf 100644
--- a/php.spec
+++ b/php.spec
@@ -1,3 +1,4 @@
+# remirepo spec file for php70-php
 # with SCL and backport stuff, adapted from
 #
 # Fedora spec file for php
@@ -89,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
@@ -162,7 +159,8 @@ Source51: opcache-default.blacklist
 Source52: 20-oci8.ini
 
 # Build fixes
-Patch1: php-7.0.17-interbase.patch
+Patch1: php-7.1.7-httpd.patch
+Patch2: php-7.0.17-interbase.patch
 Patch5: php-7.0.0-includedir.patch
 Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
@@ -870,7 +868,8 @@ support for JavaScript Object Notation (JSON) to PHP.
 %setup -q -n php-%{upver}%{?rcver}
 %endif
 
-%patch1 -p1 -b .fb_config
+%patch1 -p1 -b .mpmcheck
+%patch2 -p1 -b .fb_config
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -1042,17 +1041,11 @@ exit 1
 
 %build
 # 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
@@ -1403,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
@@ -1813,6 +1808,9 @@ fi
 
 
 %changelog
+* Wed Aug 16 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23~RC1-2
+- disable httpd MPM check
+
 * Tue Aug 15 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23~RC1-1
 - Update to 7.0.23RC1
 - oci8 version is now 2.1.7
-- 
cgit