diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 5adf835..f19bb23 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 -@@ -3436,6 +3436,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3441,6 +3441,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 b0927c2..d15889c 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 -@@ -4264,7 +4264,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4269,7 +4269,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 36d48f1..65c126a 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 -@@ -4328,6 +4328,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4333,6 +4333,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 30af286..9f2f600 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 -@@ -4300,6 +4300,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4305,6 +4305,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='' -@@ -4324,6 +4328,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4329,6 +4333,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 cfdb1cf..5a890f0 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 -@@ -4214,9 +4214,6 @@ AS_CASE(["$target_os"], +@@ -4219,9 +4219,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], -@@ -4239,57 +4236,63 @@ AC_ARG_WITH(ridir, +@@ -4244,57 +4241,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) -@@ -4306,6 +4309,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4311,6 +4314,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 433d825..823897d 100644 --- a/ruby-2.7.0-Initialize-ABRT-hook.patch +++ b/ruby-2.7.0-Initialize-ABRT-hook.patch @@ -44,9 +44,9 @@ diff --git a/common.mk b/common.mk index b2e5b2b6d0..f39f81da5c 100644 --- a/common.mk +++ b/common.mk -@@ -117,7 +117,8 @@ YARP_FILES = yarp/api_node.$(OBJEXT) \ - yarp/yarp.$(OBJEXT) \ - yarp/yarp_init.$(OBJEXT) +@@ -117,7 +117,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ + prism/prism.$(OBJEXT) \ + prism_init.$(OBJEXT) -COMMONOBJS = array.$(OBJEXT) \ +COMMONOBJS = abrt.$(OBJEXT) \ @@ -58,7 +58,7 @@ diff --git a/ruby.c b/ruby.c index 60c57d6259..1eec16f2c8 100644 --- a/ruby.c +++ b/ruby.c -@@ -1708,10 +1708,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt) +@@ -1721,10 +1721,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 02d2e01..89d11c6 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 -@@ -1565,8 +1565,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) +@@ -1588,8 +1588,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) $(ACTIONS_ENDGROUP) no-test-syntax-suggest: diff --git a/ruby.spec b/ruby.spec index 95949a7..75f58c5 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 904413997f +%global revision e029375a7d %global ruby_archive %{name}-%{ruby_version} @@ -81,7 +81,7 @@ %global prettyprint_version 0.1.1 %global pstore_version 0.1.2 %global readline_version 0.0.3 -%global reline_version 0.3.8 +%global reline_version 0.3.9 %global resolv_version 0.2.2 %global resolv_replace_version 0.1.1 %global rinda_version 0.1.1 @@ -104,15 +104,15 @@ %global weakref_version 0.1.2 %global win32ole_version 1.8.9 %global yaml_version 0.2.1 -%global yarp_version 0.12.0 +%global prism_version 0.13.0 %global zlib_version 3.0.0 # Gemified default gems. -%global bigdecimal_version 3.1.4 +%global bigdecimal_version 3.1.5 %global io_console_version 0.6.0 %global irb_version 1.8.1 %global json_version 2.6.3 -%global psych_version 5.1.0 +%global psych_version 5.1.1 %global rdoc_version 6.5.0 # Bundled gems. @@ -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.3.7 +%global net_imap_version 0.4.1 %global net_pop_version 0.1.2 -%global net_smtp_version 0.3.3 +%global net_smtp_version 0.4.0 %global matrix_version 0.4.2 %global prime_version 0.1.2 -%global rbs_version 3.2.1 +%global rbs_version 3.2.2 %global typeprof_version 0.21.8 %global debug_version 1.8.0 %global racc_version 1.7.1 @@ -1033,6 +1033,10 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestDir#test_home/" MSPECOPTS="$MSPECOPTS -P 'File.expand_path expands ~ENV..USER..* to.* the user.s home directory'" %endif +# Skip TestYJIT#test_bug_19316 test, which is failing for unknown reason. +# https://bugs.ruby-lang.org/issues/19921 +DISABLE_TESTS="$DISABLE_TESTS -n !/TestYJIT#test_bug_19316/" + # 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}"} \ @@ -1152,7 +1156,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %{ruby_libdir}/uri* %{ruby_libdir}/weakref* %{ruby_libdir}/yaml* -%{ruby_libdir}/yarp* +%{ruby_libdir}/prism* # Platform specific libraries. %{_libdir}/libruby.so.{%{major_minor_version},%{ruby_version}} @@ -1358,7 +1362,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %gem_spec -d weakref #%%gem_spec -d win32ole %gem_spec -d yaml -%gem_spec -d yarp +%gem_spec -d prism %gem_spec -d zlib %files -n rubygem-irb @@ -1471,6 +1475,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ # net-smtp %dir %{gem_instdir net-smtp} +%doc %{gem_instdir net-smtp}/NEWS.md +%doc %{gem_instdir net-smtp}/README.md %license %{gem_instdir net-smtp}/LICENSE.txt %{gem_libdir net-smtp} %{gem_spec net-smtp} @@ -1606,7 +1612,7 @@ 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 (904413997f). +- Upgrade to Ruby 3.3.0 (e029375a7d). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters