diff --git a/ruby-3.3.6.tar.xz b/ruby-3.3.7.tar.xz similarity index 65% rename from ruby-3.3.6.tar.xz rename to ruby-3.3.7.tar.xz index 307168ba3a77bf31706e5053cf69acbbb04f7688..89382185e1feffb7e231f2ac6bc8660c6291ca33 100644 Binary files a/ruby-3.3.6.tar.xz and b/ruby-3.3.7.tar.xz differ diff --git a/ruby.spec b/ruby.spec index 983f8a167b930e60aba2955e6bbdb4163fa3a9f9..006a7fc7496c734b8fe5b82bd35ef6cbce47c26d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %define anolis_release 1 %global major_version 3 %global minor_version 3 -%global teeny_version 6 +%global teeny_version 7 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,7 +27,7 @@ %global rubygems_version 3.5.22 %global rubygems_molinillo_version 0.8.0 %global rubygems_optparse_version 0.4.0 -%global rubygems_tsort_version 0.1.0 +%global rubygems_tsort_version 0.2.0 %global bigdecimal_version 3.1.5 %global did_you_mean_version 1.6.3 @@ -76,7 +76,7 @@ Name: ruby Version: %{ruby_version} Release: %{anolis_release}%{?dist} Summary: An interpreter of object-oriented scripting language -License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD +License: (Ruby OR BSD-2-Clause) AND (Ruby OR BSD-2-Clause OR GPL-1.0-or-later) AND BSD-3-Clause AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND ISC AND LicenseRef-Fedora-Public-Domain AND MIT AND CC0 AND zlib AND Unicode-DFS-2015 AND HPND-Markus-Kuhn AND Ruby-pty URL: https://www.%{name}-lang.org/ Source0: https://cache.%{name}-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz Source1: operating_system.rb @@ -104,13 +104,6 @@ Patch4: %{name}-2.1.0-custom-rubygems-location.patch Patch5: %{name}-2.7.0-Initialize-ABRT-hook.patch Patch6: %{name}-3.1.0-Don-t-query-RubyVM-FrozenCore-for-class-path.patch Patch7: %{name}-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch -#Patch8: %{name}-3.2.0-define-unsupported-gc-compaction-methods-as-rb_f_notimplement.patch -#Patch9: %{name}-3.2.0-define-unsupported-gc-compaction-methods_generated-files.patch -#Patch10: %{name}-3.2.0-Detect-compaction-support-during-runtime.patch -#Patch11: %{name}-irb-1.4.1-drop-rdoc-hard-dep.patch -#Patch12: %{name}-irb-1.4.1-set-rdoc-soft-dep.patch -# https://github.com/ruby/ruby/commit/5fbc1d45f17e4bff7cc61a78a7d788aa32ff390a -#Patch13: %{name}-3.1.4-CVE-2023-36617.patch Suggests: rubypick Requires: %{name}-libs = %{version}-%{release} @@ -121,6 +114,7 @@ BuildRequires: autoconf libffi-devel openssl-devel libyaml-devel readline-devel BuildRequires: procps gcc make zlib-devel %{?with_gmp:BuildRequires: gmp-devel} %{?with_systemtap:BuildRequires: %{_bindir}/dtrace} +%{?with_systemtap:BuildRequires: systemtap-sdt-devel} %{?with_git:BuildRequires: git} %{?with_cmake:BuildRequires: %{_bindir}/cmake} %{?with_hardening_test:BuildRequires: %{_bindir}/checksec} @@ -844,7 +838,6 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %dir %{ruby_libarchdir}/rbconfig %{ruby_libarchdir}/rbconfig.rb %{ruby_libarchdir}/rbconfig/sizeof.so -#%{ruby_libarchdir}/readline.so %{ruby_libarchdir}/ripper.so %{ruby_libarchdir}/socket.so %{ruby_libarchdir}/stringio.so @@ -856,9 +849,6 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %{ruby_libdir}/did_you_mean* %{ruby_libdir}/openssl* %{ruby_libarchdir}/openssl.so -#%{ruby_libdir}/racc* -#%dir %{ruby_libarchdir}/racc -#%{ruby_libarchdir}/gems/racc/cparse.so %{?with_systemtap:%{_systemtap_datadir}} @@ -943,7 +933,6 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %license %{gem_dir}/gems/net-ftp-%{net_ftp_version}/LICENSE.txt %doc %{gem_dir}/gems/net-ftp-%{net_ftp_version}/README.md %{gem_dir}/gems/net-ftp-%{net_ftp_version}/Rakefile -#%{gem_dir}/gems/net-ftp-%{net_ftp_version}/bin %{gem_dir}/gems/net-ftp-%{net_ftp_version}/lib %{gem_dir}/specifications/net-ftp-%{net_ftp_version}.gemspec @@ -962,7 +951,6 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %license %{gem_dir}/gems/net-pop-%{net_pop_version}/LICENSE.txt %doc %{gem_dir}/gems/net-pop-%{net_pop_version}/README.md %{gem_dir}/gems/net-pop-%{net_pop_version}/Rakefile -#%{gem_dir}/gems/net-pop-%{net_pop_version}/bin %{gem_dir}/gems/net-pop-%{net_pop_version}/lib %{gem_dir}/specifications/net-pop-%{net_pop_version}.gemspec @@ -1026,9 +1014,7 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %{gem_dir}/specifications/default/pp-0.5.0.gemspec %{gem_dir}/specifications/default/prettyprint-0.2.0.gemspec %{gem_dir}/specifications/default/pstore-0.1.3.gemspec -#%{gem_dir}/specifications/default/racc-%{racc_version}.gemspec %{gem_dir}/specifications/default/readline-0.0.4.gemspec -#%{gem_dir}/specifications/default/readline-ext-0.1.4.gemspec %{gem_dir}/specifications/default/reline-0.5.10.gemspec %{gem_dir}/specifications/default/resolv-0.3.0.gemspec %{gem_dir}/specifications/default/resolv-replace-0.1.1.gemspec @@ -1150,7 +1136,6 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %{gem_dir}/gems/rbs-%{rbs_version}/sig %{gem_dir}/gems/rbs-%{rbs_version}/exts.mk %{gem_dir}/gems/rbs-%{rbs_version}/stdlib -#%{gem_dir}/gems/rbs-%{rbs_version}/steep %{gem_dir}/specifications/rbs-%{rbs_version}.gemspec %files -n rubygem-rexml @@ -1169,10 +1154,7 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %doc %{gem_dir}/gems/rss-%{rss_version}/NEWS.md %{gem_dir}/gems/rss-%{rss_version}/lib %{gem_dir}/specifications/rss-%{rss_version}.gemspec -#%doc %{gem_dir}/gems/rss-%{rss_version}/Gemfile %doc %{gem_dir}/gems/rss-%{rss_version}/README.md -#%doc %{gem_dir}/gems/rss-%{rss_version}/Rakefile -#%doc %{gem_dir}/gems/rss-%{rss_version}/test %files -n rubygem-typeprof %dir %{gem_dir}/gems/typeprof-%{typeprof_version} @@ -1211,6 +1193,12 @@ rm -rf %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/.github %{_datadir}/ri %changelog +* Thu Mar 20 2025 Xiaoping Liu - 3.3.7-1 +- update to 3.3.7 from 3.3.6 +- Migrated to SPDX license +- Fix CVE-2024-41946 CVE-2024-43398 CVE-2024-41123 +- add BuildRequires systemtap-sdt-devel to Fix _systemtap_datadir + * Wed Nov 13 2024 yangxinyu - 3.3.6-1 - New version 3.3.6