- updated to 8.2.30, drop openssl.patch, fix php-fpm man page link

diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644 (file)
index f6748f1..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-@@ -1349,6 +1349,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;
-@@ -1686,6 +1690,10 @@ int php_openssl_setup_crypto(php_stream
-       method = sslsock->is_client ? SSLv23_client_method() : SSLv23_server_method();
-       sslsock->ctx = SSL_CTX_new(method);
- 
-+#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;

diff --git a/php.spec b/php.spec
index e63a2412df1da26ae9585d19a9f5f8f0c77d621c..8c1d01e13fe84fd23516e26dda7b67a9b98fc1ed 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       8.2.29
+Version:       8.2.30
 Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -133,7 +133,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: a3eea6306dc68b115b42b4ae8c9d0396
+# Source0-md5: d5de0732629633b2713cce81d9e327c1
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
@@ -148,8 +148,6 @@ Patch0:             %{orgname}-shared.patch
 Patch1:                %{orgname}-tld.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                intl-stdc++.patch
-# https://bugs.php.net/bug.php?id=79589
-Patch5:                openssl.patch
 Patch7:                %{orgname}-sapi-ini-file.patch
 Patch10:       %{orgname}-ini.patch
 Patch11:       embed.patch
@@ -1791,8 +1789,6 @@ cp -p php.ini-production php.ini
 %patch -P1 -p1
 %patch -P3 -p1
 %patch -P4 -p1
-%patch -P5 -p1
-
 %patch -P7 -p1
 %patch -P10 -p1
 %patch -P14 -p1
@@ -2499,7 +2495,7 @@ fi
 %service %{name}-fpm restart
 update-alternatives \
        --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} \
-       --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php-fpm%{php_suffix}.8.gz || :
+       --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php%{php_suffix}-fpm.8.gz || :
 
 %preun fpm
 if [ "$1" = "0" ]; then