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 61ea88e..f224c4f 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 -@@ -4315,7 +4315,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4308,7 +4308,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 a693626..d65d47f 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 -@@ -4379,6 +4379,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4372,6 +4372,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 eb7d6aa..5862e3c 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 -@@ -4351,6 +4351,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4344,6 +4344,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='' -@@ -4375,6 +4379,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4368,6 +4372,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 d2b50af..83a2b81 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 -@@ -4265,9 +4265,6 @@ AS_CASE(["$target_os"], +@@ -4258,9 +4258,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], -@@ -4290,57 +4287,63 @@ AC_ARG_WITH(ridir, +@@ -4283,57 +4280,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) -@@ -4357,6 +4360,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4350,6 +4353,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 0bf1064..0f32243 100644 --- a/ruby-2.7.0-Initialize-ABRT-hook.patch +++ b/ruby-2.7.0-Initialize-ABRT-hook.patch @@ -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) +@@ -1724,10 +1724,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 5d19294..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 -@@ -1590,8 +1590,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 e8b11d1..4826434 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 04f7be6126 +%global revision 8e6f63df47 %global ruby_archive %{name}-%{ruby_version} @@ -27,7 +27,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.5.0.dev +%global rubygems_version 3.5.1 %global rubygems_molinillo_version 0.8.0 %global rubygems_net_http_version 0.4.0 %global rubygems_net_protocol_version 0.2.2 @@ -37,7 +37,7 @@ %global rubygems_tsort_version 0.2.0 # Default gems. -%global bundler_version 2.5.0.dev +%global bundler_version 2.5.1 %global bundler_connection_pool_version 2.4.1 %global bundler_fileutils_version 1.7.2 %global bundler_net_http_persistent_version 4.0.2 @@ -46,7 +46,7 @@ %global bundler_tsort_version 0.2.0 %global bundler_uri_version 0.13.0 -%global abbrev_version 0.1.1 +%global abbrev_version 0.1.2 %global base64_version 0.2.0 %global benchmark_version 0.3.0 %global cgi_version 0.4.1 @@ -68,14 +68,14 @@ %global getoptlong_version 0.2.1 %global io_nonblock_version 0.3.0 %global io_wait_version 0.3.1 -%global ipaddr_version 1.2.5 +%global ipaddr_version 1.2.6 %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.2 -%global open3_version 0.2.0 +%global open3_version 0.2.1 %global openssl_version 3.2.0 %global open_uri_version 0.4.1 %global optparse_version 0.4.0 @@ -84,20 +84,20 @@ %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.4.0 +%global readline_version 0.0.4 +%global reline_version 0.4.1 %global resolv_version 0.3.0 %global resolv_replace_version 0.1.1 %global rinda_version 0.2.0 %global ruby2_keywords_version 0.0.5 -%global securerandom_version 0.3.0 +%global securerandom_version 0.3.1 %global set_version 1.0.4 %global shellwords_version 0.2.0 %global singleton_version 0.2.0 -%global stringio_version 3.1.1 -%global strscan_version 3.0.8 +%global stringio_version 3.1.0 +%global strscan_version 3.0.7 %global syntax_suggest_version 2.0.0 -%global syslog_version 0.1.1 +%global syslog_version 0.1.2 %global tempfile_version 0.2.1 %global time_version 0.3.0 %global timeout_version 0.4.1 @@ -113,11 +113,11 @@ # Gemified default gems. %global bigdecimal_version 3.1.5 -%global io_console_version 0.7.0 +%global io_console_version 0.7.1 %global irb_version 1.10.1 %global json_version 2.7.1 -%global psych_version 5.1.1.1 -%global rdoc_version 6.6.1 +%global psych_version 5.1.2 +%global rdoc_version 6.6.2 # Bundled gems. %global minitest_version 5.20.0 @@ -1610,8 +1610,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Fri Dec 15 2023 Vít Ondruch - 3.3.0-184 -- Upgrade to Ruby 3.3.0 (04f7be6126). +* Tue Dec 19 2023 Vít Ondruch - 3.3.0-184 +- Upgrade to Ruby 3.3.0 (8e6f63df47). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters