From 44ceb8c838e829dba12be8ac2896a251125b6f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 9 Feb 2023 14:22:39 +0100 Subject: [PATCH 1/6] yaml and libffi sources are not bundled anymore. https://bugs.ruby-lang.org/issues/18571 --- ruby.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruby.spec b/ruby.spec index ffff54a..663fddd 100644 --- a/ruby.spec +++ b/ruby.spec @@ -635,10 +635,6 @@ analysis result in RBS format, a standard type description format for Ruby %prep %setup -q -n %{ruby_archive} -# Remove bundled libraries to be sure they are not used. -rm -rf ext/psych/yaml -rm -rf ext/fiddle/libffi* - %patch0 -p1 %patch1 -p1 %patch2 -p1 From ac33846a50f480188a4041755aba3b898b09339b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 9 Feb 2023 17:46:14 +0100 Subject: [PATCH 2/6] Upgrade to Ruby 3.2.1. Resolves: rhbz#2168292 --- ruby-2.3.0-ruby_version.patch | 4 ++-- ...0-Revert-Fix-test-syntax-suggest-order.patch | 4 ++-- ...vert-Test-syntax_suggest-by-make-check.patch | 2 +- ruby.spec | 17 ++++++++--------- sources | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 32b3069..42f347f 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -227,7 +227,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index b25068405d..e9fef4a311 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1395,7 +1395,8 @@ def test_self_use_paths +@@ -1337,7 +1337,8 @@ def test_self_use_paths def test_self_user_dir parts = [@userhome, ".gem", Gem.ruby_engine] @@ -237,7 +237,7 @@ index b25068405d..e9fef4a311 100644 FileUtils.mkdir_p File.join(parts) -@@ -1471,7 +1472,7 @@ def test_self_vendor_dir +@@ -1413,7 +1414,7 @@ def test_self_vendor_dir vendordir(File.join(@tempdir, "vendor")) do expected = File.join RbConfig::CONFIG["vendordir"], "gems", diff --git a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch index 12e242d..ee3b177 100644 --- a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch +++ b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch @@ -32,7 +32,7 @@ index d0558697d7..e73841aae7 100644 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY $(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT) -@@ -1457,7 +1456,6 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck +@@ -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 @@ -40,7 +40,7 @@ index d0558697d7..e73841aae7 100644 no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck $(ACTIONS_GROUP) -@@ -1467,15 +1465,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck +@@ -1466,15 +1464,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck RSPECOPTS = SYNTAX_SUGGEST_SPECS = diff --git 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 index 7bddc2d..3efb21f 100644 --- 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 @@ -23,7 +23,7 @@ index 27f6a9d89d..8021f03a58 100644 $(ECHO) check succeeded -$(Q) : : "run only on sh"; \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ -@@ -1465,9 +1464,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck +@@ -1464,9 +1463,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck RSPECOPTS = SYNTAX_SUGGEST_SPECS = diff --git a/ruby.spec b/ruby.spec index 663fddd..13f0b60 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 2 -%global teeny_version 0 +%global teeny_version 1 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,13 +27,13 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.4.1 +%global rubygems_version 3.4.6 %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.1 +%global bundler_version 2.4.6 %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: 178%{?dist} +Release: 179%{?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/*, ... @@ -1007,11 +1007,6 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" mv test/ruby/test_jit.rb{,.disable} || : %endif -# Disable `TestGCCompact#test_moving_objects_between_size_pools` due to: -# `NoMethodError: undefined method `>=' for nil:NilClass` error. -# https://bugs.ruby-lang.org/issues/19248 -DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_size_pools/" - # 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}"} \ @@ -1572,6 +1567,10 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_siz %changelog +* Thu Feb 09 2023 Vít Ondruch - 3.2.1-179 +- Upgrade to Ruby 3.2.1. + Resolves: rhbz#2168292 + * Fri Jan 20 2023 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6cfaf8a..431c49e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.2.0.tar.xz) = 733ecc6709470ee16916deeece9af1c76220ae95d17b2681116aff7f381d99bc3124b1b11b1c2336b2b29e468e91b90f158d5ae5fca810c6cf32a0b6234ae08e +SHA512 (ruby-3.2.1.tar.xz) = 69caadab9be6b56905ea4fc92fa0e36704f9fa6a0e7e7f4c6bdb79e9cbe8dc57c524f96d9c18802d61aa1ca578fed2e9758692f9d701bf0dba938f0206b721b3 From d45285804d6a616b2b05641b19cf03405577621b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 8 Mar 2023 13:09:30 +0100 Subject: [PATCH 3/6] Use `%{_rpmmacrodir}` for RPM macros. --- ruby.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruby.spec b/ruby.spec index 13f0b60..6959f72 100644 --- a/ruby.spec +++ b/ruby.spec @@ -720,11 +720,11 @@ test ! "$(ls -A %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ 2>/dev/null)" # Move macros file into proper place and replace the %%{name} macro, since it # would be wrongly evaluated during build of other packages. -mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d -install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby -sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby -install -m 644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems -sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems +mkdir -p %{buildroot}%{_rpmmacrodir} +install -m 644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/macros.ruby +sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.ruby +install -m 644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.rubygems +sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.rubygems # Install dependency generators. mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs @@ -1032,7 +1032,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %license GPL %license LEGAL -%{_rpmconfigdir}/macros.d/macros.ruby +%{_rpmmacrodir}/macros.ruby %{_includedir}/* %{_libdir}/libruby.so @@ -1259,7 +1259,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %exclude %{gem_dir}/cache/* %files -n rubygems-devel -%{_rpmconfigdir}/macros.d/macros.rubygems +%{_rpmmacrodir}/macros.rubygems %{_rpmconfigdir}/fileattrs/rubygems.attr %{_rpmconfigdir}/rubygems.req %{_rpmconfigdir}/rubygems.prov From 68d85d8035174ed730365dc03678fe2d4ecdc71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 8 Mar 2023 13:11:49 +0100 Subject: [PATCH 4/6] Use `%{_fileattsdir}` for RPM macro generator. --- ruby.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index 6959f72..04271e6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -727,8 +727,8 @@ install -m 644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.rubygems sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.rubygems # Install dependency generators. -mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs -install -m 644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/fileattrs +mkdir -p %{buildroot}%{_fileattrsdir} +install -m 644 %{SOURCE8} %{buildroot}%{_fileattrsdir} install -m 755 %{SOURCE9} %{buildroot}%{_rpmconfigdir} install -m 755 %{SOURCE10} %{buildroot}%{_rpmconfigdir} install -m 755 %{SOURCE11} %{buildroot}%{_rpmconfigdir} @@ -1260,7 +1260,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %files -n rubygems-devel %{_rpmmacrodir}/macros.rubygems -%{_rpmconfigdir}/fileattrs/rubygems.attr +%{_fileattrsdir}/rubygems.attr %{_rpmconfigdir}/rubygems.req %{_rpmconfigdir}/rubygems.prov %{_rpmconfigdir}/rubygems.con From 1d539d90eabcdfbf95b4d6ecfeacaf080c131af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 31 Mar 2023 15:23:08 +0200 Subject: [PATCH 5/6] Upgrade to Ruby 3.2.2. Resolves: rhbz#2183284 --- ....0-Enable-configuration-of-archlibdir.patch | 2 +- ...ted-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.spec | 18 +++++++++++------- sources | 2 +- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 65882be..2646a80 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 -@@ -3410,6 +3410,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3411,6 +3411,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 2a6261b..6f2fbe7 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 -@@ -4195,7 +4195,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4196,7 +4196,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 05bbd3a..f94b656 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 -@@ -4259,6 +4259,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4260,6 +4260,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 e57500c..0cb2012 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 -@@ -4231,6 +4231,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4232,6 +4232,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='' -@@ -4255,6 +4259,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4256,6 +4260,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 42f347f..866fef4 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 -@@ -4145,9 +4145,6 @@ AS_CASE(["$target_os"], +@@ -4146,9 +4146,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], -@@ -4170,57 +4167,63 @@ AC_ARG_WITH(ridir, +@@ -4171,57 +4168,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) -@@ -4237,6 +4240,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby.spec b/ruby.spec index 04271e6..54096c6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 2 -%global teeny_version 1 +%global teeny_version 2 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,20 +27,20 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.4.6 +%global rubygems_version 3.4.10 %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.6 +%global bundler_version 2.4.10 %global bundler_connection_pool_version 2.3.0 %global bundler_fileutils_version 1.7.0 %global bundler_pub_grub_version 0.5.0 %global bundler_net_http_persistent_version 4.0.1 %global bundler_thor_version 1.2.1 %global bundler_tsort_version 0.1.1 -%global bundler_uri_version 0.12.0 +%global bundler_uri_version 0.12.1 %global bigdecimal_version 3.1.3 %global did_you_mean_version 1.6.3 @@ -101,7 +101,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 179%{?dist} +Release: 180%{?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/*, ... @@ -1321,12 +1321,12 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/syntax_suggest-1.0.2.gemspec %{gem_dir}/specifications/default/syslog-0.1.1.gemspec %{gem_dir}/specifications/default/tempfile-0.1.3.gemspec -%{gem_dir}/specifications/default/time-0.2.1.gemspec +%{gem_dir}/specifications/default/time-0.2.2.gemspec %{gem_dir}/specifications/default/timeout-0.3.1.gemspec %{gem_dir}/specifications/default/tmpdir-0.1.3.gemspec %{gem_dir}/specifications/default/tsort-0.1.1.gemspec %{gem_dir}/specifications/default/un-0.2.1.gemspec -%{gem_dir}/specifications/default/uri-0.12.0.gemspec +%{gem_dir}/specifications/default/uri-0.12.1.gemspec %{gem_dir}/specifications/default/weakref-0.1.2.gemspec #%%{gem_dir}/specifications/default/win32ole-1.8.9.gemspec %{gem_dir}/specifications/default/yaml-0.2.1.gemspec @@ -1567,6 +1567,10 @@ mv test/ruby/test_jit.rb{,.disable} || : %changelog +* Fri Mar 31 2023 Vít Ondruch - 3.2.2-180 +- Upgrade to Ruby 3.2.2. + Resolves: rhbz#2183284 + * Thu Feb 09 2023 Vít Ondruch - 3.2.1-179 - Upgrade to Ruby 3.2.1. Resolves: rhbz#2168292 diff --git a/sources b/sources index 431c49e..709311a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.2.1.tar.xz) = 69caadab9be6b56905ea4fc92fa0e36704f9fa6a0e7e7f4c6bdb79e9cbe8dc57c524f96d9c18802d61aa1ca578fed2e9758692f9d701bf0dba938f0206b721b3 +SHA512 (ruby-3.2.2.tar.xz) = a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935 From 2400507224571a4da05175d91eb1920538dc4883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 24 Apr 2024 16:12:11 +0200 Subject: [PATCH 6/6] Upgrade to Ruby 3.2.4. Resolves: rhbz#2270544 --- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-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 | 16 ++--- ...Revert-Fix-test-syntax-suggest-order.patch | 6 +- ...rt-Test-syntax_suggest-by-make-check.patch | 2 +- ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch | 39 ------------ ruby.spec | 61 +++++++++---------- sources | 2 +- 10 files changed, 47 insertions(+), 89 deletions(-) delete mode 100644 ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 2646a80..410e50e 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 -@@ -3411,6 +3411,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3417,6 +3417,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 6f2fbe7..d378356 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 -@@ -4196,7 +4196,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4202,7 +4202,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 f94b656..f9e8cc4 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 -@@ -4260,6 +4260,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4266,6 +4266,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 0cb2012..8ed0e1b 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 -@@ -4232,6 +4232,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4238,6 +4238,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='' -@@ -4256,6 +4260,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4262,6 +4266,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 866fef4..0efa464 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 -@@ -4146,9 +4146,6 @@ AS_CASE(["$target_os"], +@@ -4152,9 +4152,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], -@@ -4171,57 +4168,63 @@ AC_ARG_WITH(ridir, +@@ -4177,57 +4174,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) -@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4244,6 +4247,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -195,7 +195,7 @@ diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index d4ff4a262c..3f9a5bf590 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb -@@ -34,7 +34,7 @@ def self.default_spec_cache_dir +@@ -35,7 +35,7 @@ def self.default_spec_cache_dir # specified in the environment def self.default_dir @@ -204,7 +204,7 @@ index d4ff4a262c..3f9a5bf590 100644 end ## -@@ -103,7 +103,8 @@ def self.user_dir +@@ -104,7 +104,8 @@ def self.user_dir gem_dir = File.join(Gem.user_home, ".gem") gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir) parts = [gem_dir, ruby_engine] @@ -214,7 +214,7 @@ index d4ff4a262c..3f9a5bf590 100644 File.join parts end -@@ -248,7 +249,7 @@ def self.vendor_dir # :nodoc: +@@ -249,7 +250,7 @@ def self.vendor_dir # :nodoc: return nil unless RbConfig::CONFIG.key? "vendordir" File.join RbConfig::CONFIG["vendordir"], "gems", @@ -227,7 +227,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index b25068405d..e9fef4a311 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1337,7 +1337,8 @@ def test_self_use_paths +@@ -1338,7 +1338,8 @@ def test_self_use_paths def test_self_user_dir parts = [@userhome, ".gem", Gem.ruby_engine] @@ -237,7 +237,7 @@ index b25068405d..e9fef4a311 100644 FileUtils.mkdir_p File.join(parts) -@@ -1413,7 +1414,7 @@ def test_self_vendor_dir +@@ -1414,7 +1415,7 @@ def test_self_vendor_dir vendordir(File.join(@tempdir, "vendor")) do expected = File.join RbConfig::CONFIG["vendordir"], "gems", diff --git a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch index ee3b177..ed17d16 100644 --- a/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch +++ b/ruby-3.2.0-Revert-Fix-test-syntax-suggest-order.patch @@ -23,7 +23,7 @@ index d0558697d7..e73841aae7 100644 $(ECHO) check succeeded -$(Q) : : "run only on sh"; \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ -@@ -903,8 +904,6 @@ yes-test-spec: test-spec-precheck +@@ -904,8 +905,6 @@ yes-test-spec: test-spec-precheck $(ACTIONS_ENDGROUP) no-test-spec: @@ -32,7 +32,7 @@ index d0558697d7..e73841aae7 100644 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 +@@ -1457,7 +1456,6 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck no-test-syntax-suggest-precheck: yes-test-syntax-suggest-precheck: main @@ -40,7 +40,7 @@ index d0558697d7..e73841aae7 100644 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 +@@ -1467,15 +1465,13 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck RSPECOPTS = SYNTAX_SUGGEST_SPECS = diff --git 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 index 3efb21f..7bddc2d 100644 --- 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 @@ -23,7 +23,7 @@ index 27f6a9d89d..8021f03a58 100644 $(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 +@@ -1465,9 +1464,8 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck RSPECOPTS = SYNTAX_SUGGEST_SPECS = diff --git a/ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch b/ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch deleted file mode 100644 index 1b3395b..0000000 --- a/ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b9825d6cdda053fea49eb2f613bc62bde465e89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Wed, 4 Jan 2023 17:23:35 +0100 -Subject: [PATCH] Use SHA256 instead of SHA1 - -Systems such as CentOS 9 / RHEL 9 are moving away from SHA1 disabling it -by default via a system-wide crypto policy. This replaces SHA1 with -SHA256 in similar way as [[1]]. - -[1]: https://github.com/ruby/openssl/pull/554 ---- - spec/ruby/library/openssl/x509/name/verify_spec.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spec/ruby/library/openssl/x509/name/verify_spec.rb b/spec/ruby/library/openssl/x509/name/verify_spec.rb -index a8bf865bd..6dcfc9946 100644 ---- a/spec/ruby/library/openssl/x509/name/verify_spec.rb -+++ b/spec/ruby/library/openssl/x509/name/verify_spec.rb -@@ -12,7 +12,7 @@ describe "OpenSSL::X509::Name.verify" do - cert.public_key = key.public_key - cert.not_before = Time.now - 10 - cert.not_after = cert.not_before + 365 * 24 * 60 * 60 -- cert.sign key, OpenSSL::Digest.new('SHA1') -+ cert.sign key, OpenSSL::Digest.new('SHA256') - store = OpenSSL::X509::Store.new - store.add_cert(cert) - [store.verify(cert), store.error, store.error_string].should == [true, 0, "ok"] -@@ -28,7 +28,7 @@ describe "OpenSSL::X509::Name.verify" do - cert.public_key = key.public_key - cert.not_before = Time.now - 10 - cert.not_after = Time.now - 5 -- cert.sign key, OpenSSL::Digest.new('SHA1') -+ cert.sign key, OpenSSL::Digest.new('SHA256') - store = OpenSSL::X509::Store.new - store.add_cert(cert) - store.verify(cert).should == false --- -2.38.1 - diff --git a/ruby.spec b/ruby.spec index 54096c6..77b9b1b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 2 -%global teeny_version 2 +%global teeny_version 4 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,20 +27,20 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.4.10 +%global rubygems_version 3.4.19 %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.10 +%global bundler_version 2.4.19 %global bundler_connection_pool_version 2.3.0 %global bundler_fileutils_version 1.7.0 %global bundler_pub_grub_version 0.5.0 %global bundler_net_http_persistent_version 4.0.1 %global bundler_thor_version 1.2.1 %global bundler_tsort_version 0.1.1 -%global bundler_uri_version 0.12.1 +%global bundler_uri_version 0.12.2 %global bigdecimal_version 3.1.3 %global did_you_mean_version 1.6.3 @@ -51,8 +51,9 @@ %global openssl_version 3.1.0 %global psych_version 5.0.1 %global racc_version 1.6.2 -%global rdoc_version 6.5.0 +%global rdoc_version 6.5.1.1 %global stringio_version 3.0.4 +%global syntax_suggest_version 1.1.0 # Bundled gems. %global minitest_version 5.16.3 @@ -61,10 +62,10 @@ %global test_unit_version 3.5.7 %global rexml_version 3.2.5 %global rss_version 0.2.9 -%global net_ftp_version 0.2.0 -%global net_imap_version 0.3.4 +%global net_ftp_version 0.2.1 +%global net_imap_version 0.3.4.1 %global net_pop_version 0.1.2 -%global net_smtp_version 0.3.3 +%global net_smtp_version 0.3.4 %global matrix_version 0.4.2 %global prime_version 0.1.2 %global rbs_version 2.8.2 @@ -101,7 +102,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 180%{?dist} +Release: 182%{?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/*, ... @@ -169,13 +170,6 @@ Patch8: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch # 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 -# Fix `OpenSSL::X509::CertificateError: invalid digest` errors on ELN. This -# also might help Fedor, if/when -# https://fedoraproject.org/wiki/Changes/StrongCryptoSettings3Forewarning2 -# is accepted. -# https://github.com/ruby/spec/pull/990 -# https://bugs.ruby-lang.org/issues/19307 -Patch11: ruby-3.2.0-Use-SHA256-instead-of-SHA1.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?with_rubypick:Suggests: rubypick} @@ -635,17 +629,16 @@ analysis result in RBS format, a standard type description format for Ruby %prep %setup -q -n %{ruby_archive} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +%patch 0 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 +%patch 6 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 +%patch 10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1081,8 +1074,6 @@ mv test/ruby/test_jit.rb{,.disable} || : %{ruby_libdir}/ipaddr.rb %{ruby_libdir}/kconv.rb %{ruby_libdir}/logger* -# https://bugs.ruby-lang.org/issues/19298 -%exclude %{ruby_libdir}/mjit %{ruby_libdir}/mkmf.rb %{ruby_libdir}/monitor.rb %{ruby_libdir}/mutex_m.rb @@ -1291,7 +1282,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/ipaddr-1.2.5.gemspec %{gem_dir}/specifications/default/logger-1.5.3.gemspec %{gem_dir}/specifications/default/mutex_m-0.1.2.gemspec -%{gem_dir}/specifications/default/net-http-0.3.2.gemspec +%{gem_dir}/specifications/default/net-http-0.4.1.gemspec %{gem_dir}/specifications/default/net-protocol-0.2.1.gemspec %{gem_dir}/specifications/default/nkf-0.1.2.gemspec %{gem_dir}/specifications/default/observer-0.1.1.gemspec @@ -1318,7 +1309,9 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/singleton-0.1.1.gemspec %{gem_dir}/specifications/default/stringio-%{stringio_version}.gemspec %{gem_dir}/specifications/default/strscan-3.0.5.gemspec -%{gem_dir}/specifications/default/syntax_suggest-1.0.2.gemspec +%{gem_dir}/specifications/default/syntax_suggest-%{syntax_suggest_version}.gemspec +%{_bindir}/syntax_suggest +%{gem_dir}/gems/syntax_suggest-%{syntax_suggest_version} %{gem_dir}/specifications/default/syslog-0.1.1.gemspec %{gem_dir}/specifications/default/tempfile-0.1.3.gemspec %{gem_dir}/specifications/default/time-0.2.2.gemspec @@ -1326,7 +1319,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/tmpdir-0.1.3.gemspec %{gem_dir}/specifications/default/tsort-0.1.1.gemspec %{gem_dir}/specifications/default/un-0.2.1.gemspec -%{gem_dir}/specifications/default/uri-0.12.1.gemspec +%{gem_dir}/specifications/default/uri-0.12.2.gemspec %{gem_dir}/specifications/default/weakref-0.1.2.gemspec #%%{gem_dir}/specifications/default/win32ole-1.8.9.gemspec %{gem_dir}/specifications/default/yaml-0.2.1.gemspec @@ -1567,6 +1560,10 @@ mv test/ruby/test_jit.rb{,.disable} || : %changelog +* Wed Apr 24 2024 Vít Ondruch - 3.2.4-182 +- Upgrade to Ruby 3.2.4. + Resolves: rhbz#2270544 + * Fri Mar 31 2023 Vít Ondruch - 3.2.2-180 - Upgrade to Ruby 3.2.2. Resolves: rhbz#2183284 diff --git a/sources b/sources index 709311a..3277d8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.2.2.tar.xz) = a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935 +SHA512 (ruby-3.2.4.tar.xz) = fb0af37be4b6ad7b98ab9f8a508952238ee68b5828e3926331e4db52e2ebc1e6046f31114069322db0cd3bea7c9b82ace91c8564573ddcfa1f960877b237dbff