diff --git a/SPECS/ruby/CVE-2020-25613.patch b/SPECS/ruby/CVE-2020-25613.patch index d1b52ed33ba..75edbfd24e5 100644 --- a/SPECS/ruby/CVE-2020-25613.patch +++ b/SPECS/ruby/CVE-2020-25613.patch @@ -12,7 +12,7 @@ diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 294bd91..d34eac7 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb -@@ -226,9 +226,9 @@ def parse(socket=nil) +@@ -227,9 +227,9 @@ def parse(socket=nil) raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'." end @@ -24,7 +24,7 @@ index 294bd91..d34eac7 100644 @keep_alive = true elsif @http_version < "1.1" @keep_alive = false -@@ -503,7 +503,7 @@ def read_body(socket, block) +@@ -508,7 +508,7 @@ def read_body(socket, block) return unless socket if tc = self['transfer-encoding'] case tc diff --git a/SPECS/ruby/ruby.spec b/SPECS/ruby/ruby.spec index 64096fb37d8..484889a7a32 100644 --- a/SPECS/ruby/ruby.spec +++ b/SPECS/ruby/ruby.spec @@ -1,7 +1,7 @@ Summary: Ruby Name: ruby Version: 2.6.6 -Release: 4%{?dist} +Release: 5%{?dist} License: (Ruby OR BSD) AND Public Domain AND MIT AND CC0 AND zlib AND UCD Vendor: Microsoft Corporation Distribution: Mariner @@ -9,6 +9,7 @@ Group: System Environment/Security URL: https://www.ruby-lang.org/en/ Source0: https://cache.ruby-lang.org/pub/ruby/2.6/%{name}-%{version}.tar.xz Patch0: CVE-2020-25613.patch +Patch1: CVE-2020-25613.patch BuildRequires: openssl-devel BuildRequires: readline BuildRequires: readline-devel @@ -62,6 +63,8 @@ sudo -u test make test TESTS="-v" %{_mandir}/man5/* %changelog +* Thu Feb 18 2021 Mariner Autopatcher 2.6.6-5 +- Added patch files ./patches/CVE-2020-25613/CVE-2020-25613.patch * Thu Jan 14 2021 Andrew Phelps - 2.6.6-4 - Run "make test" instead of "make check" to avoid unstable tests.