From 40cc9cace6b22ea6d9dc40486371fda112df550a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 5 Aug 2022 10:13:12 +0000 Subject: [PATCH] import edk2-20220126gitbb1bba3d77-3.el8 --- .edk2.metadata | 2 +- .gitignore | 2 +- SPECS/edk2.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.edk2.metadata b/.edk2.metadata index ae039d3..e96c74f 100644 --- a/.edk2.metadata +++ b/.edk2.metadata @@ -1,3 +1,3 @@ fdcb04021414cdd5a7e286058ca36aca359d323d SOURCES/RedHatSecureBootPkKek1.pem ae830c7278f985cb25e90f4687b46c8b22316bef SOURCES/edk2-bb1bba3d77.tar.xz -801c454f41332e2dcc783983e65a6930ee7cb810 SOURCES/openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz +50747c8a7bb55619b69e95683c7c4172d52d1974 SOURCES/openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz diff --git a/.gitignore b/.gitignore index b36237f..fc7fd78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/RedHatSecureBootPkKek1.pem SOURCES/edk2-bb1bba3d77.tar.xz -SOURCES/openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz +SOURCES/openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz diff --git a/SPECS/edk2.spec b/SPECS/edk2.spec index 88eead7..95ba556 100644 --- a/SPECS/edk2.spec +++ b/SPECS/edk2.spec @@ -7,7 +7,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 2%{?dist} +Release: 3%{?dist} Summary: UEFI firmware for 64-bit virtual machines Group: Applications/Emulators License: BSD-2-Clause-Patent and OpenSSL and MIT @@ -19,7 +19,7 @@ URL: http://www.tianocore.org # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz Source0: http://batcave.lab.eng.brq.redhat.com/www/edk2-%{GITCOMMIT}.tar.xz Source1: ovmf-whitepaper-c770f8c.txt -Source2: openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz +Source2: openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz Source3: ovmf-vars-generator Source4: LICENSE.qosb Source5: RedHatSecureBootPkKek1.pem @@ -49,7 +49,7 @@ Patch0023: 0023-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch Patch0024: 0024-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch Patch0025: 0025-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch Patch0026: 0026-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch -# For bz#2041754 - Mark SEV launch secret area as reserved +# For bz#2112307 - Mark SEV launch secret area as reserved Patch27: edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch @@ -495,9 +495,14 @@ true %endif %changelog +* Tue Aug 02 2022 Camilla Conte - 20220126gitbb1bba3d77-3 +- Bumping OpenSSL version [bz# 2074834] +- Resolves: bz# 2074834 + (edk2: sync openssl sources with rhel openssl rpm) + * Tue Mar 01 2022 Jon Maloy - 20220126gitbb1bba3d77-2 -- edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch [bz#2041754] -- Resolves: bz#2041754 +- edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch [bz#2112307] +- Resolves: bz#2112307 (Mark SEV launch secret area as reserved) * Wed Feb 02 2022 Jon Maloy - 20220126gitbb1bba3d77-1.el8