From 36c09dd4b4093c751e8d0932dabfdfae19918fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 23 Dec 2024 10:17:33 +0100 Subject: [PATCH] Upgrade to Ruby 3.4.0 (a11bb36316) --- ...3.0-Disable-syntax-suggest-test-case.patch | 2 +- ruby-3.4.0-ssl-fix-flaky-test-case.patch | 32 ------------------- ruby.spec | 21 +++++------- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 ruby-3.4.0-ssl-fix-flaky-test-case.patch diff --git a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch index e82069a..10679ee 100644 --- a/ruby-3.3.0-Disable-syntax-suggest-test-case.patch +++ b/ruby-3.3.0-Disable-syntax-suggest-test-case.patch @@ -12,7 +12,7 @@ diff --git a/common.mk b/common.mk index d55d1788aa..73755f6ccd 100644 --- a/common.mk +++ b/common.mk -@@ -1654,8 +1654,6 @@ no-test-bundled-gems-spec: +@@ -1662,8 +1662,6 @@ no-test-bundled-gems-spec: test-syntax-suggest: diff --git a/ruby-3.4.0-ssl-fix-flaky-test-case.patch b/ruby-3.4.0-ssl-fix-flaky-test-case.patch deleted file mode 100644 index 4ff20a6..0000000 --- a/ruby-3.4.0-ssl-fix-flaky-test-case.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 210ba0334ad15bf1219ea3c93ac45581c5abc20e Mon Sep 17 00:00:00 2001 -From: Kazuki Yamaguchi -Date: Fri, 20 Dec 2024 20:48:54 +0900 -Subject: [PATCH] ssl: fix flaky test case - test_ctx_client_session_cb_tls13_exception - -In the test case, the client raises an exception in the session_new_cb -and may not cleanly close the connection. Let's ignore exceptions raised -at the server side. - -Fixes: https://github.com/ruby/openssl/issues/828 ---- - test/openssl/test_ssl_session.rb | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb -index d9b49a20..25ba6a8c 100644 ---- a/test/openssl/test_ssl_session.rb -+++ b/test/openssl/test_ssl_session.rb -@@ -277,7 +277,11 @@ def test_ctx_client_session_cb_tls13_exception - omit "TLS 1.3 not supported" unless tls13_supported? - omit "LibreSSL does not call session_new_cb in TLS 1.3" if libressl? - -- start_server do |port| -+ server_proc = lambda do |ctx, ssl| -+ readwrite_loop(ctx, ssl) -+ rescue SystemCallError, OpenSSL::SSL::SSLError -+ end -+ start_server(server_proc: server_proc) do |port| - ctx = OpenSSL::SSL::SSLContext.new - ctx.min_version = :TLS1_3 - ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT diff --git a/ruby.spec b/ruby.spec index 49c5820..891cecf 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ %dnl %global milestone preview2 # Keep the revision enabled for pre-releases from GIT. -%global revision 335bba0fde +%global revision a11bb36316 %global ruby_archive %{name}-%{ruby_version} @@ -71,7 +71,7 @@ %global net_http_version 0.6.0 %global net_protocol_version 0.2.2 %global open3_version 0.2.1 -%global openssl_version 3.2.0 +%global openssl_version 3.3.0 %global open_uri_version 0.5.0 %global optparse_version 0.6.0 %global ostruct_version 0.6.1 @@ -116,12 +116,12 @@ %global abbrev_version 0.1.2 %global base64_version 0.2.0 %global bigdecimal_version 3.1.8 -%global csv_version 3.3.1 +%global csv_version 3.3.2 %global debug_version 1.10.0 %global drb_version 2.2.1 %global getoptlong_version 0.2.1 %global net_ftp_version 0.3.8 -%global net_imap_version 0.5.2 +%global net_imap_version 0.5.4 %global net_pop_version 0.1.2 %global net_smtp_version 0.5.0 %global nkf_version 0.2.0 @@ -129,11 +129,11 @@ %global minitest_version 5.25.4 %global mutex_m_version 0.3.0 %global observer_version 0.1.2 -%global power_assert_version 2.0.4 +%global power_assert_version 2.0.5 %global prime_version 0.1.3 %global racc_version 1.8.1 %global rake_version 13.2.1 -%global rbs_version 3.7.0 +%global rbs_version 3.8.0.pre.1 %global repl_type_completor_version 0.1.9 %global resolv_replace_version 0.1.1 %global rexml_version 3.4.0 @@ -280,10 +280,6 @@ Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch # Disable syntax_suggest test suite, which tries to download its dependencies. # https://bugs.ruby-lang.org/issues/19297 Patch9: ruby-3.3.0-Disable-syntax-suggest-test-case.patch -# Fix `OpenSSL::TestSSLSession#test_ctx_client_session_cb_tls13_exception` test -# failure on i686. -# https://github.com/ruby/openssl/pull/829 -Patch10: ruby-3.4.0-ssl-fix-flaky-test-case.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?with_rubypick:Suggests: rubypick} @@ -776,7 +772,6 @@ analysis result in RBS format, a standard type description format for Ruby %patch 4 -p1 %patch 6 -p1 %patch 9 -p1 -%patch 10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1871,8 +1866,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Thu Dec 19 2024 Vít Ondruch - 3.4.0-18 -- Upgrade to Ruby 3.4.0 (335bba0fde) +* Mon Dec 23 2024 Vít Ondruch - 3.4.0-18 +- Upgrade to Ruby 3.4.0 (a11bb36316) * Mon Dec 16 2024 Jun Aruga - 3.3.6-18 - Fix Ruby OpenSSL to respect crypto-policies TLS minimal version.