From 42627175955260a26db549db5ec5813c2339aa99 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Tue, 1 Oct 2019 10:54:49 +0100 Subject: ruby: drop long-merged CVE patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CVE patches here address the original problem in a different way to how upstream solved it, and are superfluous. Ruby updated to Onigmo v6.1.3+669ac999761 before its v2.5.0 release, and both CVEs were fixed before Onigmo v6.1.3: https://github.com/k-takata/Onigmo/releases/tag/Onigmo-6.1.3 https://github.com/k-takata/Onigmo/commits/Onigmo-6.1.3 https://github.com/k-takata/Onigmo/commit/40945546578004bf40e6f884834bcad4054c70f7 https://github.com/k-takata/Onigmo/commit/783b7ef491e1422e4be7407ccc3e4305e5013507 Because the issues were fixed differently here and in Ruby (Onigmo), patch never complained about duplicatation during recipe updates. (From OE-Core rev: 90dbe9019c81e25923ed450df80b4401d16287b4) Signed-off-by: André Draszik Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.5.5.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta/recipes-devtools/ruby/ruby_2.5.5.bb') diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/meta/recipes-devtools/ruby/ruby_2.5.5.bb index 8ad59a7657..4082b02f14 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb @@ -1,8 +1,6 @@ require ruby.inc SRC_URI += " \ - file://ruby-CVE-2017-9226.patch \ - file://ruby-CVE-2017-9228.patch \ file://run-ptest \ " -- cgit v1.2.3-54-g00ecf