rpms/ruby
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Ruby 3.4.0 (4074c6b427)

Browse source
This commit is contained in:
Vít Ondruch 2024-11-14 16:08:39 +01:00
commit 7560438953
8 changed files with 72 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby-2.1.0-Enable-configuration-of-archlibdir.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index d261ea57b5..3c13076b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3538,6 +3538,11 @@ AS_IF([test ${multiarch+set}], [
@@ -3519,6 +3519,11 @@ AS_IF([test ${multiarch+set}], [
])
archlibdir='${libdir}/${arch}'

2
ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
View file

@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
index c42436c23d..d261ea57b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4382,7 +4382,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4365,7 +4365,8 @@ AS_CASE(["$ruby_version_dir_name"],
ruby_version_dir=/'${ruby_version_dir_name}'
if test -z "${ruby_version_dir_name}"; then

2
ruby-2.1.0-always-use-i386.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index 3c13076b82..93af30321d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4446,6 +4446,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4429,6 +4429,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

8
ruby-2.1.0-custom-rubygems-location.patch
View file

@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
index 93af30321d..bc13397e0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4418,6 +4418,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4401,6 +4401,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=''
@@ -4442,6 +4446,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4425,6 +4429,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index e9110a17ca..76a1f0a315 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -386,6 +386,7 @@ def CONFIG.[](name, mandatory = false)
@@ -382,6 +382,7 @@ def CONFIG.[](name, mandatory = false)
vendorlibdir = CONFIG["vendorlibdir"]
vendorarchlibdir = CONFIG["vendorarchdir"]
end
@ -75,7 +75,7 @@ index e9110a17ca..76a1f0a315 100755
mandir = CONFIG["mandir", true]
docdir = CONFIG["docdir", true]
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
@@ -978,7 +979,16 @@ def (bins = []).add(name)
@@ -974,7 +975,16 @@ def (bins = []).add(name)
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[*.txt *.rdoc *.gemspec]

10
ruby-2.3.0-ruby_version.patch
View file

@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index 80b137e380..63cd3b4f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4332,9 +4332,6 @@ AS_CASE(["$target_os"],
@@ -4315,9 +4315,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],
@@ -4357,57 +4354,63 @@ AC_ARG_WITH(ridir,
@@ -4340,57 +4337,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)
@@ -4424,6 +4427,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4407,6 +4410,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index d4c110e..d39c9a6 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -949,7 +949,7 @@ def (bins = []).add(name)
@@ -945,7 +945,7 @@ def (bins = []).add(name)
install?(:doc, :rdoc) do
if $rdocdir
@ -262,7 +262,7 @@ diff --git a/configure.ac b/configure.ac
index a00f2b6776..999e2d6d5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
@@ -143,7 +143,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
AC_SUBST(RUBY_BASE_NAME)
AC_SUBST(RUBYW_BASE_NAME)

2
ruby-2.7.0-Initialize-ABRT-hook.patch
View file

@ -58,7 +58,7 @@ diff --git a/ruby.c b/ruby.c
index 60c57d6259..1eec16f2c8 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1740,10 +1740,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
@@ -1744,10 +1744,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
void Init_builtin_features(void);

2
ruby-3.3.0-Disable-syntax-suggest-test-case.patch
View file

@ -12,7 +12,7 @@ diff --git a/common.mk b/common.mk
index d55d1788aa..73755f6ccd 100644
--- a/common.mk
+++ b/common.mk
@@ -1616,8 +1616,6 @@ no-test-bundled-gems-spec:
@@ -1649,8 +1649,6 @@ no-test-bundled-gems-spec:
test-syntax-suggest:

110
ruby.spec
View file

@ -10,7 +10,7 @@
%dnl %global milestone preview2
# Keep the revision enabled for pre-releases from GIT.
%global revision 3da3cabf98
%global revision 4074c6b427
%global ruby_archive %{name}-%{ruby_version}
@ -29,89 +29,91 @@
# Bundled libraries versions
%global rubygems_version 3.6.0.dev
%global rubygems_molinillo_version 0.8.0
%global rubygems_net_http_version 0.4.1
%global rubygems_net_http_version 0.5.0
%global rubygems_net_protocol_version 0.2.2
%global rubygems_optparse_version 0.4.0
%global rubygems_resolv_version 0.4.0
%global rubygems_securerandom_version 0.3.1
%global rubygems_timeout_version 0.4.1
%global rubygems_optparse_version 0.6.0
%global rubygems_resolv_version 0.5.0
%global rubygems_securerandom_version 0.3.2
%global rubygems_timeout_version 0.4.2
%global rubygems_tsort_version 0.2.0
%global rubygems_uri_version 0.13.1
%global rubygems_uri_version 1.0.1
# Default gems.
%global bundler_version 2.6.0.dev
%global bundler_connection_pool_version 2.4.1
%global bundler_fileutils_version 1.7.2
%global bundler_fileutils_version 1.7.3
%global bundler_net_http_persistent_version 4.0.4
%global bundler_pub_grub_version 0.5.0
%global bundler_securerandom_version 0.3.1
%global bundler_thor_version 1.3.0
%global bundler_securerandom_version 0.3.2
%global bundler_thor_version 1.3.2
%global bundler_tsort_version 0.2.0
%global bundler_uri_version 0.13.1
%global bundler_uri_version 1.0.1
%global benchmark_version 0.3.0
%global benchmark_version 0.4.0
%global cgi_version 0.4.1
%global date_version 3.3.4
%global delegate_version 0.3.1
%global date_version 3.4.0
%global delegate_version 0.4.0
%global did_you_mean_version 1.6.3
%global digest_version 3.1.1
%global english_version 0.8.0
%global erb_version 4.0.4
%global error_highlight_version 0.6.0
%global etc_version 1.4.3
%global fcntl_version 1.1.0
%global fiddle_version 1.1.3.dev
%global fileutils_version 1.7.2
%global etc_version 1.4.4
%global fcntl_version 1.2.0
%global fiddle_version 1.1.6
%global fiddle_prerelease .dev
%global fileutils_version 1.7.3
%global find_version 0.2.0
%global forwardable_version 1.3.3
%global io_nonblock_version 0.3.0
%global io_wait_version 0.3.1
%global ipaddr_version 1.2.6
%global ipaddr_version 1.2.7
%global logger_version 1.6.1
%global net_http_version 0.4.1
%global net_http_version 0.5.0
%global net_protocol_version 0.2.2
%global open3_version 0.2.1
%global openssl_version 3.2.0
%global open_uri_version 0.4.1
%global optparse_version 0.5.0
%global ostruct_version 0.6.0
%global pathname_version 0.3.0
%global pp_version 0.5.0
%global open_uri_version 0.5.0
%global optparse_version 0.6.0
%global ostruct_version 0.6.1
%global pathname_version 0.4.0
%global pp_version 0.6.1
%global prettyprint_version 0.2.0
%global pstore_version 0.1.3
%global prism_version 1.0.0
%global pstore_version 0.1.4
%global readline_version 0.0.4
%global reline_version 0.5.10
%global resolv_version 0.4.0
%global reline_version 0.5.11
%global resolv_version 0.5.0
%global ruby2_keywords_version 0.0.5
%global securerandom_version 0.3.1
%global securerandom_version 0.3.2
%global set_version 1.1.0
%global shellwords_version 0.2.0
%global singleton_version 0.2.0
%global shellwords_version 0.2.1
%global singleton_version 0.3.0
%global stringio_version 3.1.2
%global stringio_prerelease .dev
%global strscan_version 3.1.1
%global strscan_prerelease .dev
%global syntax_suggest_version 2.0.0
%global syntax_suggest_version 2.0.1
%global syslog_version 0.1.2
%global tempfile_version 0.2.1
%global time_version 0.4.0
%global timeout_version 0.4.1
%global tmpdir_version 0.2.0
%global tempfile_version 0.3.0
%global time_version 0.4.1
%global timeout_version 0.4.2
%global tmpdir_version 0.3.0
%global tsort_version 0.2.0
%global un_version 0.3.0
%global uri_version 0.13.1
%global uri_version 1.0.2
%global weakref_version 0.1.3
%global win32ole_version 1.8.10
%global yaml_version 0.3.0
%global prism_version 1.0.0
%global zlib_version 3.1.1
%global win32ole_version 1.9.0
%global win32_registry_version 0.1.0
%global yaml_version 0.4.0
%global zlib_version 3.2.0
# Gemified default gems.
%global io_console_version 0.7.2
%global io_console_version 0.8.0
%global io_console_prerelease .beta1
%global irb_version 1.14.1
%global json_version 2.7.2
%global json_version 2.8.1
%global psych_version 5.2.0
%global psych_prerelease .beta1
%global rdoc_version 6.7.0
# Bundled gems.
@ -123,7 +125,7 @@
%global drb_version 2.2.1
%global getoptlong_version 0.2.1
%global net_ftp_version 0.3.8
%global net_imap_version 0.4.17
%global net_imap_version 0.5.1
%global net_pop_version 0.1.2
%global net_smtp_version 0.5.0
%global nkf_version 0.2.0
@ -138,13 +140,12 @@
%global rbs_version 3.6.1
%global repl_type_completor_version 0.1.7
%global resolv_replace_version 0.1.1
%global rexml_version 3.3.8
%global rexml_version 3.3.9
%global rinda_version 0.2.0
%global rss_version 0.3.1
%global syslog_version 0.1.2
%global test_unit_version 3.6.2
%global typeprof_version 0.21.11
%global win32_registry_version 0.0.1
# Bundled nkf version
@ -617,7 +618,6 @@ Provides: bundled(rubygem-repl_type_completor) = %{repl_type_completor_version
Provides: bundled(rubygem-resolv-replace) = %{resolv_replace_version}
Provides: bundled(rubygem-rinda) = %{rinda_version}
Provides: bundled(rubygem-syslog) = %{syslog_version}
Provides: bundled(rubygem-win32-registry) = %{win32_registry_version}
# https://github.com/nurse/nkf
# Please note that nkf going to be promoted to bundled gem in Ruby 3.4:
# https://github.com/ruby/ruby/commit/2e3a7f70ae71650be6ea38a483f66ce17ca5eb1d
@ -827,10 +827,15 @@ rm -rf %{buildroot}
# multilib systems and install config.h wrapper
%multilib_fix_c_header --file %{_includedir}/%{name}/config.h
# `ruby` executable is placed int `libexec` directory for some unknow reasons.
# `ruby` executable is placed in some strange directory for some unknow
# reasons.
# https://bugs.ruby-lang.org/issues/20800
find %{buildroot}%{_libexecdir} -name ruby -exec mv '{}' %{buildroot}/%{_bindir} \;
rm -rd %{buildroot}%{_libexecdir}
# https://github.com/ruby/ruby/pull/12043
CONFIG_TARGET_DIR=%{buildroot}%{_exec_prefix}/$( \
%{_vpath_builddir}/miniruby -I%{_vpath_builddir} -rrbconfig -e 'puts RbConfig::CONFIG["config_target"]'
)
mv ${CONFIG_TARGET_DIR}/bin/ruby %{buildroot}%{_bindir}
rm -rd ${CONFIG_TARGET_DIR}
# Rename the ruby executable. It is replaced by RubyPick.
%{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}}
@ -1494,6 +1499,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
%gem_spec -d uri
%gem_spec -d weakref
#%%gem_spec -d win32ole
#%%gem_spec -d win32-registry
%gem_spec -d yaml
%gem_spec -d prism
%gem_spec -d zlib
@ -1863,7 +1869,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
%changelog
* Thu Dec 19 2024 Vít Ondruch <vondruch@redhat.com> - 3.4.0-18
- Upgrade to Ruby 3.4.0 (3da3cabf98)
- Upgrade to Ruby 3.4.0 (4074c6b427)
* Mon Dec 16 2024 Jun Aruga <jaruga@redhat.com> - 3.3.6-18
- Fix Ruby OpenSSL to respect crypto-policies TLS minimal version.