F27:

- disable httpd MPM check
- php-fpm: drop unneeded "pid" from default configuration

3 files changed, 45 insertions, 28 deletions

diff --git a/failed.txt b/failed.txt
index e6efe91..fcc62e8 100644
--- a/failed.txt
+++ b/failed.txt
@@ -13,6 +13,7 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 /var/lib/mock/fc25x/build.log:Tests failed    :    0
 /var/lib/mock/fc26i/build.log:Tests failed    :    1
 /var/lib/mock/fc26x/build.log:Tests failed    :    2
+/var/lib/mock/fc27x/build.log:Tests failed    :    1
 
 
 fc26i
@@ -20,6 +21,8 @@ fc26i
 fc26x
 	5	proc_nice() basic behaviour [ext/standard/tests/general_functions/proc_nice_basic.phpt]
 	5	Check cli_process_title support on Unix [sapi/cli/tests/cli_process_title_unix.phpt]
+fc27x
+	5	substr_compare() [ext/standard/tests/strings/substr_compare.phpt]
 
 
 1	proc_open give erratic test results :(
diff --git a/php-7.1.7-httpd.patch b/php-7.1.7-httpd.patch
new file mode 100644
index 0000000..acb3d2c
--- /dev/null
+++ b/php-7.1.7-httpd.patch
@@ -0,0 +1,28 @@
+Disable MPM detection
+
+mod_php is build twice
+- as NTS without option
+- as ZTS using --enable-maintainer-zts
+
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index 2e64b21..ec4799f 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  fi
+   AC_MSG_RESULT(yes)
+   PHP_SUBST(APXS)
+ else
diff --git a/php71.spec b/php71.spec
index 4a7a7b7..4921043 100644
--- a/php71.spec
+++ b/php71.spec
@@ -52,11 +52,7 @@
 %global with_libpcre  0
 %endif
 
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %global with_sqlite3  1
-%else
-%global with_sqlite3  0
-%endif
 
 # Build ZTS extension or only NTS
 %global with_zts      1
@@ -100,17 +96,8 @@
 %global with_nginx     0
 %endif
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%global with_dtrace 1
-%else
-%global with_dtrace 0
-%endif
-%if 0%{?fedora} < 14 && 0%{?rhel} < 5
-%global with_libgd   0
-%else
+%global with_dtrace  1
 %global with_libgd   1
-%endif
-
 %global with_libzip  1
 %global with_zip     0
 
@@ -126,7 +113,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: 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
@@ -157,6 +144,7 @@ Source52: 20-oci8.ini
 Source99: php-fpm.init
 
 # 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
@@ -996,11 +984,9 @@ support for JavaScript Object Notation (JSON) to PHP.
 %prep
 : CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzip}
 
-# ensure than current httpd use prefork MPM.
-httpd -V  | grep -q 'threaded:.*yes' && exit 1
-
 %setup -q -n php-%{upver}%{?rcver}
 
+%patch1 -p1 -b .mpmcheck
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -1010,7 +996,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %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
@@ -1027,7 +1013,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 # security patches
 
 # Fixes for tests
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
 %patch300 -p1 -b .datetests
 %endif
 %if %{with_libpcre}
@@ -1176,18 +1162,12 @@ fi
 %build
 %{?dtsenable}
 
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 # aclocal workaround - to be improved
 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
 
 # Regenerate configure scripts (patches change config.m4's)
 touch configure.in
@@ -1253,7 +1233,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_prefix} \
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1658,6 +1638,8 @@ install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
 install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
 install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/php-fpm.conf
 # install systemd unit files and scripts for handling server startup
+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%{_sysconfdir}/systemd/system/php-fpm.service.d
 install -m 755 -d $RPM_BUILD_ROOT%{_unitdir}
@@ -1818,7 +1800,7 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %pre common
-%if %{?fedora}%{!?fedora:99} < 24
+%if %{?fedora}%{!?fedora:99} < 25
 echo -e "WARNING : Fedora %{fedora} is now EOL :"
 echo -e "You should consider upgrading to a supported release.\n"
 %endif
@@ -2057,6 +2039,10 @@ fi
 
 
 %changelog
+* Tue Aug 22 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9~RC1-2
+- disable httpd MPM check
+- php-fpm: drop unneeded "pid" from default configuration
+
 * 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