Skip to content

Commit 035c997

Browse files
committed
Restore Ruby 2.6.9 upgrade (Revert "Revert "Ruby: upgrade to 2.6.9 to fix CVE-2021-41817, CVE-2021-41819 (#2366)"")
This reverts commit 85543c7.
1 parent 3067740 commit 035c997

File tree

4 files changed

+9
-114
lines changed

4 files changed

+9
-114
lines changed

SPECS/ruby/CVE-2021-32066.patch

Lines changed: 0 additions & 108 deletions
This file was deleted.

SPECS/ruby/ruby.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"ruby-2.6.7.tar.xz": "f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611"
3+
"ruby-2.6.9.tar.xz": "6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece"
44
}
55
}

SPECS/ruby/ruby.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Summary: Ruby
22
Name: ruby
3-
Version: 2.6.7
4-
Release: 3%{?dist}
3+
Version: 2.6.9
4+
Release: 1%{?dist}
55
License: (Ruby OR BSD) AND Public Domain AND MIT AND CC0 AND zlib AND UCD
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
88
Group: System Environment/Security
99
URL: https://www.ruby-lang.org/en/
1010
Source0: https://cache.ruby-lang.org/pub/ruby/2.6/%{name}-%{version}.tar.xz
11-
Patch0: CVE-2021-32066.patch
11+
1212
BuildRequires: openssl-devel
1313
BuildRequires: readline
1414
BuildRequires: readline-devel
@@ -62,6 +62,9 @@ sudo -u test make test TESTS="-v"
6262
%{_mandir}/man5/*
6363

6464
%changelog
65+
* Tue Mar 01 2022 Nicolas Guibourge <[email protected]> - 2.6.9-1
66+
- Upgrade to 2.6.9 to fix CVE-2021-41817, CVE-2021-41819
67+
6568
* Thu Jan 20 2022 Cameron Baird <[email protected]> - 2.6.7-3
6669
- Bump release to build and republish with mariner-rpm-macros fix to filter out references to module_info.ld in pkgconfig files
6770

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7125,8 +7125,8 @@
71257125
"type": "other",
71267126
"other": {
71277127
"name": "ruby",
7128-
"version": "2.6.7",
7129-
"downloadUrl": "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.7.tar.xz"
7128+
"version": "2.6.9",
7129+
"downloadUrl": "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.9.tar.xz"
71307130
}
71317131
}
71327132
},

0 commit comments

Comments
 (0)