[packages/php/PHP_7_4] Up to 7.4.28 and workaround for https://bugs.php.net/bug.php?id=79589
arekm
arekm at pld-linux.org
Tue Mar 29 14:45:48 CEST 2022
commit a4ba6ae525245d3d9102c205f23b4515e439262e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 29 14:44:47 2022 +0200
Up to 7.4.28 and workaround for https://bugs.php.net/bug.php?id=79589
icu70.patch | 45 ---------------------------------------------
openssl.patch | 26 ++++++++++++++++++++++++++
php.spec | 8 +++-----
3 files changed, 29 insertions(+), 50 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8f91662..e131142 100644
--- a/php.spec
+++ b/php.spec
@@ -149,8 +149,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 7.4.25
-Release: 2
+Version: 7.4.28
+Release: 1
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -158,7 +158,7 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 89fbd3c0f8d4831125bc6985c5aa275c
+# Source0-md5: ca4f40f41d028465bc810c007c3ed935
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
@@ -203,7 +203,6 @@ Patch67: mysql-lib-ver-mismatch.patch
Patch68: php-mysql-ssl-context.patch
Patch71: libdb-info.patch
Patch72: openssl.patch
-Patch73: icu70.patch
URL: http://php.net/
%{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1917,7 +1916,6 @@ cp -p php.ini-production php.ini
#%patch68 -p1 DROP or update to 7.0 APIs
%patch71 -p1
%patch72 -p1
-%patch73 -p1
sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
ext/ext_skel.php \
diff --git a/icu70.patch b/icu70.patch
deleted file mode 100644
index 3460bbf..0000000
--- a/icu70.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 81b3f95622b1da2433f7d1e992c3ae6ad745e704 Mon Sep 17 00:00:00 2001
-From: Ben Ramsey <ramsey at php.net>
-Date: Tue, 19 Oct 2021 23:59:11 -0500
-Subject: [PATCH] Change UBool to bool for equality operators in ICU >= 70.1
-
-Refer to:
-- https://github.com/unicode-org/icu/commit/633438f8da99fee815e2c61626ea779a84567a3d
-- https://github.com/unicode-org/icu/commit/f6325d49ba57ec26f320b2865ce09ca47db458d9
----
- ext/intl/breakiterator/codepointiterator_internal.cpp | 4 ++++
- ext/intl/breakiterator/codepointiterator_internal.h | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp
-index bf44678efc06..143c181590e9 100644
---- a/ext/intl/breakiterator/codepointiterator_internal.cpp
-+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
-@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
- clearCurrentCharIter();
- }
-
-+#if U_ICU_VERSION_MAJOR_NUM >= 70
-+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#else
- UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#endif
- {
- if (typeid(*this) != typeid(that)) {
- return FALSE;
-diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h
-index 7ecf12deb5ae..0baf607782d0 100644
---- a/ext/intl/breakiterator/codepointiterator_internal.h
-+++ b/ext/intl/breakiterator/codepointiterator_internal.h
-@@ -39,7 +39,11 @@ namespace PHP {
-
- virtual ~CodePointBreakIterator();
-
-+#if U_ICU_VERSION_MAJOR_NUM >= 70
-+ virtual bool operator==(const BreakIterator& that) const;
-+#else
- virtual UBool operator==(const BreakIterator& that) const;
-+#endif
-
- virtual CodePointBreakIterator* clone(void) const;
-
diff --git a/openssl.patch b/openssl.patch
index d696980..33f759d 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -10,3 +10,29 @@
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);
+diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
+index 5564bf6f08..423f696c76 100644
+--- a/ext/openssl/xp_ssl.c
++++ b/ext/openssl/xp_ssl.c
+@@ -1286,6 +1286,10 @@ static int php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx
+ 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;
+@@ -1628,6 +1632,10 @@ int php_openssl_setup_crypto(php_stream *stream,
+ ssl_ctx_options = SSL_OP_ALL;
+ #endif
+
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
++ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
++#endif
++
+ if (sslsock->ctx == NULL) {
+ php_error_docref(NULL, E_WARNING, "SSL context creation failure");
+ return FAILURE;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a4ba6ae525245d3d9102c205f23b4515e439262e
More information about the pld-cvs-commit
mailing list