From 93bc040f9f70a552e9e2171af09a969a97b8be14 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 7 Feb 2024 12:37:56 -0500 Subject: [PATCH] Rebuild to fix the commit ident and MAKEFLAGS Resolves: RHEL-56466 Signed-off-by: Peter Jones Signed-off-by: Nicolas Frayer --- shim-unsigned-x64.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/shim-unsigned-x64.spec b/shim-unsigned-x64.spec index b8099ad..df27ed3 100644 --- a/shim-unsigned-x64.spec +++ b/shim-unsigned-x64.spec @@ -20,7 +20,7 @@ Name: shim-unsigned-%{efiarch} Version: 15.8 -Release: 1.el9 +Release: 2.el9 Summary: First-stage UEFI bootloader ExclusiveArch: x86_64 License: BSD @@ -103,8 +103,8 @@ mkdir build-%{efialtarch} cp %{SOURCE3} data/ %build -COMMITID=$(cat commit) -MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} " +COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6 +MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} " MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="ENABLE_SHIM_HASH=true " MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 " @@ -125,17 +125,17 @@ make ${MAKEFLAGS} \ cd .. %install -COMMITID=$(cat commit) -MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} " +COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6 +MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} " MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="ENABLE_SHIM_HASH=true " MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 " if [ -f "%{SOURCE1}" ]; then - MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}" + MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1} " fi %if 0%{?dbxfile} if [ -f "%{SOURCE2}" ]; then - MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}" + MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} " fi %endif @@ -160,6 +160,10 @@ cd .. %files debugsource -f build-%{efiarch}/debugsource.list %changelog +* Wed Feb 07 2024 Peter Jones - 15.8-2.el9 +- Rebuild to fix the commit ident and MAKEFLAGS + Resolves: RHEL-56466 + * Tue Jan 23 2024 Peter Jones - 15.8-1.el9 - Update to shim-15.8 for CVE-2023-40547 Resolves: RHEL-56466