summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-28 14:58:23 +0100
committerRemi Collet <remi@remirepo.net>2018-02-28 14:58:23 +0100
commitd3413a5834760e12fa271f111b4cf36ccda38945 (patch)
tree7326ba7b0332cc13941525d3ada3f3c79f3b8146
parent4f51b3559ab78393cf70aff98f42955a1d8313e3 (diff)
Update to 7.1.15 - http://www.php.net/releases/7_1_15.php
FPM: revert pid file removal
-rw-r--r--failed.txt14
-rw-r--r--php71.spec8
2 files changed, 11 insertions, 11 deletions
diff --git a/failed.txt b/failed.txt
index 42527cc..883fed9 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,12 +1,10 @@
-===== 7.1.15RC1 (2018-03-01)
+===== 7.1.15 (2018-03-01)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/el6i/build.log:Tests failed : 0
-/var/lib/mock/el6x/build.log:Tests failed : 0
-/var/lib/mock/el7x/build.log:Tests failed : 1
-/var/lib/mock/fc24i/build.log:Tests failed : 1
-/var/lib/mock/fc24x/build.log:Tests failed : 1
+/var/lib/mock/el6x/build.log:Tests failed : 1
+/var/lib/mock/el7x/build.log:Tests failed : 0
/var/lib/mock/fc25i/build.log:Tests failed : 0
/var/lib/mock/fc25x/build.log:Tests failed : 0
/var/lib/mock/fc26i/build.log:Tests failed : 1
@@ -15,10 +13,10 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/fc27x/build.log:Tests failed : 0
-el7x:
- 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
-fc24i, fc24x, fc26i:
+el6x:
1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
+fc26i:
+ 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
1 proc_open give erratic test results :(
diff --git a/php71.spec b/php71.spec
index c67ec36..4c2f56b 100644
--- a/php71.spec
+++ b/php71.spec
@@ -108,7 +108,7 @@
%endif
%global upver 7.1.15
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -1646,8 +1646,6 @@ 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 -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/php-fpm.service
@@ -2054,6 +2052,10 @@ fi
%changelog
+* Wed Feb 28 2018 Remi Collet <remi@remirepo.net> - 7.1.15-1
+- Update to 7.1.15 - http://www.php.net/releases/7_1_15.php
+- FPM: revert pid file removal
+
* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.1.15~RC1-1
- Update to 7.1.15RC1
- adapt ldap patch