Compare commits

...

3 Commits
c8 ... a8-rekey

Author SHA1 Message Date
Andrew Lukoshko 32b4d8fe71 Use AlmaLinux vendor_db and SBAT entry 2022-06-20 11:51:35 +00:00
eabdullin 05cdfa96b6 Merge branch 'c8' into a8 2022-06-17 15:37:53 +03:00
Andrew Lukoshko 7d184fed57 AlmaLinux changes 2021-09-15 11:46:22 +00:00
5 changed files with 10 additions and 7 deletions

Binary file not shown.

View File

@ -0,0 +1 @@
shim.almalinux,2,AlmaLinux,shim,15.6,security@almalinux.org
1 shim.almalinux 2 AlmaLinux shim 15.6 security@almalinux.org

View File

@ -1 +0,0 @@
shim.redhat,1,Red Hat Inc,shim,15.5,secalert@redhat.com
1 shim.redhat 1 Red Hat Inc shim 15.5 secalert@redhat.com

BIN
SOURCES/vendor_db.esl Normal file

Binary file not shown.

View File

@ -8,7 +8,7 @@
%global __debug_install_post %{SOURCE100} x64 ia32
%undefine _debuginfo_subpackages
%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
%global efidir almalinux
%global shimrootdir %{_datadir}/shim/
%global shimversiondir %{shimrootdir}/%{version}-%{release}
%global efiarch x64
@ -18,17 +18,17 @@
Name: shim-unsigned-%{efiarch}
Version: 15.6
Release: 1.el8
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: redhatsecurebootca5.cer
Source1: vendor_db.esl
# currently here's what's in our dbx:
# nothing.
Source2: dbx.esl
Source3: sbat.redhat.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,6 +178,9 @@ cd ..
%files debugsource -f build-%{efiarch}/debugsource.list
%changelog
* Mon Jun 20 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 15.6-1.el8.alma.1
- Use AlmaLinux vendor_db and SBAT entry
* Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
- Update to shim-15.6
Resolves: CVE-2022-28737