diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 2771d9b..65882be 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 -@@ -3404,6 +3404,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3410,6 +3410,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 fe68a98..2a6261b 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 -@@ -4189,7 +4189,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4195,7 +4195,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 0d33019..05bbd3a 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 -@@ -4253,6 +4253,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4259,6 +4259,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 432cf72..e57500c 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 -@@ -4225,6 +4225,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4231,6 +4231,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='' -@@ -4249,6 +4253,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4255,6 +4259,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 931357d..32b3069 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 -@@ -4139,9 +4139,6 @@ AS_CASE(["$target_os"], +@@ -4145,9 +4145,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], -@@ -4164,57 +4161,63 @@ AC_ARG_WITH(ridir, +@@ -4170,57 +4167,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) -@@ -4231,6 +4234,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4237,6 +4240,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 18d7f60..b0aace4 100644 --- a/ruby-2.7.0-Initialize-ABRT-hook.patch +++ b/ruby-2.7.0-Initialize-ABRT-hook.patch @@ -57,7 +57,7 @@ diff --git a/ruby.c b/ruby.c index 60c57d6259..1eec16f2c8 100644 --- a/ruby.c +++ b/ruby.c -@@ -1574,10 +1574,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) +@@ -1572,10 +1572,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) void Init_builtin_features(void); diff --git a/ruby.spec b/ruby.spec index 7f93c50..447524f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from GIT. -%global revision ece6246057 +%global revision 6af6857ecf %global ruby_archive %{name}-%{ruby_version} @@ -35,18 +35,18 @@ # Default gems. %global bundler_version 2.4.0.dev %global bundler_connection_pool_version 2.3.0 -%global bundler_fileutils_version 1.4.1 +%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.10.1 +%global bundler_uri_version 0.12.0 %global bigdecimal_version 3.1.3 -%global did_you_mean_version 1.6.2 +%global did_you_mean_version 1.6.3 %global erb_version 4.0.2 -%global io_console_version 0.5.11 -%global irb_version 1.6.0 +%global io_console_version 0.6.0 +%global irb_version 1.6.2 %global json_version 2.6.3 %global openssl_version 3.1.0.pre %global psych_version 5.0.1 @@ -58,16 +58,16 @@ %global minitest_version 5.16.3 %global power_assert_version 2.0.2 %global rake_version 13.0.6 -%global test_unit_version 3.5.5 +%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.1 +%global net_imap_version 0.3.3 %global net_pop_version 0.1.2 %global net_smtp_version 0.3.3 %global matrix_version 0.4.2 %global prime_version 0.1.2 -%global rbs_version 2.8.1 +%global rbs_version 2.8.2 %global typeprof_version 0.21.3 %global debug_version 1.7.0 @@ -983,6 +983,11 @@ 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}"} \ @@ -1239,17 +1244,17 @@ mv test/ruby/test_jit.rb{,.disable} || : %{_rpmconfigdir}/rubygems.con %files default-gems -%{gem_dir}/specifications/default/abbrev-0.1.0.gemspec +%{gem_dir}/specifications/default/abbrev-0.1.1.gemspec %{gem_dir}/specifications/default/base64-0.1.1.gemspec %{gem_dir}/specifications/default/benchmark-0.2.1.gemspec %{gem_dir}/specifications/default/cgi-0.3.6.gemspec %{gem_dir}/specifications/default/csv-3.2.6.gemspec -%{gem_dir}/specifications/default/date-3.3.1.gemspec +%{gem_dir}/specifications/default/date-3.3.3.gemspec %{gem_dir}/specifications/default/delegate-0.3.0.gemspec %{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec %{gem_dir}/specifications/default/digest-3.1.1.gemspec %{gem_dir}/specifications/default/drb-2.1.1.gemspec -%{gem_dir}/specifications/default/english-0.7.1.gemspec +%{gem_dir}/specifications/default/english-0.7.2.gemspec %{gem_dir}/specifications/default/erb-%{erb_version}.gemspec %{gem_dir}/specifications/default/error_highlight-0.5.1.gemspec %{gem_dir}/specifications/default/etc-1.4.2.gemspec @@ -1260,15 +1265,15 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/forwardable-1.3.3.gemspec %{gem_dir}/specifications/default/getoptlong-0.2.0.gemspec %{gem_dir}/specifications/default/io-nonblock-0.2.0.gemspec -%{gem_dir}/specifications/default/io-wait-0.3.0.pre.gemspec +%{gem_dir}/specifications/default/io-wait-0.3.0.gemspec %{gem_dir}/specifications/default/ipaddr-1.2.5.gemspec -%{gem_dir}/specifications/default/logger-1.5.2.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.1.gemspec +%{gem_dir}/specifications/default/net-http-0.3.2.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 -%{gem_dir}/specifications/default/open3-0.1.1.gemspec +%{gem_dir}/specifications/default/open3-0.1.2.gemspec %{gem_dir}/specifications/default/open-uri-0.3.0.gemspec %{gem_dir}/specifications/default/optparse-0.3.0.gemspec %{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec @@ -1279,28 +1284,28 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/pstore-0.1.2.gemspec %{gem_dir}/specifications/default/racc-%{racc_version}.gemspec %{gem_dir}/specifications/default/readline-0.0.3.gemspec -%{gem_dir}/specifications/default/readline-ext-0.1.4.gemspec -%{gem_dir}/specifications/default/reline-0.3.1.gemspec +%{gem_dir}/specifications/default/readline-ext-0.1.5.gemspec +%{gem_dir}/specifications/default/reline-0.3.2.gemspec %{gem_dir}/specifications/default/resolv-0.2.2.gemspec -%{gem_dir}/specifications/default/resolv-replace-0.1.0.gemspec +%{gem_dir}/specifications/default/resolv-replace-0.1.1.gemspec %{gem_dir}/specifications/default/rinda-0.1.1.gemspec %{gem_dir}/specifications/default/ruby2_keywords-0.0.5.gemspec -%{gem_dir}/specifications/default/securerandom-0.2.1.gemspec +%{gem_dir}/specifications/default/securerandom-0.2.2.gemspec %{gem_dir}/specifications/default/set-1.0.3.gemspec %{gem_dir}/specifications/default/shellwords-0.1.0.gemspec %{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.1.gemspec -%{gem_dir}/specifications/default/syslog-0.1.0.gemspec -%{gem_dir}/specifications/default/tempfile-0.1.2.gemspec -%{gem_dir}/specifications/default/time-0.2.0.gemspec +%{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/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/weakref-0.1.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 %{gem_dir}/specifications/default/zlib-3.0.0.gemspec @@ -1403,7 +1408,10 @@ mv test/ruby/test_jit.rb{,.disable} || : %license %{gem_dir}/gems/net-imap-%{net_imap_version}/LICENSE.txt %doc %{gem_dir}/gems/net-imap-%{net_imap_version}/README.md %{gem_dir}/gems/net-imap-%{net_imap_version}/Rakefile +%{gem_dir}/gems/net-imap-%{net_imap_version}/benchmarks +%{gem_dir}/gems/net-imap-%{net_imap_version}/docs %{gem_dir}/gems/net-imap-%{net_imap_version}/lib +%{gem_dir}/gems/net-imap-%{net_imap_version}/rakelib %{gem_dir}/specifications/net-imap-%{net_imap_version}.gemspec %dir %{gem_dir}/gems/net-pop-%{net_pop_version} @@ -1538,7 +1546,7 @@ mv test/ruby/test_jit.rb{,.disable} || : %changelog * Fri Dec 09 2022 Vít Ondruch - 3.2.0-174 -- Upgrade to Ruby 3.2.0 (ece6246057). +- Upgrade to Ruby 3.2.0 (6af6857ecf). * Thu Dec 08 2022 Vít Ondruch - 3.1.3-173 - Disable MJIT test cases on i686 due to issues with PCH.