diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index f19bb23..c4b9e87 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 -@@ -3441,6 +3441,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3469,6 +3469,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 b19227f..c5c177f 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 -@@ -4286,7 +4286,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4314,7 +4314,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 5cea74c..2fdca39 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 -@@ -4350,6 +4350,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4378,6 +4378,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 3f858a5..9e00586 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 -@@ -4322,6 +4322,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4350,6 +4350,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='' -@@ -4346,6 +4350,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4374,6 +4378,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 8a926e4..3475d60 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 -@@ -4236,9 +4236,6 @@ AS_CASE(["$target_os"], +@@ -4264,9 +4264,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], -@@ -4261,57 +4258,63 @@ AC_ARG_WITH(ridir, +@@ -4289,57 +4286,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) -@@ -4328,6 +4331,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4356,6 +4359,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 6a248e2..530896e 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 -@@ -116,7 +116,8 @@ PRISM_FILES = prism/api_node.$(OBJEXT) \ +@@ -117,7 +117,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 21ed515..f3fa653 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 -@@ -1591,8 +1591,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) +@@ -1596,8 +1596,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) $(ACTIONS_ENDGROUP) no-test-syntax-suggest: diff --git a/ruby.spec b/ruby.spec index b46edd6..7a1f8a4 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 a1e24ab484 +%global revision ad3db6711c %global ruby_archive %{name}-%{ruby_version} @@ -43,69 +43,69 @@ %global bundler_uri_version 0.12.2 %global abbrev_version 0.1.1 -%global base64_version 0.1.1 -%global benchmark_version 0.2.1 -%global cgi_version 0.3.6 +%global base64_version 0.2.0 +%global benchmark_version 0.3.0 +%global cgi_version 0.4.0 %global csv_version 3.2.8 -%global date_version 3.3.3 -%global delegate_version 0.3.0 +%global date_version 3.3.4 +%global delegate_version 0.3.1 %global did_you_mean_version 1.6.3 %global digest_version 3.1.1 -%global drb_version 2.1.1 -%global english_version 0.7.2 +%global drb_version 2.2.0 +%global english_version 0.8.0 %global erb_version 4.0.3 %global error_highlight_version 0.5.1 %global etc_version 1.4.3.dev.1 -%global fcntl_version 1.0.2 +%global fcntl_version 1.1.0 %global fiddle_version 1.1.2 -%global fileutils_version 1.7.1 -%global find_version 0.1.1 +%global fileutils_version 1.7.2 +%global find_version 0.2.0 %global forwardable_version 1.3.3 -%global getoptlong_version 0.2.0 +%global getoptlong_version 0.2.1 %global io_nonblock_version 0.2.0 %global io_wait_version 0.3.0 %global ipaddr_version 1.2.5 -%global logger_version 1.5.3 -%global mutex_m_version 0.1.2 -%global net_http_version 0.3.2 -%global net_protocol_version 0.2.1 +%global logger_version 1.6.0 +%global mutex_m_version 0.2.0 +%global net_http_version 0.4.0 +%global net_protocol_version 0.2.2 %global nkf_version 0.1.3 -%global observer_version 0.1.1 -%global open3_version 0.1.2 +%global observer_version 0.1.2 +%global open3_version 0.2.0 %global openssl_version 3.2.0 -%global open_uri_version 0.3.0 -%global optparse_version 0.4.0.pre.1 -%global ostruct_version 0.5.5 -%global pathname_version 0.2.1 -%global pp_version 0.4.0 -%global prettyprint_version 0.1.1 -%global pstore_version 0.1.2 +%global open_uri_version 0.4.0 +%global optparse_version 0.4.0 +%global ostruct_version 0.6.0 +%global pathname_version 0.3.0 +%global pp_version 0.5.0 +%global prettyprint_version 0.2.0 +%global pstore_version 0.1.3 %global readline_version 0.0.3 -%global reline_version 0.3.9 +%global reline_version 0.4.0 %global resolv_version 0.2.2 %global resolv_replace_version 0.1.1 -%global rinda_version 0.1.1 +%global rinda_version 0.2.0 %global ruby2_keywords_version 0.0.5 -%global securerandom_version 0.2.2 +%global securerandom_version 0.3.0 %global set_version 1.0.3 -%global shellwords_version 0.1.0 -%global singleton_version 0.1.1 -%global stringio_version 3.0.9 -%global strscan_version 3.0.7 +%global shellwords_version 0.2.0 +%global singleton_version 0.2.0 +%global stringio_version 3.1.0 +%global strscan_version 3.0.8 %global syntax_suggest_version 1.1.0 %global syslog_version 0.1.1 -%global tempfile_version 0.1.3 -%global time_version 0.2.2 -%global timeout_version 0.4.0 -%global tmpdir_version 0.1.3 -%global tsort_version 0.1.1 -%global un_version 0.2.1 -%global uri_version 0.12.2 -%global weakref_version 0.1.2 -%global win32ole_version 1.8.9 -%global yaml_version 0.2.1 -%global prism_version 0.16.0 -%global zlib_version 3.0.0 +%global tempfile_version 0.2.0 +%global time_version 0.3.0 +%global timeout_version 0.4.1 +%global tmpdir_version 0.2.0 +%global tsort_version 0.2.0 +%global un_version 0.3.0 +%global uri_version 0.13.0 +%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 zlib_version 3.1.0 # Gemified default gems. %global bigdecimal_version 3.1.5 @@ -113,7 +113,7 @@ %global irb_version 1.8.3 %global json_version 2.6.3 %global psych_version 5.1.1.1 -%global rdoc_version 6.5.0 +%global rdoc_version 6.6.0 # Bundled gems. %global minitest_version 5.20.0 @@ -123,7 +123,7 @@ %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.3 +%global net_imap_version 0.4.4 %global net_pop_version 0.1.2 %global net_smtp_version 0.4.0 %global matrix_version 0.4.2 @@ -131,7 +131,7 @@ %global rbs_version 3.2.2 %global typeprof_version 0.21.8 %global debug_version 1.8.0 -%global racc_version 1.7.1 +%global racc_version 1.7.3 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')* @@ -1563,7 +1563,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 (a1e24ab484). +- Upgrade to Ruby 3.3.0 (ad3db6711c). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters