summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php-timelib.patch30
-rw-r--r--php-upstream.patch30
-rw-r--r--php.spec12
4 files changed, 6 insertions, 68 deletions
diff --git a/failed.txt b/failed.txt
index 788a4e9..53ffdef 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.0RC1 (2017-08-31)
+===== 7.1.0RC2 (2017-09-14)
$ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
/var/lib/mock/scl72el6x/build.log:Tests failed : 0
diff --git a/php-timelib.patch b/php-timelib.patch
deleted file mode 100644
index dd8d8cf..0000000
--- a/php-timelib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/timelib_private.h b/timelib_private.h
-index cd402e0..efc7c80 100644
---- a/ext/date/lib/timelib_private.h
-+++ b/ext/date/lib/timelib_private.h
-@@ -115,7 +115,7 @@
- m = NULL; \
- }
-
--typedef struct ttinfo
-+struct ttinfo
- {
- int32_t offset;
- int isdst;
-@@ -123,13 +123,13 @@ typedef struct ttinfo
-
- unsigned int isstdcnt;
- unsigned int isgmtcnt;
--} ttinfo;
-+};
-
--typedef struct tlinfo
-+struct tlinfo
- {
- int32_t trans;
- int32_t offset;
--} tlinfo;
-+};
-
-
- #ifndef LONG_MAX
diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index 448fd7c..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3239f6d6798d86fdbf8e03aa741d9990bcfffe79 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 31 Aug 2017 07:55:45 +0200
-Subject: [PATCH] move AC_DEFINE in the right position (in bundled lib
- conditon)
-
----
- ext/sqlite3/config0.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
-index 0e5fbc5..78fd622 100644
---- a/ext/sqlite3/config0.m4
-+++ b/ext/sqlite3/config0.m4
-@@ -85,11 +85,11 @@ if test $PHP_SQLITE3 != "no"; then
- other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
- fi
-
-+ AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function])
- PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
- PHP_INSTALL_HEADERS([ext/sqlite3/libsqlite/sqlite3.h])
- fi
-
-- AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function])
- AC_DEFINE(HAVE_SQLITE3,1,[ ])
-
- sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
---
-2.1.4
-
diff --git a/php.spec b/php.spec
index d21075d..5af48f0 100644
--- a/php.spec
+++ b/php.spec
@@ -129,8 +129,8 @@
#global gh_date 20170828
%global gh_owner php
%global gh_project php-src
-%global rcver RC1
-%global rpmrel 22
+%global rcver RC2
+%global rpmrel 23
Summary: PHP scripting language for creating dynamic web sites
@@ -178,8 +178,6 @@ Patch6: php-5.6.3-embed.patch
Patch7: php-5.3.0-recode.patch
Patch8: php-7.1.0-libdb.patch
Patch9: php-7.0.7-curl.patch
-# From https://github.com/derickr/timelib/pull/21
-Patch10: php-timelib.patch
# Functional changes
Patch40: php-7.1.3-dlopen.patch
@@ -197,7 +195,6 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-upstream.patch
# Security fixes (200+)
@@ -910,7 +907,6 @@ low-level PHP extension for the libsodium cryptographic library.
%if 0%{?rhel}
%patch9 -p1 -b .curltls
%endif
-%patch10 -p1 -b .timelib
%patch40 -p1 -b .dlopen
%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
@@ -926,7 +922,6 @@ low-level PHP extension for the libsodium cryptographic library.
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .up
# security patches
@@ -1844,6 +1839,9 @@ fi
%changelog
+* Wed Sep 13 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.23.RC2
+- update to 7.2.0RC2
+
* Thu Aug 31 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0-0.22.RC1
- add patch for EL-6, fix undefined symbol: sqlite3_errstr