Skip to content

[AUTOPATCHER] Patches CVE-2020-25613 for ruby #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CBL-Mariner-Bot wants to merge 1 commit into
base: 1.0
Choose a base branch
from
Open

[AUTOPATCHER] Patches CVE-2020-25613 for ruby #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SPECS/ruby/CVE-2020-25613.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion SPECS/ruby/ruby.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
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
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
Expand Down Expand Up @@ -62,6 +63,8 @@ sudo -u test make test TESTS="-v"
%{_mandir}/man5/*

%changelog
* Thu Feb 18 2021 Mariner Autopatcher <cblmargh@microsoft.com> 2.6.6-5
- Added patch files ./patches/CVE-2020-25613/CVE-2020-25613.patch
* Thu Jan 14 2021 Andrew Phelps <anphel@microsoft.com> - 2.6.6-4
- Run "make test" instead of "make check" to avoid unstable tests.

Expand Down