From 7e78bc09b6c2bf1ba7fa8be5e9087d3574bec2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 7 Dec 2023 15:52:12 +0100 Subject: [PATCH] Upgrade to Ruby 3.3.0 (071df40495). --- ruby-2.7.0-Initialize-ABRT-hook.patch | 4 +-- ...3.0-Disable-syntax-suggest-test-case.patch | 2 +- ...sable-user-installation-info-message.patch | 24 -------------- ruby.spec | 33 +++++++++---------- 4 files changed, 19 insertions(+), 44 deletions(-) delete mode 100644 ruby-3.3.0-Disable-user-installation-info-message.patch diff --git a/ruby-2.7.0-Initialize-ABRT-hook.patch b/ruby-2.7.0-Initialize-ABRT-hook.patch index f5f3c10..0bf1064 100644 --- a/ruby-2.7.0-Initialize-ABRT-hook.patch +++ b/ruby-2.7.0-Initialize-ABRT-hook.patch @@ -44,7 +44,7 @@ diff --git a/common.mk b/common.mk index b2e5b2b6d0..f39f81da5c 100644 --- a/common.mk +++ b/common.mk -@@ -119,7 +119,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ +@@ -111,7 +111,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ prism/prism.$(OBJEXT) \ prism_init.$(OBJEXT) @@ -58,7 +58,7 @@ diff --git a/ruby.c b/ruby.c index 60c57d6259..1eec16f2c8 100644 --- a/ruby.c +++ b/ruby.c -@@ -1725,10 +1725,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) +@@ -1708,10 +1708,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) void Init_builtin_features(void); 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 0a457b9..5d19294 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 -@@ -1598,8 +1598,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) +@@ -1590,8 +1590,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) $(ACTIONS_ENDGROUP) no-test-syntax-suggest: diff --git a/ruby-3.3.0-Disable-user-installation-info-message.patch b/ruby-3.3.0-Disable-user-installation-info-message.patch deleted file mode 100644 index 3e1b9e4..0000000 --- a/ruby-3.3.0-Disable-user-installation-info-message.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f0b10ff12a6de98b8e1f787f79d4a0f0e995bf40 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Tue, 24 Oct 2023 12:57:32 +0200 -Subject: [PATCH] Disable "user installation" info message. - -This is reported by every command (at least in build root), pollutes -their output and therefore breaks things. ---- - lib/rubygems/command.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb -index 01deac6890..4f82a2755a 100644 ---- a/lib/rubygems/command.rb -+++ b/lib/rubygems/command.rb -@@ -324,7 +324,7 @@ def invoke_with_build_args(args, build_args) - @when_invoked.call options - else - if Gem.paths.auto_user_install && !options[:install_dir] && !options[:user_install] -- self.ui.say "Defaulting to user installation because default installation directory (#{Gem.default_dir}) is not writable." -+ # self.ui.say "Defaulting to user installation because default installation directory (#{Gem.default_dir}) is not writable." - end - - execute diff --git a/ruby.spec b/ruby.spec index 0186f5c..f037e00 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from GIT. -%global revision 79eb75a8dd +%global revision 071df40495 %global ruby_archive %{name}-%{ruby_version} @@ -45,7 +45,7 @@ %global abbrev_version 0.1.1 %global base64_version 0.2.0 %global benchmark_version 0.3.0 -%global cgi_version 0.4.0 +%global cgi_version 0.4.1 %global csv_version 3.2.8 %global date_version 3.3.4 %global delegate_version 0.3.1 @@ -73,7 +73,7 @@ %global observer_version 0.1.2 %global open3_version 0.2.0 %global openssl_version 3.2.0 -%global open_uri_version 0.4.0 +%global open_uri_version 0.4.1 %global optparse_version 0.4.0 %global ostruct_version 0.6.0 %global pathname_version 0.3.0 @@ -94,7 +94,7 @@ %global strscan_version 3.0.8 %global syntax_suggest_version 1.1.0 %global syslog_version 0.1.1 -%global tempfile_version 0.2.0 +%global tempfile_version 0.2.1 %global time_version 0.3.0 %global timeout_version 0.4.1 %global tmpdir_version 0.2.0 @@ -110,10 +110,10 @@ # Gemified default gems. %global bigdecimal_version 3.1.5 %global io_console_version 0.6.1.dev.1 -%global irb_version 1.9.1 -%global json_version 2.6.3 +%global irb_version 1.10.1 +%global json_version 2.7.1 %global psych_version 5.1.1.1 -%global rdoc_version 6.6.0 +%global rdoc_version 6.6.1 # Bundled gems. %global minitest_version 5.20.0 @@ -122,8 +122,8 @@ %global test_unit_version 3.6.1 %global rexml_version 3.2.6 %global rss_version 0.3.0 -%global net_ftp_version 0.2.0 -%global net_imap_version 0.4.6 +%global net_ftp_version 0.3.0 +%global net_imap_version 0.4.7 %global net_pop_version 0.1.2 %global net_smtp_version 0.4.0 %global matrix_version 0.4.2 @@ -228,11 +228,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 -# The "Defaulting to user installation" message pollutes output various gem -# commands, including `gem spec` output. This in turn break build of rubygem- -# packages. Disable the message for now. -# https://github.com/rubygems/rubygems/issues/7082 -Patch10: ruby-3.3.0-Disable-user-installation-info-message.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?with_rubypick:Suggests: rubypick} @@ -656,7 +651,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} . @@ -981,6 +975,11 @@ MSPECOPTS="" # Avoid `hostname' dependency. %{!?with_hostname:MSPECOPTS="-P 'Socket.gethostname returns the host name'"} +# Disable several network dependent test cases, broken likely by +# https://github.com/ruby/ruby/pull/7295 +# https://bugs.ruby-lang.org/issues/20048 +MSPECOPTS="$MSPECOPTS -P 'UDPSocket#.*_address using IPv. using an implicit hostname the returned Addrinfo uses the correct IP address'" + # Give an option to increase the timeout in tests. # https://bugs.ruby-lang.org/issues/16921 %{?test_timeout_scale:RUBY_TEST_TIMEOUT_SCALE="%{test_timeout_scale}"} \ @@ -1554,8 +1553,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Wed Nov 29 2023 Vít Ondruch - 3.3.0-184 -- Upgrade to Ruby 3.3.0 (79eb75a8dd). +* Thu Dec 07 2023 Vít Ondruch - 3.3.0-184 +- Upgrade to Ruby 3.3.0 (071df40495). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters