summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-04-02 17:38:55 +0200
committerRemi Collet <remi@remirepo.net>2019-04-02 17:38:55 +0200
commit9f4c00a0f417ad357f2b5435d5a90174dda64981 (patch)
treeb0627dff38729d51be864fcbf0c99613978ffbaa
parent2e9bd3dc61b9b92cd5adb8e5ffe08b22faf2272e (diff)
Update to 7.1.28 - http://www.php.net/releases/7_1_28.php
-rw-r--r--failed.txt4
-rw-r--r--php-openssl111.patch29
-rw-r--r--php.spec7
3 files changed, 6 insertions, 34 deletions
diff --git a/failed.txt b/failed.txt
index db3ebb3..a9f43d6 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,10 +1,10 @@
-===== 7.1.27 (2019-03-07)
+===== 7.1.28 (2019-04-04)
$ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
/var/lib/mock/scl71el6x/build.log:Tests failed : 0
/var/lib/mock/scl71el7x/build.log:Tests failed : 0
-/var/lib/mock/scl71el8x/build.log:Tests failed : 53
+/var/lib/mock/scl71el8x/build.log:Tests failed : 28
/var/lib/mock/scl71fc27x/build.log:Tests failed : 0
/var/lib/mock/scl71fc28x/build.log:Tests failed : 3
/var/lib/mock/scl71fc29x/build.log:Tests failed : 4
diff --git a/php-openssl111.patch b/php-openssl111.patch
deleted file mode 100644
index ea43711..0000000
--- a/php-openssl111.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 19a44ffb7be91344550fa700830b8e62a73031ba Mon Sep 17 00:00:00 2001
-From: Anatol Belski <ab@php.net>
-Date: Thu, 28 Feb 2019 12:48:47 +0100
-Subject: [PATCH] Sync with behavior change in OpenSSL 1.1.1b
-
-A behavior change in revealed by some openssl_decrypt() based test,
-where an encrypt API is used with a decrypt context. The EVP_Cipher*
-functions will automatically choose the right operation depending on the
-context passed.
----
- ext/openssl/openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 871a30c..7df5072 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -6494,7 +6494,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
- {
- int i = 0;
-
-- if (mode->is_single_run_aead && !EVP_EncryptUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
-+ if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
- php_openssl_store_errors();
- php_error_docref(NULL, E_WARNING, "Setting of data length failed");
- return FAILURE;
---
-2.1.4
-
diff --git a/php.spec b/php.spec
index d687613..b14783b 100644
--- a/php.spec
+++ b/php.spec
@@ -125,7 +125,7 @@
%global db_devel libdb-devel
%endif
-%global upver 7.1.27
+%global upver 7.1.28
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -189,7 +189,6 @@ Patch49: php-7.1.24-getallheaders.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-openssl111.patch
# Security fixes (200+)
@@ -918,7 +917,6 @@ support for JavaScript Object Notation (JSON) to PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .up
# security patches
@@ -1861,6 +1859,9 @@ fi
%changelog
+* Tue Apr 2 2019 Remi Collet <remi@remirepo.net> - 7.1.28-1
+- Update to 7.1.28 - http://www.php.net/releases/7_1_28.php
+
* Wed Mar 6 2019 Remi Collet <remi@remirepo.net> - 7.1.27-1
- Update to 7.1.27 - http://www.php.net/releases/7_1_27.php
- add upstream patch for OpenSSL 1.1.1b