rpms
/
shim
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import shim-15.8-4.el8_9

Browse Source
c8 imports/c8/shim-15.8-4.el8_9
MSVSphere Packaging Team 10 months ago
parent b96412a01f
commit 8a5607329c
8 changed files with 136 additions and 43 deletions
Show Stats Download Patch File Download Diff File

10
.gitignore vendored
Unescape View File

@ -1,3 +1,13 @@
SOURCES/BOOTIA32.CSV
SOURCES/BOOTX64.CSV
SOURCES/fbaa64.efi
SOURCES/fbia32.efi
SOURCES/fbx64.efi
SOURCES/mmaa64.efi
SOURCES/mmia32.efi
SOURCES/mmx64.efi
SOURCES/redhatsecureboot501.cer
SOURCES/redhatsecurebootca5.cer
SOURCES/shimaa64.efi SOURCES/shimaa64.efi
SOURCES/shimia32.efi SOURCES/shimia32.efi
SOURCES/shimx64.efi SOURCES/shimx64.efi

16
.shim.metadata
Unescape View File

@ -1,3 +1,13 @@
8ab193ad7addd71e4a820081f36d47e5ef727d28 SOURCES/shimaa64.efi 9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV
c04dd5db5d91e8d1f597f2bfd878f55eba05a125 SOURCES/shimia32.efi 6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV
9a08a40a69ba8ad6292a19aca367d819e875d789 SOURCES/shimx64.efi 317f45115504f1ba56f0113dc217460e3c26cf82 SOURCES/fbaa64.efi
4fd02a6b3ec5dc58fcba1a3d8dec69e0cb86f5d5 SOURCES/fbia32.efi
b26bb4ed41e96d6e2b2471dc5d50f0f2c88ff884 SOURCES/fbx64.efi
b2e0f92dba676facda778be739e2959f5e51c077 SOURCES/mmaa64.efi
e8316a74f06a29385eeb7fd734f582e60dc7a2a4 SOURCES/mmia32.efi
77f25d23c6b0bb2f79a47d574f8af5ffe91e2466 SOURCES/mmx64.efi
ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
0cd6ef62726de2f1321bfe6b70f47b788ac38666 SOURCES/shimia32.efi
86855303a18b978cf90d6c244bfe30897f449996 SOURCES/shimx64.efi

BIN
SOURCES/BOOTIA32.CSV
View File

Binary file not shown.
1 shimia32.efi Red Hat Enterprise Linux This is the boot entry for Red Hat Enterprise Linux

BIN
SOURCES/BOOTX64.CSV
View File

Binary file not shown.
1 shimx64.efi Red Hat Enterprise Linux This is the boot entry for Red Hat Enterprise Linux

BIN
SOURCES/redhatsecureboot501.cer
View File

Binary file not shown.

BIN
SOURCES/redhatsecurebootca5.cer
View File

Binary file not shown.

51
SOURCES/shim.rpmmacros
Unescape View File

@ -3,6 +3,8 @@
%global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} %global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
%global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} %global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
%global grub_version 2.02-87.el8_1.11
%global bootcsvaa64 %{expand:%{SOURCE10}} %global bootcsvaa64 %{expand:%{SOURCE10}}
%global bootcsvia32 %{expand:%{SOURCE11}} %global bootcsvia32 %{expand:%{SOURCE11}}
%global bootcsvx64 %{expand:%{SOURCE12}} %global bootcsvx64 %{expand:%{SOURCE12}}
@ -13,9 +15,19 @@
%global shimefix64 %{expand:%{SOURCE22}} %global shimefix64 %{expand:%{SOURCE22}}
#%%global shimefiarm %%{expand:%%{SOURCE23} #%%global shimefiarm %%{expand:%%{SOURCE23}
%global fbefiaa64 %{expand:%{SOURCE30}}
%global fbefiia32 %{expand:%{SOURCE31}}
%global fbefix64 %{expand:%{SOURCE32}}
#%%global fbefiarm %%{expand:%%{SOURCE33}
%global mmefiaa64 %{expand:%{SOURCE40}}
%global mmefiia32 %{expand:%{SOURCE41}}
%global mmefix64 %{expand:%{SOURCE42}}
#%%global mmefiarm %%{expand:%%{SOURCE43}
%global shimveraa64 15-7.el8_1 %global shimveraa64 15-7.el8_1
%global shimveria32 15.6-1.el8 %global shimveria32 15.8-2.el8
%global shimverx64 15.6-1.el8 %global shimverx64 15.8-2.el8
#%%global shimverarm 15-1.el8 #%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@ -36,6 +48,10 @@
%global shimveralt %{expand:%{shimver%{?efi_alt_arch}}} %global shimveralt %{expand:%{shimver%{?efi_alt_arch}}}
%global shimdir %{expand:%{shimdir%{efi_arch}}} %global shimdir %{expand:%{shimdir%{efi_arch}}}
%global shimdiralt %{expand:%{shimdir%{?efi_alt_arch}}} %global shimdiralt %{expand:%{shimdir%{?efi_alt_arch}}}
%global fbefi %{expand:%{fbefi%{efi_arch}}}
%global fbefialt %{expand:%{fbefi%{?efi_alt_arch}}}
%global mmefi %{expand:%{mmefi%{efi_arch}}}
%global mmefialt %{expand:%{mmefi%{?efi_alt_arch}}}
%global unsignednone shim-unsigned-none %global unsignednone shim-unsigned-none
%global unsigned %{expand:%%{unsigned%{efi_arch}}} %global unsigned %{expand:%%{unsigned%{efi_arch}}}
@ -48,6 +64,7 @@ Requires: mokutil >= 1:0.3.0-1 \
Requires: efi-filesystem \ Requires: efi-filesystem \
Provides: shim-signed-%{-a*} = %{version}-%{release} \ Provides: shim-signed-%{-a*} = %{version}-%{release} \
Requires: dbxtool >= 0.6-3 \ Requires: dbxtool >= 0.6-3 \
Conflicts: grub2-efi-%{-a*} < %{grub_version} \
%{expand:%%if 0%%{-p*} \ %{expand:%%if 0%%{-p*} \
Provides: shim = %{version}-%{release} \ Provides: shim = %{version}-%{release} \
Provides: shim-signed = %{version}-%{release} \ Provides: shim-signed = %{version}-%{release} \
@ -69,6 +86,7 @@ version signed by the UEFI signing service. \
# -a <efiarch> # -a <efiarch>
# -i <input> # -i <input>
%define hash(a:i:d:) \ %define hash(a:i:d:) \
if [ 0%{?_unsigned_test_build:%{_unsigned_test_build}} -ne 0 ] ; then \
pesign -i %{-i*} -h -P > shim.hash \ pesign -i %{-i*} -h -P > shim.hash \
read file0 hash0 < shim.hash \ read file0 hash0 < shim.hash \
read file1 hash1 < %{-d*}/shim%{-a*}.hash \ read file1 hash1 < %{-d*}/shim%{-a*}.hash \
@ -77,6 +95,7 @@ version signed by the UEFI signing service. \
echo $hash0 vs $hash1 \ echo $hash0 vs $hash1 \
exit 1 \ exit 1 \
fi \ fi \
fi \
%{nil} %{nil}
# -i <input> # -i <input>
@ -89,7 +108,23 @@ version signed by the UEFI signing service. \
# -a <efiarch> # -a <efiarch>
# -i <input> # -i <input>
%define distrosign(b:a:d:) \ %define distrosign(b:a:d:) \
if [ 0%{?_unsigned_test_build:%{_unsigned_test_build}} -ne 0 ] ; then \
if [ "%{-b*}%{-a*}" = "shim%{efi_arch}" ] ; then \
cp -av "%{shimefi}" %{-b*}%{-a*}-unsigned.efi \
elif [ "%{-b*}%{-a*}" = "shim%{efi_alt_arch}" ] ; then \
cp -av "%{shimefialt}" %{-b*}%{-a*}-unsigned.efi \
elif [ "%{-b*}%{-a*}" = "mm%{efi_arch}" ] ; then \
cp -av "%{mmefi}" %{-b*}%{-a*}-unsigned.efi \
elif [ "%{-b*}%{-a*}" = "mm%{efi_alt_arch}" ] ; then \
cp -av "%{mmefialt}" %{-b*}%{-a*}-unsigned.efi \
elif [ "%{-b*}%{-a*}" = "fb%{efi_arch}" ] ; then \
cp -av "%{fbefi}" %{-b*}%{-a*}-unsigned.efi \
elif [ "%{-b*}%{-a*}" = "fb%{efi_alt_arch}" ] ; then \
cp -av "%{fbefialt}" %{-b*}%{-a*}-unsigned.efi \
fi \
else \
cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \
fi \
%{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi -n redhatsecureboot501 -a %{SOURCE2} -c %{SOURCE1} } \ %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi -n redhatsecureboot501 -a %{SOURCE2} -c %{SOURCE1} } \
%{nil} %{nil}
@ -98,6 +133,7 @@ version signed by the UEFI signing service. \
# -b <1|0> # signed by this builder? # -b <1|0> # signed by this builder?
# -c <1|0> # signed by UEFI CA? # -c <1|0> # signed by UEFI CA?
# -i <shimARCH.efi> # -i <shimARCH.efi>
# -d /usr/share dir for this build (full path)
%define define_build(a:A:b:c:i:d:) \ %define define_build(a:A:b:c:i:d:) \
if [ "%{-c*}" = "yes-temporarily-disabled-20180723" ]; then \ if [ "%{-c*}" = "yes-temporarily-disabled-20180723" ]; then \
%{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \ %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \
@ -107,7 +143,8 @@ if [ "%{-b*}" = "yes" ]; then \
%{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \
mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \ mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \
fi \ fi \
if [ "%{-c*}" = "no" ]; then \ if [ "%{-c*}" = "no" ] || \
[ 0%{?_unsigned_test_build:%{_unsigned_test_build}} -ne 0 ] ; then \
cp shim%{-a*}-%{efi_vendor}.efi shim%{-a*}.efi \ cp shim%{-a*}-%{efi_vendor}.efi shim%{-a*}.efi \
fi \ fi \
%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ %{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \
@ -142,10 +179,10 @@ install -m 0700 fb%{-a*}.efi \\\
# -A <EFIARCH> # -A <EFIARCH>
%define define_files(a:A:) \ %define define_files(a:A:) \
%{expand:%%files -n shim-%{-a*}} \ %{expand:%%files -n shim-%{-a*}} \
%{efi_esp_dir}/*%{-a*}*.efi \ %%verify(not mtime) %{efi_esp_dir}/*%{-a*}*.efi \
%{efi_esp_dir}/BOOT%{-A*}.CSV \ %%verify(not mtime) %{efi_esp_dir}/BOOT%{-A*}.CSV \
%{efi_esp_boot}/*%{-a*}.efi \ %%verify(not mtime) %{efi_esp_boot}/*%{-a*}.efi \
%{efi_esp_boot}/*%{-A*}.EFI \ %%verify(not mtime) %{efi_esp_boot}/*%{-A*}.EFI \
%{nil} %{nil}
%ifarch x86_64 %ifarch x86_64

76
SPECS/shim.spec
Unescape View File

@ -1,6 +1,6 @@
Name: shim Name: shim
Version: 15.6 Version: 15.8
Release: 1%{?dist} Release: 4%{?dist}
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
License: BSD License: BSD
URL: https://github.com/rhboot/shim/ URL: https://github.com/rhboot/shim/
@ -21,28 +21,36 @@ Source2: redhatsecurebootca5.cer
# match, 1 and 11 match, ... # match, 1 and 11 match, ...
Source10: BOOTAA64.CSV Source10: BOOTAA64.CSV
Source20: shimaa64.efi Source20: shimaa64.efi
Source30: mmaa64.efi
Source40: fbaa64.efi
Source11: BOOTIA32.CSV Source11: BOOTIA32.CSV
Source21: shimia32.efi Source21: shimia32.efi
Source31: mmia32.efi
Source41: fbia32.efi
Source12: BOOTX64.CSV Source12: BOOTX64.CSV
Source22: shimx64.efi Source22: shimx64.efi
Source32: mmx64.efi
Source42: fbx64.efi
#Source13: BOOTARM.CSV #Source13: BOOTARM.CSV
#Source23: shimarm.efi #Source23: shimarm.efi
#Source33: mmarm.efi
#Source43: fbarm.efi
%include %{SOURCE0} %include %{SOURCE0}
BuildRequires: pesign >= 0.112-20.fc27 BuildRequires: pesign >= 0.112-20.fc27
# We need this because %%{efi} won't expand before choosing where to make # Right now we're just including all of the parts from them as sources here
# the src.rpm in koji, and we could be on a non-efi architecture, in which # to make the build+errata process less maddening. We do this because
# case we won't have a valid expansion here... To be solved in the future # %%{efi} won't expand before choosing where to make the src.rpm in koji,
# (shim 16+) by making the unsigned packages all provide "shim-unsigned", so # and we could be on a non-efi architecture, in which case we won't have a
# we can just BuildRequires that. # valid expansion here...
%ifarch x86_64 # %% ifarch x86_64
BuildRequires: %{unsignedx64} = %{shimverx64} # BuildRequires: %% {unsignedx64} = %% {shimverx64}
BuildRequires: %{unsignedia32} = %{shimveria32} # BuildRequires: %% {unsignedia32} = %% {shimveria32}
%endif # %% endif
%ifarch aarch64 # %% ifarch aarch64
BuildRequires: %{unsignedaa64} = %{shimveraa64} # BuildRequires: %% {unsignedaa64} = %% {shimveraa64}
%endif # %% endif
#%%ifarch arm #%%ifarch arm
#BuildRequires: %%{unsignedarm} = %%{shimverarm} #BuildRequires: %%{unsignedarm} = %%{shimverarm}
#%%endif #%%endif
@ -63,12 +71,14 @@ rm -rf shim-%{version}
mkdir shim-%{version} mkdir shim-%{version}
%build %build
export PS4='${LINENO}: '
cd shim-%{version} cd shim-%{version}
# Temporarily using _sourcedir to avoid build dep annoyances.
%if %{efi_has_alt_arch} %if %{efi_has_alt_arch}
%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{shimdiralt} %define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{_sourcedir}
%endif %endif
%define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{shimdir} %define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{_sourcedir}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -97,13 +107,39 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif %endif
%if %{provide_legacy_shim} %if %{provide_legacy_shim}
%{efi_esp_dir}/shim.efi %verify(not mtime) %{efi_esp_dir}/shim.efi
%endif %endif
%changelog %changelog
* Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1 * Tue Apr 16 2024 Peter Jones <pjones@redhat.com> - 15.8-4
- Update to shim-15.6 - Bump the release to *-4* to work around a build system issue.
Resolves: CVE-2022-28737 Related: RHEL-11259
* Wed Apr 10 2024 Peter Jones <pjones@redhat.com> - 15.8-3
- Bump the release to -3 to work around a build system issue.
Related: RHEL-11259
* Thu Mar 28 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el8
- Fix rpm verify issue found in testing.
Related: RHEL-11259
* Thu Mar 21 2024 Peter Jones <pjones@redhat.com> - 15.8-1.el8
- Update to shim-15.8 for CVE-2023-40547
Resolves: RHEL-11259
* Wed Apr 20 2022 Peter Jones <pjones@redhat.com> - 15.5-2.el8
- Include the actual signed shim binaries.
Resolves: rhbz#1970632
Resolves: rhbz#1982071
Resolves: rhbz#2000946
Resolves: rhbz#2002265
* Tue Apr 19 2022 Peter Jones <pjones@redhat.com> - 15.5-1
- Update to shim-15.5
Resolves: rhbz#1970632
Resolves: rhbz#1982071
Resolves: rhbz#2000946
Resolves: rhbz#2002265
* Mon Sep 21 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-16 * Mon Sep 21 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-16
- Fix an incorrect allocation size - Fix an incorrect allocation size

Write Preview
Loading…
Cancel
Save