summaryrefslogtreecommitdiffstats
path: root/php70.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php70.spec')
-rw-r--r--php70.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/php70.spec b/php70.spec
index 17ffac0..c7ad9ca 100644
--- a/php70.spec
+++ b/php70.spec
@@ -112,7 +112,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: 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
@@ -168,6 +168,7 @@ Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
Patch102: php-openssl-cert.patch
+Patch103: php-bug76846.patch
# Security fixes (200+)
Patch200: php-bug77242.patch
@@ -1014,7 +1015,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
%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
@@ -1028,6 +1029,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
# upstream patches
%patch102 -p1 -b .up3
+%patch103 -p1 -b .bug76846
# security patches
%patch200 -p1 -b .bug77242
@@ -1086,6 +1088,9 @@ mkdir build-cgi build-apache build-embedded \
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
# Should be skipped but fails sometime
rm ext/standard/tests/file/file_get_contents_error001.phpt
# fails sometime
@@ -1270,7 +1275,7 @@ ln -sf ../configure
--with-layout=GNU \
--with-kerberos \
--with-libxml-dir=%{_prefix} \
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
--with-system-tzdata \
%endif
--with-mhash \
@@ -2065,6 +2070,9 @@ fi
%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