summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index b6b1408..d0a40ed 100644
--- a/php.spec
+++ b/php.spec
@@ -128,7 +128,7 @@
%endif
%global rcver RC1
-%global rpmrel 1
+%global rpmrel 2
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -196,6 +196,8 @@ Patch91: php-5.6.3-oci8conf.patch
Patch300: php-5.6.3-datetests.patch
# Revert changes for pcre < 8.34
Patch301: php-5.6.0-oldpcre.patch
+# Backported from 7.0
+Patch302: php-5.6.8-openssltests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -893,6 +895,7 @@ support for using the enchant library to PHP.
%patch301 -p1 -b .pcre834
%endif
%endif
+%patch302 -p1 -b .sslv3
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1776,6 +1779,9 @@ fi
%changelog
+* Fri Apr 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.8-0.2.RC1
+- add upstream patch to drop SSLv3 tests
+
* Wed Apr 1 2015 Remi Collet <remi@fedoraproject.org> 5.6.8-0.1.RC1
- update to 5.6.8RC1