Upgrade to Ruby 3.2.0.

2023-01-02 15:19:45 +01:00 · 2023-01-02 15:19:45 +01:00 · e8a5d81a5b
commit e8a5d81a5b
parent 631163e3b8
4 changed files with 163 additions and 9 deletions
--- a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
+++ b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
@ -0,0 +1,76 @@
+From 5e2f8761b2342ee58f9689a7d62d48ec031e59c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 2 Jan 2023 14:30:13 +0100
+Subject: [PATCH] Revert "Fix test-syntax-suggest order"
+
+This reverts commit 18c1ca8f4c0748905d5cedb6c044df507ea8ad6a.
+---
+ common.mk     | 12 ++++--------
+ defs/gmake.mk |  2 +-
+ 2 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/common.mk b/common.mk
+index d0558697d7..e73841aae7 100644
+--- a/common.mk
+++ b/common.mk
+@@ -766,7 +766,8 @@ clean-spec: PHONY
+ 	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
+ 	-$(Q) $(RMALL) rubyspec_temp
+ 
+-check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all
+check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all \
+       $(DOT_WAIT) test-spec $(DOT_WAIT) test-syntax-suggest
+ 	$(ECHO) check succeeded
+ 	-$(Q) : : "run only on sh"; \
+ 	if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
+@@ -902,8 +903,6 @@ yes-test-spec: test-spec-precheck
+ 	$(ACTIONS_ENDGROUP)
+ no-test-spec:
+ 
+-check: $(DOT_WAIT) test-spec
+-
+ RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
+ runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
+ 	$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
+@@ -1456,7 +1455,6 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
+ no-test-syntax-suggest-precheck:
+ yes-test-syntax-suggest-precheck: main
+ 
+-test-syntax-suggest-prepare: $(TEST_RUNNABLE)-test-syntax-suggest-prepare
+ no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
+ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+ 	$(ACTIONS_GROUP)
+@@ -1466,15 +1464,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+ 
+ RSPECOPTS =
+ SYNTAX_SUGGEST_SPECS =
+-PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare
+PREPARE_SYNTAX_SUGGEST = yes-test-syntax-suggest-prepare
+ test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
+-yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST)
+yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
+ 	$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \
+ 		--require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
+ no-test-syntax-suggest:
+ 
+-check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
+-
+ test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
+ no-test-bundler-precheck:
+ yes-test-bundler-precheck: main $(arch)-fake.rb
+diff --git a/defs/gmake.mk b/defs/gmake.mk
+index 54fef6685f..0aa403a4eb 100644
+--- a/defs/gmake.mk
+++ b/defs/gmake.mk
+@@ -84,7 +84,7 @@ endif
+ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
+ 	btest-ruby test-knownbug test-basic \
+ 	test-testframework test-tool test-ruby test-all \
+-	test-spec test-syntax-suggest-prepare test-syntax-suggest \
+	test-spec test-syntax-suggest \
+ 	test-bundler-prepare test-bundler test-bundler-parallel \
+ 	test-bundled-gems-precheck test-bundled-gems-fetch \
+ 	test-bundled-gems-prepare test-bundled-gems-run \
+-- 
+2.38.1
+
--- a/ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch
+++ b/ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch
@ -0,0 +1,70 @@
+From cf60e383a9c98da5cd75012f2aabfa4a2774aade Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 2 Jan 2023 14:16:39 +0100
+Subject: [PATCH] Revert "Test syntax_suggest by `make check`"
+
+This reverts commit cae53842735237ccf71a13873fd0d1ae7f165582.
+---
+ common.mk     | 6 ++----
+ defs/gmake.mk | 6 ++----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/common.mk b/common.mk
+index 27f6a9d89d..8021f03a58 100644
+--- a/common.mk
+++ b/common.mk
+@@ -766,8 +766,7 @@ clean-spec: PHONY
+ 	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
+ 	-$(Q) $(RMALL) rubyspec_temp
+ 
+-check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all \
+-       $(DOT_WAIT) test-spec $(DOT_WAIT) test-syntax-suggest
+check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all $(DOT_WAIT) test-spec
+ 	$(ECHO) check succeeded
+ 	-$(Q) : : "run only on sh"; \
+ 	if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
+@@ -1464,9 +1463,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
+ 
+ RSPECOPTS =
+ SYNTAX_SUGGEST_SPECS =
+-PREPARE_SYNTAX_SUGGEST = yes-test-syntax-suggest-prepare
+ test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
+-yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
+yes-test-syntax-suggest: yes-test-syntax-suggest-prepare
+ 	$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \
+ 		--require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
+ no-test-syntax-suggest:
+diff --git a/defs/gmake.mk b/defs/gmake.mk
+index 0aa403a4eb..dc9d31f49e 100644
+--- a/defs/gmake.mk
+++ b/defs/gmake.mk
+@@ -27,7 +27,7 @@ TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS))
+ TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS))
+ TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS))
+ TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS))
+-TEST_TARGETS := $(patsubst check,test-syntax-suggest test-spec test-all test-tool test-short,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst check,test-spec test-all test-tool test-short,$(TEST_TARGETS))
+ TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS))
+ TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS))
+ TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
+@@ -40,7 +40,6 @@ TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST
+ TEST_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-run,$(TEST_TARGETS))
+ TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE_BUNDLED_GEMS),$(TEST_TARGETS))
+ TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS))
+-TEST_TARGETS := $(patsubst test-syntax-suggest,test-syntax-suggest $(PREPARE_SYNTAX_SUGGEST),$(TEST_TARGETS))
+ TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
+ TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
+ endif
+@@ -84,8 +83,7 @@ endif
+ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
+ 	btest-ruby test-knownbug test-basic \
+ 	test-testframework test-tool test-ruby test-all \
+-	test-spec test-syntax-suggest \
+-	test-bundler-prepare test-bundler test-bundler-parallel \
+	test-spec test-bundler-prepare test-bundler test-bundler-parallel \
+ 	test-bundled-gems-precheck test-bundled-gems-fetch \
+ 	test-bundled-gems-prepare test-bundled-gems-run \
+ 	)
+-- 
+2.38.1
+
--- a/ruby.spec
+++ b/ruby.spec
@ -10,7 +10,7 @@
 #%%global milestone rc1

 # Keep the revision enabled for pre-releases from GIT.
-%global revision c5eefb7f37
+#%%global revision c5eefb7f37

 %global ruby_archive %{name}-%{ruby_version}

@ -27,13 +27,13 @@
 %global rubygems_dir %{_datadir}/rubygems

 # Bundled libraries versions
-%global rubygems_version 3.4.0.dev
+%global rubygems_version 3.4.1
 %global rubygems_molinillo_version 0.8.0
 %global rubygems_optparse_version 0.3.0
 %global rubygems_tsort_version 0.1.0

 # Default gems.
-%global bundler_version 2.4.0.dev
+%global bundler_version 2.4.1
 %global bundler_connection_pool_version 2.3.0
 %global bundler_fileutils_version 1.7.0
 %global bundler_pub_grub_version 0.5.0
@ -101,7 +101,7 @@
 Summary: An interpreter of object-oriented scripting language
 Name: ruby
 Version: %{ruby_version}%{?development_release}
-Release: 175%{?dist}
+Release: 176%{?dist}
 # BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.c
 # ISC: missing/strl{cat,cpy}.c
 # Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ...
@ -165,6 +165,10 @@ Patch7: ruby-3.1.0-Don-t-query-RubyVM-FrozenCore-for-class-path.patch
 # Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
 # https://bugs.ruby-lang.org/issues/16492
 Patch8: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
+# Disable syntax_suggest test suite, which tries to download its dependencies.
+# https://bugs.ruby-lang.org/issues/19297
+Patch9: ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch
+Patch10: ruby-3.2.0-Revert-Test-syntax_suggest-by-make-check.patch

 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Suggests: rubypick
@ -636,6 +640,8 @@ rm -rf ext/fiddle/libffi*
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1

 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .
@ -1076,8 +1082,8 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_siz
 %{ruby_libdir}/ipaddr.rb
 %{ruby_libdir}/kconv.rb
 %{ruby_libdir}/logger*
-%dir %{ruby_libdir}/ruby_vm
-%{ruby_libdir}/ruby_vm/mjit
+# https://bugs.ruby-lang.org/issues/19298
+%exclude %{ruby_libdir}/mjit
 %{ruby_libdir}/mkmf.rb
 %{ruby_libdir}/monitor.rb
 %{ruby_libdir}/mutex_m.rb
@ -1100,6 +1106,8 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_siz
 %{ruby_libdir}/resolv-replace.rb
 %{ruby_libdir}/rinda
 %{ruby_libdir}/ripper*
+%dir %{ruby_libdir}/ruby_vm
+%{ruby_libdir}/ruby_vm/mjit
 %{ruby_libdir}/securerandom.rb
 %{ruby_libdir}/set*
 %{ruby_libdir}/shellwords.rb
@ -1560,8 +1568,8 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_siz


 %changelog
-* Fri Dec 23 2022 Vít Ondruch <vondruch@redhat.com> - 3.2.0-175
- Upgrade to Ruby 3.2.0 (c5eefb7f37).
+* Mon Jan 02 2023 Vít Ondruch <vondruch@redhat.com> - 3.2.0-176
+- Upgrade to Ruby 3.2.0.

 * Thu Dec 08 2022 Vít Ondruch <vondruch@redhat.com> - 3.1.3-173
 - Disable MJIT test cases on i686 due to issues with PCH.
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
+SHA512 (ruby-3.2.0.tar.xz) = 733ecc6709470ee16916deeece9af1c76220ae95d17b2681116aff7f381d99bc3124b1b11b1c2336b2b29e468e91b90f158d5ae5fca810c6cf32a0b6234ae08e