diff --git a/SOURCES/clsecureboot001.cer b/SOURCES/clsecureboot001.cer deleted file mode 100644 index ca9ce5d..0000000 Binary files a/SOURCES/clsecureboot001.cer and /dev/null differ diff --git a/SOURCES/sbat.almalinux.csv b/SOURCES/sbat.almalinux.csv new file mode 100644 index 0000000..d64c2cf --- /dev/null +++ b/SOURCES/sbat.almalinux.csv @@ -0,0 +1 @@ +shim.almalinux,2,AlmaLinux,shim,15.6,security@almalinux.org diff --git a/SOURCES/sbat.cloudlinux.csv b/SOURCES/sbat.cloudlinux.csv deleted file mode 100644 index 606757e..0000000 --- a/SOURCES/sbat.cloudlinux.csv +++ /dev/null @@ -1 +0,0 @@ -shim.cloudlinux,2,CloudLinux,shim,15.6,security@cloudlinux.com diff --git a/SOURCES/vendor_db.esl b/SOURCES/vendor_db.esl new file mode 100644 index 0000000..146fd75 Binary files /dev/null and b/SOURCES/vendor_db.esl differ diff --git a/SPECS/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64.spec index 3c85326..86ae4af 100644 --- a/SPECS/shim-unsigned-x64.spec +++ b/SPECS/shim-unsigned-x64.spec @@ -18,17 +18,17 @@ Name: shim-unsigned-%{efiarch} Version: 15.6 -Release: 1.el8.alma +Release: 1.el8.alma.1 Summary: First-stage UEFI bootloader ExclusiveArch: x86_64 License: BSD URL: https://github.com/rhboot/shim Source0: https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2 -Source1: clsecureboot001.cer +Source1: vendor_db.esl # currently here's what's in our dbx: # nothing. Source2: dbx.esl -Source3: sbat.cloudlinux.csv +Source3: sbat.almalinux.csv Source4: shim.patches Source100: shim-find-debuginfo.sh @@ -109,7 +109,7 @@ MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="ENABLE_SHIM_HASH=true " MAKEFLAGS+="%{_smp_mflags}" if [ -s "%{SOURCE1}" ]; then - MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}" + MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}" fi if [ -s "%{SOURCE2}" ]; then MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}" @@ -133,7 +133,7 @@ MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} " MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true " if [ -s "%{SOURCE1}" ]; then - MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}" + MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}" fi if [ -s "%{SOURCE2}" ]; then MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}" @@ -178,8 +178,8 @@ cd .. %files debugsource -f build-%{efiarch}/debugsource.list %changelog -* Fri Jun 17 2022 Eduard Abdullin - 15.6-1.el8.alma -- Use CloudLinux vendor cert and SBAT entry +* Mon Jun 20 2022 Andrew Lukoshko - 15.6-1.el8.alma.1 +- Use AlmaLinux vendor_db and SBAT entry * Wed Jun 01 2022 Peter Jones - 15.6-1.el8 - Update to shim-15.6