Compare commits

..

2 Commits
c8 ... a8-beta

Author SHA1 Message Date
57ac541491 - Use AlmaLinux cert 2023-03-29 14:27:53 +03:00
a06095b4df AlmaLinux changes 2022-03-18 19:03:01 +03:00
6 changed files with 18 additions and 27 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/redhatsecurebootca5.cer SOURCES/shim-15.6.tar.bz2
SOURCES/shim-15.8.tar.bz2

View File

@ -1,2 +1 @@
e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer 3df0ab5cefc74fdf865cb36aea0e923cb4b6b3ed SOURCES/shim-15.6.tar.bz2
cdec924ca437a4509dcb178396996ddf92c11183 SOURCES/shim-15.8.tar.bz2

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,3,Red Hat Inc,shim,15.8,secalert@redhat.com
1 shim.redhat 3 Red Hat Inc shim 15.8 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 %global __debug_install_post %{SOURCE100} x64 ia32
%undefine _debuginfo_subpackages %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 shimrootdir %{_datadir}/shim/
%global shimversiondir %{shimrootdir}/%{version}-%{release} %global shimversiondir %{shimrootdir}/%{version}-%{release}
%global efiarch x64 %global efiarch x64
@ -17,18 +17,18 @@
%global shimaltdir %{shimversiondir}/%{efialtarch} %global shimaltdir %{shimversiondir}/%{efialtarch}
Name: shim-unsigned-%{efiarch} Name: shim-unsigned-%{efiarch}
Version: 15.8 Version: 15.6
Release: 2.el8 Release: 1.el8.alma.1
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
ExclusiveArch: x86_64 ExclusiveArch: x86_64
License: BSD License: BSD
URL: https://github.com/rhboot/shim URL: https://github.com/rhboot/shim
Source0: https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2 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: # currently here's what's in our dbx:
# nothing. # nothing.
Source2: dbx.esl Source2: dbx.esl
Source3: sbat.redhat.csv Source3: sbat.almalinux.csv
Source4: shim.patches Source4: shim.patches
Source100: shim-find-debuginfo.sh Source100: shim-find-debuginfo.sh
@ -103,17 +103,16 @@ mkdir build-%{efialtarch}
cp %{SOURCE3} data/ cp %{SOURCE3} data/
%build %build
COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6 COMMITID=$(cat commit)
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} " MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
MAKEFLAGS+="ENABLE_SHIM_HASH=true " MAKEFLAGS+="ENABLE_SHIM_HASH=true "
MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
MAKEFLAGS+="%{_smp_mflags}" MAKEFLAGS+="%{_smp_mflags}"
if [ -s "%{SOURCE1}" ]; then if [ -s "%{SOURCE1}" ]; then
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} " MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}"
fi fi
if [ -s "%{SOURCE2}" ]; then if [ -s "%{SOURCE2}" ]; then
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} " MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
fi fi
cd build-%{efiarch} cd build-%{efiarch}
@ -129,16 +128,15 @@ setarch linux32 -B make ${MAKEFLAGS} ARCH=%{efialtarch} \
cd .. cd ..
%install %install
COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6 COMMITID=$(cat commit)
MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} " MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} " MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true " MAKEFLAGS+="ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true "
MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
if [ -s "%{SOURCE1}" ]; then if [ -s "%{SOURCE1}" ]; then
MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} " MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}"
fi fi
if [ -s "%{SOURCE2}" ]; then if [ -s "%{SOURCE2}" ]; then
MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} " MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
fi fi
cd build-%{efiarch} cd build-%{efiarch}
@ -180,13 +178,8 @@ cd ..
%files debugsource -f build-%{efiarch}/debugsource.list %files debugsource -f build-%{efiarch}/debugsource.list
%changelog %changelog
* Wed Feb 07 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8 * Mon Jun 20 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 15.6-1.el8.alma.1
- Rebuild to fix the commit ident and MAKEFLAGS - Use AlmaLinux cert and SBAT entry
Resolves: RHEL-11259
* Tue Dec 05 2023 Peter Jones <pjones@redhat.com> - 15.8-1.el8
- Update to shim-15.8 for CVE-2023-40547
Resolves: RHEL-11259
* Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8 * Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el8
- Update to shim-15.6 - Update to shim-15.6