summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-07-19 14:25:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-21 11:08:11 +0100
commitbea8a284b1e32ed55a7f1c05746e6032b44e3897 (patch)
tree16a5f66d56471777efa8e9c1bdf11d08a221753c
parentbc60068577b9dfecb9d33740987b8b4f283a4fa2 (diff)
downloadpoky-bea8a284b1e32ed55a7f1c05746e6032b44e3897.tar.gz
ruby: upgrade 3.3.0 -> 3.3.4
3.3.4: This release fixes a regression in Ruby 3.3.3 that dependencies are missing in the gemspec of some bundled gems: net-pop, net-ftp, net-imap, and prime [Bug like Heroku. If your bundle install runs correctly now, you may not have this issue. 3.3.3: This release includes: RubyGems 3.5.11 Bundler 2.5.11 REXML 3.2.8 strscan 3.0.9 --dump=prism_parsetree is replaced by --parser=prism --dump=parsetree Invalid encoding symbols raise SyntaxError instead of EncodingError Memory leak fix in Ripper parsing Bugfixes for YJIT, **{}, Ripper.tokenize, RubyVM::InstructionSequence#to_binary, --with-gmp, and some build environments 3.3.2: This release includes many bug-fixes. See the GitHub releases for further details. 3.3.1: This release includes security fixes. Please check the topics below for details. CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc CVE-2024-27280: Buffer overread vulnerability in StringIO (From OE-Core rev: 498ee932187b9c09d14892783eb92ae03fbfd533) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch6
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch2
-rw-r--r--meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch2
-rw-r--r--meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch2
-rw-r--r--meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch2
-rw-r--r--meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch9
-rw-r--r--meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch2
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.3.4.bb (renamed from meta/recipes-devtools/ruby/ruby_3.3.0.bb)2
8 files changed, 12 insertions, 15 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
index 7402e76333..bd8f736247 100644
--- a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
+++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
@@ -1,4 +1,4 @@
1From caa03f46a3204a7e0f0e5d9d9cc9113304dc0382 Mon Sep 17 00:00:00 2001 1From b74950d4f06bbfb91b2e68044147a226c15f4639 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 30 Sep 2019 16:57:01 +0100 3Date: Mon, 30 Sep 2019 16:57:01 +0100
4Subject: [PATCH] extmk: fix cross-compilation of external gems 4Subject: [PATCH] extmk: fix cross-compilation of external gems
@@ -16,10 +16,10 @@ Signed-off-by: André Draszik <andre.draszik@jci.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/ext/extmk.rb b/ext/extmk.rb 18diff --git a/ext/extmk.rb b/ext/extmk.rb
19index 428ffc9..87eff71 100755 19index d9c2417..da14c49 100755
20--- a/ext/extmk.rb 20--- a/ext/extmk.rb
21+++ b/ext/extmk.rb 21+++ b/ext/extmk.rb
22@@ -420,8 +420,8 @@ else 22@@ -428,8 +428,8 @@ else
23 end 23 end
24 $ruby = [$ruby] 24 $ruby = [$ruby]
25 $ruby << "-I'$(topdir)'" 25 $ruby << "-I'$(topdir)'"
diff --git a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
index 67054d6553..bc1744da82 100644
--- a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
+++ b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
@@ -1,4 +1,4 @@
1From 980dcc5380db6f03451357140ae1487117300156 Mon Sep 17 00:00:00 2001 1From f4edf72c76bc06fa92c61f6cb9163cc777912a1f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jan 2022 20:29:14 -0800 3Date: Tue, 25 Jan 2022 20:29:14 -0800
4Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv 4Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
index f3a65e785d..6f95685917 100644
--- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
+++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
@@ -1,4 +1,4 @@
1From 7f7facb85bd65adec24230fe8ca7f6a9863a1fd0 Mon Sep 17 00:00:00 2001 1From e6267676addd27f3c02667116185211d711ef940 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Thu, 5 May 2016 10:59:07 -0700 3Date: Thu, 5 May 2016 10:59:07 -0700
4Subject: [PATCH] Obey LDFLAGS for the link of libruby 4Subject: [PATCH] Obey LDFLAGS for the link of libruby
diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
index e2d5b57c25..abbbd35702 100644
--- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
+++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
@@ -1,4 +1,4 @@
1From 5079e678ce2a81416088c04f9123cd8207d5def2 Mon Sep 17 00:00:00 2001 1From 09a6df0d32e2177406ed391e536c0c7c4b503c5d Mon Sep 17 00:00:00 2001
2From: Christian Hofstaedtler <zeha@debian.org> 2From: Christian Hofstaedtler <zeha@debian.org>
3Date: Tue, 10 Oct 2017 15:04:34 -0300 3Date: Tue, 10 Oct 2017 15:04:34 -0300
4Subject: [PATCH] rdoc: build reproducible documentation 4Subject: [PATCH] rdoc: build reproducible documentation
diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
index b14a731cfb..f08aaf555f 100644
--- a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
+++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
@@ -1,4 +1,4 @@
1From 99734381652602f76075017576a819c427ebb5f2 Mon Sep 17 00:00:00 2001 1From f491fff7d006954c1c51eb7a513a85bdbab0fe5a Mon Sep 17 00:00:00 2001
2From: Reiner Herrmann <reiner@reiner-h.de> 2From: Reiner Herrmann <reiner@reiner-h.de>
3Date: Tue, 10 Oct 2017 15:06:13 -0300 3Date: Tue, 10 Oct 2017 15:06:13 -0300
4Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile 4Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile
diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
index 24268625a2..5570cdfcaa 100644
--- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
+++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
@@ -1,4 +1,4 @@
1From 3bc324379aa3e322bad9353da8c0064cd671cc74 Mon Sep 17 00:00:00 2001 1From 91304f26dd4153ecae752ea875eec9ce2d5d3963 Mon Sep 17 00:00:00 2001
2From: Lucas Kanashiro <kanashiro@debian.org> 2From: Lucas Kanashiro <kanashiro@debian.org>
3Date: Fri, 1 Nov 2019 15:25:17 -0300 3Date: Fri, 1 Nov 2019 15:25:17 -0300
4Subject: [PATCH] Make gemspecs reproducible 4Subject: [PATCH] Make gemspecs reproducible
@@ -12,10 +12,10 @@ Upstream-Status: Backport [debian]
12 1 file changed, 3 insertions(+), 1 deletion(-) 12 1 file changed, 3 insertions(+), 1 deletion(-)
13 13
14diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb 14diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15index a0c7faa..f0722d9 100644 15index 05ce483..5f2dbd1 100644
16--- a/lib/rubygems/specification.rb 16--- a/lib/rubygems/specification.rb
17+++ b/lib/rubygems/specification.rb 17+++ b/lib/rubygems/specification.rb
18@@ -1774,7 +1774,9 @@ class Gem::Specification < Gem::BasicSpecification 18@@ -1698,7 +1698,9 @@ class Gem::Specification < Gem::BasicSpecification
19 raise(Gem::InvalidSpecificationException, 19 raise(Gem::InvalidSpecificationException,
20 "invalid date format in specification: #{date.inspect}") 20 "invalid date format in specification: #{date.inspect}")
21 end 21 end
@@ -26,6 +26,3 @@ index a0c7faa..f0722d9 100644
26 Time.utc(date.year, date.month, date.day) 26 Time.utc(date.year, date.month, date.day)
27 else 27 else
28 TODAY 28 TODAY
29--
302.39.2
31
diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
index 21604dfc34..8a1daba7bd 100644
--- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
+++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
@@ -1,4 +1,4 @@
1From 1dc7ef09c3c567c4adb09ccfd97e0e59c58edb9f Mon Sep 17 00:00:00 2001 1From 42f8019e62f392f5bc09c25e90cc63123eb764fe Mon Sep 17 00:00:00 2001
2From: Lucas Kanashiro <kanashiro@debian.org> 2From: Lucas Kanashiro <kanashiro@debian.org>
3Date: Fri, 1 Nov 2019 15:25:17 -0300 3Date: Fri, 1 Nov 2019 15:25:17 -0300
4Subject: [PATCH] Make gemspecs reproducible 4Subject: [PATCH] Make gemspecs reproducible
diff --git a/meta/recipes-devtools/ruby/ruby_3.3.0.bb b/meta/recipes-devtools/ruby/ruby_3.3.4.bb
index 657fc31b4d..ebff4136c9 100644
--- a/meta/recipes-devtools/ruby/ruby_3.3.0.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.3.4.bb
@@ -47,7 +47,7 @@ do_configure:prepend() {
47 47
48DEPENDS:append:libc-musl = " libucontext" 48DEPENDS:append:libc-musl = " libucontext"
49 49
50SRC_URI[sha256sum] = "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d" 50SRC_URI[sha256sum] = "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34"
51 51
52PACKAGECONFIG ??= "" 52PACKAGECONFIG ??= ""
53PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 53PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"