summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--4203.patch38
-rw-r--r--failed.txt10
-rw-r--r--php.spec11
3 files changed, 10 insertions, 49 deletions
diff --git a/4203.patch b/4203.patch
deleted file mode 100644
index d8080bf..0000000
--- a/4203.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d3757f6620cc101c2c1e5935e2cc1cfbbcd3e658 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 29 May 2019 12:13:01 +0200
-Subject: [PATCH] keep DIR option to --with-unixODBC for old versions without
- libodbc.pc
-
----
- ext/odbc/config.m4 | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
-index 1fdce146cd63..ab0c55c247e7 100644
---- a/ext/odbc/config.m4
-+++ b/ext/odbc/config.m4
-@@ -362,9 +362,20 @@ PHP_ARG_WITH([unixODBC],,
-
- AC_MSG_CHECKING(whether to build with unixODBC support)
- if test "$PHP_UNIXODBC" != "no"; then
-- AC_MSG_RESULT(yes)
-- PKG_CHECK_MODULES([ODBC], [odbc])
-- PHP_EVAL_INCLINE($ODBC_CFLAGS)
-+ if test "$PHP_UNIXODBC" = "yes"; then
-+ AC_MSG_RESULT(yes from pkgconfig)
-+ PKG_CHECK_MODULES([ODBC], [odbc])
-+ PHP_EVAL_INCLINE($ODBC_CFLAGS)
-+ else
-+ dnl keep old DIR way for old version without libodbc.pc
-+ ODBC_INCDIR=$PHP_UNIXODBC/include
-+ ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
-+ ODBC_LFLAGS=-L$ODBC_LIBDIR
-+ ODBC_CFLAGS=-I$ODBC_INCDIR
-+ ODBC_LIBS=-lodbc
-+ PHP_ODBC_CHECK_HEADER(sqlext.h)
-+ AC_MSG_RESULT(yes in $PHP_UNIXODBC)
-+ fi
- ODBC_TYPE=unixODBC
- AC_DEFINE(HAVE_UNIXODBC,1,[ ])
- else
diff --git a/failed.txt b/failed.txt
index 12639c9..bc74d81 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,17 +1,15 @@
-===== 7.4.0-dev 20190520
+===== 7.4.0-dev 20190605
$ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log
/var/lib/mock/scl74el7x/build.log:Tests failed : 1
/var/lib/mock/scl74el8x/build.log:Tests failed : 16
-/var/lib/mock/scl74fc29x/build.log:Tests failed : 2
-/var/lib/mock/scl74fc30x/build.log:Tests failed : 2
+/var/lib/mock/scl74fc29x/build.log:Tests failed : 1
+/var/lib/mock/scl74fc30x/build.log:Tests failed : 1
-el7x, fc29x, fc30x
+el7x, el8x, fc29x, fc30x
Bug #69900 Commandline input/output weird behaviour with STDIO [ext/standard/tests/streams/proc_open_bug69900.phpt]
-fc29x, fc30x
- TLS server rate-limits client-initiated renegotiation [ext/openssl/tests/stream_server_reneg_limit.phpt]
(1) proc_open give erratic test results :(
diff --git a/php.spec b/php.spec
index 8400270..9bd59cb 100644
--- a/php.spec
+++ b/php.spec
@@ -96,9 +96,9 @@
%global with_zip 0
-%global gh_commit b06f05bf4782c4c7110f9d974db1b70c4cda36c0
+%global gh_commit 8f854c109927019192721a890ed7f201db1e2f87
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20190529
+%global gh_date 20190605
%global gh_owner php
%global gh_project php-src
%global upver 7.4.0
@@ -108,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-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
@@ -172,7 +172,6 @@ Patch91: php-7.2.0-oci8conf.patch
Patch300: php-7.0.10-datetests.patch
# WIP
-Patch400: https://patch-diff.githubusercontent.com/raw/php/php-src/pull/4203.patch
BuildRequires: bzip2-devel
BuildRequires: pkgconfig(libcurl) >= 7.15.5
@@ -945,7 +944,6 @@ in pure PHP.
%patch300 -p1 -b .datetests
# WIP patch
-%patch400 -p1 -b .pr4203
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1798,6 +1796,9 @@ fi
%changelog
+* Wed Jun 5 2019 Remi Collet <remi@remirepo.net> - 7.4.0~DEV.20190605-6
+- new snapshot
+
* Wed May 29 2019 Remi Collet <remi@remirepo.net> - 7.4.0~DEV.20190529-5
- new snapshot
- bump ABI version