From bb542382697f7955ca1510580d68582a4ba0a77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 24 Nov 2023 11:38:25 +0100 Subject: [PATCH] Upgrade to Ruby 3.3.0 (24e0b185ab). --- ....1.0-Enable-configuration-of-archlibdir.patch | 2 +- ...cated-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 ++-- ruby-2.3.0-ruby_version.patch | 6 +++--- ruby-2.7.0-Initialize-ABRT-hook.patch | 2 +- ...-3.3.0-Disable-syntax-suggest-test-case.patch | 2 +- ruby.spec | 16 ++++++++-------- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index c4b9e87..54fda66 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index d261ea57b5..3c13076b82 100644 --- a/configure.ac +++ b/configure.ac -@@ -3469,6 +3469,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3472,6 +3472,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index c5c177f..b8fc629 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index c42436c23d..d261ea57b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -4314,7 +4314,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4318,7 +4318,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 2fdca39..2cf0687 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index 3c13076b82..93af30321d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4378,6 +4378,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4382,6 +4382,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 9e00586..a291998 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 93af30321d..bc13397e0e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4350,6 +4350,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4354,6 +4354,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 93af30321d..bc13397e0e 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4374,6 +4378,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4378,6 +4382,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 3475d60..c6ced0d 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 80b137e380..63cd3b4f8b 100644 --- a/configure.ac +++ b/configure.ac -@@ -4264,9 +4264,6 @@ AS_CASE(["$target_os"], +@@ -4268,9 +4268,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4289,57 +4286,63 @@ AC_ARG_WITH(ridir, +@@ -4293,57 +4290,63 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -122,7 +122,7 @@ index 80b137e380..63cd3b4f8b 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4356,6 +4359,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4360,6 +4363,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby-2.7.0-Initialize-ABRT-hook.patch b/ruby-2.7.0-Initialize-ABRT-hook.patch index 530896e..f5f3c10 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 -@@ -117,7 +117,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ +@@ -119,7 +119,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ prism/prism.$(OBJEXT) \ prism_init.$(OBJEXT) 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 f3fa653..0a457b9 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 -@@ -1596,8 +1596,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) +@@ -1598,8 +1598,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) $(ACTIONS_ENDGROUP) no-test-syntax-suggest: diff --git a/ruby.spec b/ruby.spec index 7a1f8a4..eadb6d3 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 ad3db6711c +%global revision 24e0b185ab %global ruby_archive %{name}-%{ruby_version} @@ -104,13 +104,13 @@ %global weakref_version 0.1.3 %global win32ole_version 1.8.10 %global yaml_version 0.3.0 -%global prism_version 0.17.1 +%global prism_version 0.18.0 %global zlib_version 3.1.0 # Gemified default gems. %global bigdecimal_version 3.1.5 -%global io_console_version 0.6.1.dev -%global irb_version 1.8.3 +%global io_console_version 0.6.1.dev.1 +%global irb_version 1.9.1 %global json_version 2.6.3 %global psych_version 5.1.1.1 %global rdoc_version 6.6.0 @@ -123,12 +123,12 @@ %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.4 +%global net_imap_version 0.4.6 %global net_pop_version 0.1.2 %global net_smtp_version 0.4.0 %global matrix_version 0.4.2 %global prime_version 0.1.2 -%global rbs_version 3.2.2 +%global rbs_version 3.3.2 %global typeprof_version 0.21.8 %global debug_version 1.8.0 %global racc_version 1.7.3 @@ -1562,8 +1562,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Thu Nov 09 2023 Vít Ondruch - 3.3.0-184 -- Upgrade to Ruby 3.3.0 (ad3db6711c). +* Fri Nov 24 2023 Vít Ondruch - 3.3.0-184 +- Upgrade to Ruby 3.3.0 (24e0b185ab). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters