[packages/php/PHP_7_2] Rel 6; add workaround to https://bugs.php.net/bug.php?id=79589
arekm
arekm at pld-linux.org
Tue Mar 29 15:39:09 CEST 2022
commit 78dd457163551b76ff6358fc91590218e9048a62
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 29 15:37:59 2022 +0200
Rel 6; add workaround to https://bugs.php.net/bug.php?id=79589
openssl.patch | 24 ++++++++++++++++++++++++
php.spec | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 2951cf9..a428277 100644
--- a/php.spec
+++ b/php.spec
@@ -155,7 +155,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 7.2.34
-Release: 5
+Release: 6
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
diff --git a/openssl.patch b/openssl.patch
index d696980..ec93866 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -10,3 +10,27 @@
REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
+--- php-7.2.34/ext/openssl/xp_ssl.c.orig 2020-09-30 07:15:53.000000000 +0200
++++ php-7.2.34/ext/openssl/xp_ssl.c 2022-03-29 15:28:35.726548949 +0200
+@@ -1014,6 +1014,10 @@ static int php_openssl_get_crypto_method
+ {
+ int ssl_ctx_options = SSL_OP_ALL;
+
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #ifdef SSL_OP_NO_SSLv2
+ ssl_ctx_options |= SSL_OP_NO_SSLv2;
+ #endif
+@@ -1261,6 +1265,10 @@ static int php_openssl_set_server_specif
+ zval *zv;
+ long ssl_ctx_options = SSL_CTX_get_options(ctx);
+
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ #if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100
+ if (php_openssl_set_server_ecdh_curve(stream, ctx) == FAILURE) {
+ return FAILURE;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/78dd457163551b76ff6358fc91590218e9048a62
More information about the pld-cvs-commit
mailing list