Update to Ruby 3.4.8.
Resolves: rhbz#2422963 Resolves: rhbz#2412227
This commit is contained in:
parent
9b8531baa2
commit
b7ab689993
6 changed files with 19 additions and 31 deletions
|
|
@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index c42436c23d..d261ea57b5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4364,7 +4364,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
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 3c13076b82..93af30321d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4428,6 +4428,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
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 93af30321d..bc13397e0e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4400,6 +4400,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=''
|
||||
@@ -4424,6 +4428,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
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 80b137e380..63cd3b4f8b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4314,9 +4314,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],
|
||||
@@ -4339,57 +4336,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)
|
||||
@@ -4406,6 +4409,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
|
||||
|
|
|
|||
33
ruby.spec
33
ruby.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global major_version 3
|
||||
%global minor_version 4
|
||||
%global teeny_version 7
|
||||
%global teeny_version 8
|
||||
%global major_minor_version %{major_version}.%{minor_version}
|
||||
|
||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
%global rubygems_securerandom_version 0.4.1
|
||||
%global rubygems_timeout_version 0.4.3
|
||||
%global rubygems_tsort_version 0.2.0
|
||||
%global rubygems_uri_version 1.0.3
|
||||
%global rubygems_uri_version 1.0.4
|
||||
|
||||
# Default gems.
|
||||
%global bundler_version 2.6.9
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
%global bundler_securerandom_version 0.4.1
|
||||
%global bundler_thor_version 1.3.2
|
||||
%global bundler_tsort_version 0.2.0
|
||||
%global bundler_uri_version 1.0.3
|
||||
%global bundler_uri_version 1.0.4
|
||||
|
||||
%global benchmark_version 0.4.0
|
||||
%global cgi_version 0.4.2
|
||||
|
|
@ -71,14 +71,14 @@
|
|||
%global net_http_version 0.6.0
|
||||
%global net_protocol_version 0.2.2
|
||||
%global open3_version 0.2.1
|
||||
%global openssl_version 3.3.0
|
||||
%global openssl_version 3.3.1
|
||||
%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.2
|
||||
%global prettyprint_version 0.2.0
|
||||
%global prism_version 1.5.1
|
||||
%global prism_version 1.5.2
|
||||
%global pstore_version 0.1.4
|
||||
%global readline_version 0.0.4
|
||||
%global reline_version 0.6.0
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
Summary: An interpreter of object-oriented scripting language
|
||||
Name: ruby
|
||||
Version: %{ruby_version}%{?development_release}
|
||||
Release: 26%{?dist}
|
||||
Release: 27%{?dist}
|
||||
# Licenses, which are likely not included in binary RPMs:
|
||||
# Apache-2.0:
|
||||
# benchmark/gc/redblack.rb
|
||||
|
|
@ -239,8 +239,6 @@ Source19: test_rubygems_con.rb
|
|||
# default RDoc gem as shipped in Ruby tarball. This should not be needed for
|
||||
# Ruby 3.5+.
|
||||
Source20: https://github.com/ruby/rdoc/blob/master/lib/rubygems_plugin.rb
|
||||
# rexml gem
|
||||
Source21: https://rubygems.org/gems/rexml-%{rexml_version}.gem
|
||||
|
||||
# The load directive is supported since RPM 4.12, i.e. F21+. The build process
|
||||
# fails on older Fedoras.
|
||||
|
|
@ -777,10 +775,6 @@ analysis result in RBS format, a standard type description format for Ruby
|
|||
# Provide an example of usage of the tapset:
|
||||
cp -a %{SOURCE3} .
|
||||
|
||||
rm -rf .bundle/gems/rexml-3.4.0
|
||||
rm .bundle/specifications/rexml-3.4.0.gemspec
|
||||
rm gems/rexml-3.4.0.gem
|
||||
|
||||
%build
|
||||
autoconf
|
||||
|
||||
|
|
@ -820,16 +814,6 @@ popd
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
cp -p %{SOURCE21} gems/
|
||||
|
||||
make -C %{_vpath_builddir} runruby \
|
||||
TESTRUN_SCRIPT="%{_builddir}/%{buildsubdir}/bin/gem unpack %{SOURCE21} --target='%{_builddir}/%{buildsubdir}/.bundle/gems'"
|
||||
make --silent -C %{_vpath_builddir} runruby \
|
||||
TESTRUN_SCRIPT="%{_builddir}/%{buildsubdir}/bin/gem spec '%{SOURCE21}' --ruby" \
|
||||
> .bundle/specifications/rexml-%{rexml_version}.gemspec
|
||||
|
||||
sed -i -e '/^rexml/ s/3.4.0/3.4.4/' gems/bundled_gems
|
||||
|
||||
%make_install -C %{_vpath_builddir}
|
||||
|
||||
# TODO: Regenerate RBS parser in lib/rbs/parser.rb
|
||||
|
|
@ -1892,6 +1876,11 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Dec 17 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.8-27
|
||||
- Update to Ruby 3.4.8.
|
||||
Resolves: rhbz#2422963
|
||||
Resolves: rhbz#2412227
|
||||
|
||||
* Fri Oct 31 2025 Jun Aruga <jaruga@redhat.com> - 3.4.7-26
|
||||
- Upgrade to Ruby 3.4.7.
|
||||
- Fix URI Credential Leakage Bypass previous fixes.
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (ruby-3.4.7.tar.xz) = a6b99a2f1d0115d5e7efa710da440b9066c524c335928367c80852630f8db5da36c0a82d6e7ace90e8c40cb20c6097cbdca15a51c343254cadf5f0adf60f8505
|
||||
SHA512 (rexml-3.4.4.gem) = 1d4e718504db4aa4481217f85068e79cf58a04cb46827b3baa88a55c3fd3804eafb98f8d295c62035ee05006818b49bc208fab98884e5caf262b66ae6f6dca8f
|
||||
SHA512 (ruby-3.4.8.tar.xz) = b6289654685c2d381d15123cf07a131fd088edf13a5336966af5a2e8fad9adda42d14caa7bb0998331831af71e35c546091db55c82089e89b9508603ff5f92d6
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue