diff options
author | André Draszik <andre.draszik@jci.com> | 2019-10-01 10:54:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-02 10:09:48 +0100 |
commit | 42627175955260a26db549db5ec5813c2339aa99 (patch) | |
tree | b9efd00c1f43a1eb6243b6c053c8108b1fa57ae1 /meta/recipes-devtools/ruby/ruby_2.5.5.bb | |
parent | 6e3d16b565b504765577f8442650a268c3fe7c57 (diff) | |
download | poky-42627175955260a26db549db5ec5813c2339aa99.tar.gz |
ruby: drop long-merged CVE patches
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 <andre.draszik@jci.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby_2.5.5.bb')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.5.5.bb | 2 |
1 files changed, 0 insertions, 2 deletions
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 @@ | |||
1 | require ruby.inc | 1 | require ruby.inc |
2 | 2 | ||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://ruby-CVE-2017-9226.patch \ | ||
5 | file://ruby-CVE-2017-9228.patch \ | ||
6 | file://run-ptest \ | 4 | file://run-ptest \ |
7 | " | 5 | " |
8 | 6 | ||