From 00906cec1de8f3c7e7f820bcf79e787041ed37ac Mon Sep 17 00:00:00 2001 From: jslobodzian Date: Thu, 24 Mar 2022 18:46:05 -0700 Subject: [PATCH] Enable symcrypt detection (#2582) --- SPECS/openssl/openssl.spec | 7 +++++-- .../manifests/package/pkggen_core_aarch64.txt | 12 ++++++------ .../manifests/package/pkggen_core_x86_64.txt | 12 ++++++------ .../manifests/package/toolchain_aarch64.txt | 12 ++++++------ .../resources/manifests/package/toolchain_x86_64.txt | 12 ++++++------ 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 631b37a067..2a968d5134 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 12%{?dist} +Release: 13%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -139,7 +139,7 @@ cp %{SOURCE4} test/ %patch19 -p1 %patch20 -p1 %patch21 -p1 -# %patch22 -p1 +%patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 @@ -332,6 +332,9 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist %postun libs -p /sbin/ldconfig %changelog +* Wed Mar 23 2022 Jon Slobodzian - 1.1.1k-13 +- Enable symcrypt detection patch. + * Thu Mar 10 2022 Pawel Winogrodzki - 1.1.1k-12 - Adding a patch for CVE-2022-0778. diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 002e40278f..d594329265 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -165,12 +165,12 @@ texinfo-6.8-1.cm2.aarch64.rpm gtk-doc-1.33.2-1.cm2.noarch.rpm autoconf-2.71-3.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm -openssl-1.1.1k-12.cm2.aarch64.rpm -openssl-debuginfo-1.1.1k-12.cm2.aarch64.rpm -openssl-devel-1.1.1k-12.cm2.aarch64.rpm -openssl-libs-1.1.1k-12.cm2.aarch64.rpm -openssl-perl-1.1.1k-12.cm2.aarch64.rpm -openssl-static-1.1.1k-12.cm2.aarch64.rpm +openssl-1.1.1k-13.cm2.aarch64.rpm +openssl-debuginfo-1.1.1k-13.cm2.aarch64.rpm +openssl-devel-1.1.1k-13.cm2.aarch64.rpm +openssl-libs-1.1.1k-13.cm2.aarch64.rpm +openssl-perl-1.1.1k-13.cm2.aarch64.rpm +openssl-static-1.1.1k-13.cm2.aarch64.rpm libcap-2.26-2.cm2.aarch64.rpm libcap-devel-2.26-2.cm2.aarch64.rpm debugedit-5.0-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 9d565702c7..6ede1ed285 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -165,12 +165,12 @@ texinfo-6.8-1.cm2.x86_64.rpm gtk-doc-1.33.2-1.cm2.noarch.rpm autoconf-2.71-3.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm -openssl-1.1.1k-12.cm2.x86_64.rpm -openssl-devel-1.1.1k-12.cm2.x86_64.rpm -openssl-libs-1.1.1k-12.cm2.x86_64.rpm -openssl-perl-1.1.1k-12.cm2.x86_64.rpm -openssl-static-1.1.1k-12.cm2.x86_64.rpm -openssl-debuginfo-1.1.1k-12.cm2.x86_64.rpm +openssl-1.1.1k-13.cm2.x86_64.rpm +openssl-devel-1.1.1k-13.cm2.x86_64.rpm +openssl-libs-1.1.1k-13.cm2.x86_64.rpm +openssl-perl-1.1.1k-13.cm2.x86_64.rpm +openssl-static-1.1.1k-13.cm2.x86_64.rpm +openssl-debuginfo-1.1.1k-13.cm2.x86_64.rpm libcap-2.26-2.cm2.x86_64.rpm libcap-devel-2.26-2.cm2.x86_64.rpm debugedit-5.0-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 7dac3cf978..14507171ea 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -255,12 +255,12 @@ nspr-4.30-1.cm2.aarch64.rpm nspr-debuginfo-4.30-1.cm2.aarch64.rpm nspr-devel-4.30-1.cm2.aarch64.rpm ntsysv-1.20-2.cm2.aarch64.rpm -openssl-1.1.1k-12.cm2.aarch64.rpm -openssl-debuginfo-1.1.1k-12.cm2.aarch64.rpm -openssl-devel-1.1.1k-12.cm2.aarch64.rpm -openssl-libs-1.1.1k-12.cm2.aarch64.rpm -openssl-perl-1.1.1k-12.cm2.aarch64.rpm -openssl-static-1.1.1k-12.cm2.aarch64.rpm +openssl-1.1.1k-13.cm2.aarch64.rpm +openssl-debuginfo-1.1.1k-13.cm2.aarch64.rpm +openssl-devel-1.1.1k-13.cm2.aarch64.rpm +openssl-libs-1.1.1k-13.cm2.aarch64.rpm +openssl-perl-1.1.1k-13.cm2.aarch64.rpm +openssl-static-1.1.1k-13.cm2.aarch64.rpm p11-kit-0.24.1-1.cm2.aarch64.rpm p11-kit-debuginfo-0.24.1-1.cm2.aarch64.rpm p11-kit-devel-0.24.1-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 06d13daa2d..c35ae773c6 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -255,12 +255,12 @@ nspr-4.30-1.cm2.x86_64.rpm nspr-debuginfo-4.30-1.cm2.x86_64.rpm nspr-devel-4.30-1.cm2.x86_64.rpm ntsysv-1.20-2.cm2.x86_64.rpm -openssl-1.1.1k-12.cm2.x86_64.rpm -openssl-debuginfo-1.1.1k-12.cm2.x86_64.rpm -openssl-devel-1.1.1k-12.cm2.x86_64.rpm -openssl-libs-1.1.1k-12.cm2.x86_64.rpm -openssl-perl-1.1.1k-12.cm2.x86_64.rpm -openssl-static-1.1.1k-12.cm2.x86_64.rpm +openssl-1.1.1k-13.cm2.x86_64.rpm +openssl-debuginfo-1.1.1k-13.cm2.x86_64.rpm +openssl-devel-1.1.1k-13.cm2.x86_64.rpm +openssl-libs-1.1.1k-13.cm2.x86_64.rpm +openssl-perl-1.1.1k-13.cm2.x86_64.rpm +openssl-static-1.1.1k-13.cm2.x86_64.rpm p11-kit-0.24.1-1.cm2.x86_64.rpm p11-kit-debuginfo-0.24.1-1.cm2.x86_64.rpm p11-kit-devel-0.24.1-1.cm2.x86_64.rpm