diff options
Diffstat (limited to 'poky/meta/recipes-devtools/ruby')
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch | 34 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb | 1 |
3 files changed, 1 insertions, 36 deletions
diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index 5a5bef202..eaf5d13ac 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "\ " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline" -DEPENDS_class-native = "openssl-native libyaml-native" +DEPENDS_class-native = "openssl-native libyaml-native readline-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ diff --git a/poky/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch b/poky/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch deleted file mode 100644 index 22fa1b5f4..000000000 --- a/poky/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b931fc03b819b9a0214be3eaca844ef534175e2 Mon Sep 17 00:00:00 2001 -From: Jonathan Claudius <jclaudius@mozilla.com> -Date: Wed, 7 Feb 2018 23:54:52 -0500 -Subject: [PATCH] Non-working patch for deducing symlinked base-dirs - ---- -CVE: CVE-2018-1000073 - -Fixed in ruby 2.7.6. - -Upstream-Status: Backport [github.com/rubygems/rubygems/commit/1b931fc...] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- - lib/rubygems/package.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb -index dede959..cb9c74a 100644 ---- a/lib/rubygems/package.rb -+++ b/lib/rubygems/package.rb -@@ -421,6 +421,8 @@ EOM - destination_dir = File.expand_path destination_dir - - destination = File.join destination_dir, filename -+ destination = File.realpath destination if -+ File.respond_to? :realpath - destination = File.expand_path destination - - raise Gem::Package::PathError.new(destination, destination_dir) unless --- -1.7.9.5 - diff --git a/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb b/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb index e9f045378..3fb427e90 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_2.5.3.bb @@ -3,7 +3,6 @@ require ruby.inc SRC_URI += " \ file://ruby-CVE-2017-9226.patch \ file://ruby-CVE-2017-9228.patch \ - file://CVE-2018-1000073.patch \ " SRC_URI[md5sum] = "20c85b67846d49622ef3b24230803fef" |