summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-04-02 18:12:04 +0200
committerRemi Collet <remi@remirepo.net>2019-04-02 18:12:04 +0200
commit98d79f6a9b90d7ab5c3f1c9a4657df9c2618027d (patch)
treed76e60cb23bfe082c8f54b251df05a7104f09bbe
parentd4111b29d6738b9bebb07e09cb71e9dfc71e67f0 (diff)
Update to 7.1.28 - http://www.php.net/releases/7_1_28.php
-rw-r--r--failed.txt2
-rw-r--r--php-openssl111.patch29
-rw-r--r--php71.spec7
3 files changed, 5 insertions, 33 deletions
diff --git a/failed.txt b/failed.txt
index ce330e8..44d964b 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.27 (2019-03-07)
+===== 7.1.28 (2019-04-04)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
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/php71.spec b/php71.spec
index 43603ad..e25ffff 100644
--- a/php71.spec
+++ b/php71.spec
@@ -107,7 +107,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: php
@@ -170,7 +170,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+)
@@ -1024,7 +1023,6 @@ support for JavaScript Object Notation (JSON) to PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .up
# security patches
@@ -2069,6 +2067,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