summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/php.spec b/php.spec
index d3fb990..2d5f130 100644
--- a/php.spec
+++ b/php.spec
@@ -131,7 +131,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 5%{?dist}
+Release: 6%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -193,6 +193,7 @@ Patch91: php-5.6.3-oci8conf.patch
Patch100: https://github.com/php/php-src/commit/be50a72715c141befe6f34ece660745da894aaf3.patch
Patch101: https://github.com/php/php-src/commit/2ef8809ef3beb5f58b81dcff49bdcde4d2cb8426.patch
Patch102: php-openssl-cert.patch
+Patch103: php-bug76846.patch
# Security fixes (200+)
Patch200: php-bug77242.patch
@@ -924,7 +925,7 @@ support for JavaScript Object Notation (JSON) to PHP.
%endif
%patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
%patch42 -p1 -b .systzdata
%endif
%patch43 -p1 -b .headers
@@ -940,6 +941,7 @@ support for JavaScript Object Notation (JSON) to PHP.
%patch100 -p1 -b .up1
%patch101 -p1 -b .up2
%patch102 -p1 -b .up3
+%patch103 -p1 -b .bug76846
# security patches
%patch200 -p1 -b .bug77242
@@ -998,6 +1000,9 @@ mkdir \
rm ext/date/tests/timezone_location_get.phpt
rm ext/date/tests/timezone_version_get.phpt
rm ext/date/tests/timezone_version_get_basic1.phpt
+rm ext/date/tests/bug33414-1.phpt
+rm ext/date/tests/bug33415-2.phpt
+rm ext/date/tests/date_modify-1.phpt
# fails sometime
rm ext/sockets/tests/mcast_ipv?_recv.phpt
# Should be skipped but fails sometime
@@ -1172,7 +1177,7 @@ ln -sf ../configure
--with-layout=GNU \
--with-kerberos \
--with-libxml-dir=%{_root_prefix} \
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
--with-system-tzdata \
%endif
--with-mhash \
@@ -1908,6 +1913,9 @@ EOF
%changelog
+* Fri Mar 15 2019 Remi Collet <remi@remirepo.net> - 7.0.33-6
+- Fix #76846 Segfault in shutdown function after memory limit error
+
* Tue Mar 5 2019 Remi Collet <remi@remirepo.net> - 7.0.33-5
- Fix #77630 rename() across the device may allow unwanted access
during processing