Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b7ab689993 | ||
|
9b8531baa2 | ||
|
|
f03db8495b | ||
|
15559eaf4a | ||
|
|
fcff4069a4 | ||
|
|
3a59634b09 | ||
|
|
0b9f168851 | ||
|
|
f4146f96aa | ||
|
|
5826182588 |
10 changed files with 64 additions and 70 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,6 @@
|
|||
/*/
|
||||
/ruby-*.tar.xz
|
||||
/rexml-*.gem
|
||||
/*.rpm
|
||||
|
||||
!/plans/
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index d261ea57b5..3c13076b82 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3520,6 +3520,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
@@ -3518,6 +3518,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
])
|
||||
|
||||
archlibdir='${libdir}/${arch}'
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index c42436c23d..d261ea57b5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4366,7 +4366,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
|
||||
@@ -4430,6 +4430,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
|
||||
@@ -4402,6 +4402,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=''
|
||||
@@ -4426,6 +4430,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
|
||||
@@ -4316,9 +4316,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],
|
||||
@@ -4341,57 +4338,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)
|
||||
@@ -4408,6 +4411,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
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ diff --git a/common.mk b/common.mk
|
|||
index d55d1788aa..73755f6ccd 100644
|
||||
--- a/common.mk
|
||||
+++ b/common.mk
|
||||
@@ -1662,8 +1662,6 @@ no-test-bundled-gems-spec:
|
||||
@@ -1668,8 +1668,6 @@ no-test-bundled-gems-spec:
|
||||
|
||||
test-syntax-suggest:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 57a10fcde1e52ad2282da01c457311d6f190ccfe Mon Sep 17 00:00:00 2001
|
||||
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Date: Tue, 14 Jan 2025 19:11:33 +0900
|
||||
Subject: [PATCH] [Bug #21024] <cstdbool> header has been useless
|
||||
|
||||
And finally deprecated at C++-17.
|
||||
Patched by jprokop (Jarek Prokop).
|
||||
---
|
||||
include/ruby/internal/stdbool.h | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/include/ruby/internal/stdbool.h b/include/ruby/internal/stdbool.h
|
||||
index 1ca61136ba..7f3e6dcf97 100644
|
||||
--- a/include/ruby/internal/stdbool.h
|
||||
+++ b/include/ruby/internal/stdbool.h
|
||||
@@ -27,10 +27,6 @@
|
||||
|
||||
#elif defined(__cplusplus)
|
||||
# /* bool is a keyword in C++. */
|
||||
-# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
|
||||
-# include <cstdbool>
|
||||
-# endif
|
||||
-#
|
||||
# ifndef __bool_true_false_are_defined
|
||||
# define __bool_true_false_are_defined
|
||||
# endif
|
||||
87
ruby.spec
87
ruby.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global major_version 3
|
||||
%global minor_version 4
|
||||
%global teeny_version 1
|
||||
%global teeny_version 8
|
||||
%global major_minor_version %{major_version}.%{minor_version}
|
||||
|
||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
%global rubygems_dir %{_datadir}/rubygems
|
||||
|
||||
# Bundled libraries versions
|
||||
%global rubygems_version 3.6.2
|
||||
%global rubygems_version 3.6.9
|
||||
%global rubygems_molinillo_version 0.8.0
|
||||
%global rubygems_net_http_version 0.6.0
|
||||
%global rubygems_net_protocol_version 0.2.2
|
||||
|
|
@ -36,21 +36,21 @@
|
|||
%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.2
|
||||
%global rubygems_uri_version 1.0.4
|
||||
|
||||
# Default gems.
|
||||
%global bundler_version 2.6.2
|
||||
%global bundler_connection_pool_version 2.4.1
|
||||
%global bundler_version 2.6.9
|
||||
%global bundler_connection_pool_version 2.5.0
|
||||
%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.4.1
|
||||
%global bundler_thor_version 1.3.2
|
||||
%global bundler_tsort_version 0.2.0
|
||||
%global bundler_uri_version 1.0.2
|
||||
%global bundler_uri_version 1.0.4
|
||||
|
||||
%global benchmark_version 0.4.0
|
||||
%global cgi_version 0.4.1
|
||||
%global cgi_version 0.4.2
|
||||
%global date_version 3.4.1
|
||||
%global delegate_version 0.4.0
|
||||
%global did_you_mean_version 2.0.0
|
||||
|
|
@ -58,31 +58,31 @@
|
|||
%global english_version 0.8.0
|
||||
%global erb_version 4.0.4
|
||||
%global error_highlight_version 0.7.0
|
||||
%global etc_version 1.4.5
|
||||
%global etc_version 1.4.6
|
||||
%global fcntl_version 1.2.0
|
||||
%global fiddle_version 1.1.6
|
||||
%global fileutils_version 1.7.3
|
||||
%global find_version 0.2.0
|
||||
%global forwardable_version 1.3.3
|
||||
%global io_nonblock_version 0.3.1
|
||||
%global io_wait_version 0.3.1
|
||||
%global io_nonblock_version 0.3.2
|
||||
%global io_wait_version 0.3.2
|
||||
%global ipaddr_version 1.2.7
|
||||
%global logger_version 1.6.4
|
||||
%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.2.0
|
||||
%global prism_version 1.5.2
|
||||
%global pstore_version 0.1.4
|
||||
%global readline_version 0.0.4
|
||||
%global reline_version 0.6.0
|
||||
%global resolv_version 0.6.0
|
||||
%global resolv_version 0.6.2
|
||||
%global ruby2_keywords_version 0.0.5
|
||||
%global securerandom_version 0.4.1
|
||||
%global set_version 1.1.1
|
||||
|
|
@ -91,14 +91,13 @@
|
|||
%global stringio_version 3.1.2
|
||||
%global strscan_version 3.1.2
|
||||
%global syntax_suggest_version 2.0.2
|
||||
%global syslog_version 0.2.0
|
||||
%global tempfile_version 0.3.1
|
||||
%global time_version 0.4.1
|
||||
%global timeout_version 0.4.3
|
||||
%global tmpdir_version 0.3.1
|
||||
%global tsort_version 0.2.0
|
||||
%global un_version 0.3.0
|
||||
%global uri_version 1.0.2
|
||||
%global uri_version 1.0.4
|
||||
%global weakref_version 0.1.3
|
||||
%global win32ole_version 1.9.1
|
||||
%global win32_registry_version 0.1.0
|
||||
|
|
@ -106,24 +105,24 @@
|
|||
%global zlib_version 3.2.1
|
||||
|
||||
# Gemified default gems.
|
||||
%global io_console_version 0.8.0
|
||||
%global io_console_version 0.8.1
|
||||
%global irb_version 1.14.3
|
||||
%global json_version 2.9.1
|
||||
%global psych_version 5.2.2
|
||||
%global rdoc_version 6.10.0
|
||||
%global rdoc_version 6.14.0
|
||||
|
||||
# Bundled gems.
|
||||
%global abbrev_version 0.1.2
|
||||
%global base64_version 0.2.0
|
||||
%global bigdecimal_version 3.1.8
|
||||
%global csv_version 3.3.2
|
||||
%global debug_version 1.10.0
|
||||
%global debug_version 1.11.0
|
||||
%global drb_version 2.2.1
|
||||
%global getoptlong_version 0.2.1
|
||||
%global net_ftp_version 0.3.8
|
||||
%global net_imap_version 0.5.4
|
||||
%global net_imap_version 0.5.8
|
||||
%global net_pop_version 0.1.2
|
||||
%global net_smtp_version 0.5.0
|
||||
%global net_smtp_version 0.5.1
|
||||
%global nkf_version 0.2.0
|
||||
%global matrix_version 0.4.2
|
||||
%global minitest_version 5.25.4
|
||||
|
|
@ -136,7 +135,7 @@
|
|||
%global rbs_version 3.8.0
|
||||
%global repl_type_completor_version 0.1.9
|
||||
%global resolv_replace_version 0.1.1
|
||||
%global rexml_version 3.4.0
|
||||
%global rexml_version 3.4.4
|
||||
%global rinda_version 0.2.0
|
||||
%global rss_version 0.3.1
|
||||
%global syslog_version 0.2.0
|
||||
|
|
@ -165,6 +164,7 @@
|
|||
%endif
|
||||
# Enable test when building on local.
|
||||
%bcond_with bundler_tests
|
||||
%bcond_without parallel_tests
|
||||
|
||||
%if 0%{?fedora}
|
||||
%bcond_without hardening_test
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
Summary: An interpreter of object-oriented scripting language
|
||||
Name: ruby
|
||||
Version: %{ruby_version}%{?development_release}
|
||||
Release: 23%{?dist}
|
||||
Release: 27%{?dist}
|
||||
# Licenses, which are likely not included in binary RPMs:
|
||||
# Apache-2.0:
|
||||
# benchmark/gc/redblack.rb
|
||||
|
|
@ -186,10 +186,10 @@ Release: 23%{?dist}
|
|||
# GPL-1.0-or-later: ext/win32/lib/win32/sspi.rb
|
||||
# GPL-1.0-or-later OR Artistic-1.0-Perl: win32/win32.c, include/ruby/win32.h,
|
||||
# ext/win32ole/win32ole.c
|
||||
#
|
||||
# Licenses under review:
|
||||
# IETF (this is not official SPDX identifier)
|
||||
# .bundle/gems/net-imap-0.4.9/LICENSE.txt
|
||||
# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/506
|
||||
# Licenses in this file covers fair use and don't need to be listed:
|
||||
# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/506
|
||||
#
|
||||
# BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.c, addr2line.c:2652
|
||||
# CC0: ccan/{build_assert/build_assert.h,check_type/check_type.h,
|
||||
|
|
@ -278,12 +278,6 @@ Patch6: ruby-2.7.0-Initialize-ABRT-hook.patch
|
|||
# Disable syntax_suggest test suite, which tries to download its dependencies.
|
||||
# https://bugs.ruby-lang.org/issues/19297
|
||||
Patch9: ruby-3.3.0-Disable-syntax-suggest-test-case.patch
|
||||
# Don't include <cstdbool> header in C++ environment.
|
||||
# https://bugs.ruby-lang.org/issues/21024
|
||||
# https://github.com/ruby/ruby/pull/12628
|
||||
# See discussion on Ruby 3.5 PR
|
||||
# https://github.com/ruby/ruby/pull/12551#discussion_r1913285350
|
||||
Patch10: ruby-3.4.2-Bug-21024-cstdbool-header-has-been-useless.patch
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
%{?with_rubypick:Suggests: rubypick}
|
||||
|
|
@ -584,6 +578,7 @@ Provides: bundled(rubygem-net-http-persistent) = %{bundler_net_http_persistent
|
|||
Provides: bundled(rubygem-pub_grub) = %{bundler_pub_grub_version}
|
||||
Provides: bundled(rubygem-securerandom) = %{bundler_securerandom_version}
|
||||
Provides: bundled(rubygem-thor) = %{bundler_thor_version}
|
||||
Provides: bundled(rubygem-tsort) = %{bundler_tsort_version}
|
||||
Provides: bundled(rubygem-uri) = %{bundler_uri_version}
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -776,7 +771,6 @@ analysis result in RBS format, a standard type description format for Ruby
|
|||
%patch 4 -p1
|
||||
%patch 6 -p1
|
||||
%patch 9 -p1
|
||||
%patch 10 -p1
|
||||
|
||||
# Provide an example of usage of the tapset:
|
||||
cp -a %{SOURCE3} .
|
||||
|
|
@ -1214,7 +1208,7 @@ MSPECOPTS=""
|
|||
# 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}"} \
|
||||
make -C %{_vpath_builddir} check TESTS="-v --show-skip $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
||||
make -C %{_vpath_builddir} %{?with_parallel_tests:%{?_smp_mflags}} check TESTS="-v --show-skip $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
||||
|
||||
# Run Ruby OpenSSL tests in OpenSSL FIPS.
|
||||
make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
|
||||
|
|
@ -1882,7 +1876,32 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org>
|
||||
* 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.
|
||||
Resolves: CVE-2025-61594
|
||||
- Fix REXML denial of service.
|
||||
Resolves: rhbz#2396204
|
||||
Resolves: CVE-2025-58767
|
||||
|
||||
* Mon Aug 18 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.5-25
|
||||
- Upgrade to Ruby 3.4.5.
|
||||
Resolves: rhbz#2386836
|
||||
|
||||
* Fri Jun 20 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.4-24
|
||||
- Upgrade to Ruby 3.4.4.
|
||||
Resolves: rhbz#2359563
|
||||
|
||||
* Wed Feb 19 2025 Vít Ondruch <vondruch@redhat.com> - 3.4.2-23
|
||||
- Upgrade to Ruby 3.4.2.
|
||||
Resolves: rhbz#2345875
|
||||
|
||||
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 3.4.1-23
|
||||
- Add explicit BR: libxcrypt-devel
|
||||
|
||||
* Fri Jan 24 2025 Jarek Prokop <jprokop@redhat.com> - 3.4.1-22
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ruby-3.4.1.tar.xz) = 8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680
|
||||
SHA512 (ruby-3.4.8.tar.xz) = b6289654685c2d381d15123cf07a131fd088edf13a5336966af5a2e8fad9adda42d14caa7bb0998331831af71e35c546091db55c82089e89b9508603ff5f92d6
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue