summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php72.spec20
2 files changed, 12 insertions, 10 deletions
diff --git a/failed.txt b/failed.txt
index 2cb988c..b243013 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.2.13 (2018-12-06)
+===== 7.2.14RC1 (2018-12-20)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
diff --git a/php72.spec b/php72.spec
index 686938e..465e607 100644
--- a/php72.spec
+++ b/php72.spec
@@ -13,7 +13,7 @@
%global pdover 20170320
# Extension version
%global fileinfover 1.0.5
-%global oci8ver 2.1.8
+%global oci8ver 2.2.0
%global zipver 1.13.0
%global jsonver 1.6.0
@@ -118,13 +118,13 @@
%global db_devel libdb-devel
%endif
-%global upver 7.2.13
-#global rcver RC1
+%global upver 7.2.14
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -184,7 +184,6 @@ Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
# Security fixes (200+)
-Patch200: php-imap.patch
# Fixes for tests (300+)
# Factory is droped from system tzdata
@@ -685,10 +684,10 @@ BuildRequires: oracle-instantclient-devel >= %{oraclever}
Requires: php-pdo%{?_isa} = %{version}-%{release}
Provides: php_database
Provides: php-pdo_oci, php-pdo_oci%{?_isa}
-Obsoletes: php-pecl-oci8 < %{oci8ver}
-Conflicts: php-pecl-oci8 >= %{oci8ver}
+Obsoletes: php-pecl-oci8 <= %{oci8ver}
+Conflicts: php-pecl-oci8 > %{oci8ver}
Provides: php-pecl(oci8) = %{oci8ver}, php-pecl(oci8)%{?_isa} = %{oci8ver}
-# Should requires libclntsh.so.12.1, but it's not provided by Oracle RPM.
+# Should requires libclntsh.so.18.3, but it's not provided by Oracle RPM.
AutoReq: 0
%if 0%{?rhel}
Obsoletes: php53-oci8, php53u-oci8, php54-oci8, php54w-oci8, php55u-oci8, php55w-oci8, php56u-oci8, php56w-oci8
@@ -1099,7 +1098,6 @@ low-level PHP extension for the libsodium cryptographic library.
# upstream patches
# security patches
-%patch200 -p1 -b .imap
# Fixes for tests
%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -2166,6 +2164,10 @@ fi
%changelog
+* Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 7.2.14~RC1-1
+- update to 7.2.14RC1
+- oci8 version is now 2.2.0
+
* Sat Dec 8 2018 Remi Collet <remi@remirepo.net> - 7.2.13-2
- Fix null pointer dereference in imap_mail CVE-2018-19935