Compare commits

...

No commits in common. 'c9' and 'i9' have entirely different histories.
c9 ... i9

5
.gitignore vendored

@ -1,9 +1,4 @@
SOURCES/BOOTX64.CSV
SOURCES/fbaa64.efi
SOURCES/fbx64.efi SOURCES/fbx64.efi
SOURCES/mmaa64.efi
SOURCES/mmx64.efi SOURCES/mmx64.efi
SOURCES/redhatsecureboot501.cer
SOURCES/redhatsecurebootca5.cer
SOURCES/shimaa64.efi SOURCES/shimaa64.efi
SOURCES/shimx64.efi SOURCES/shimx64.efi

@ -1,9 +1,6 @@
6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV 752e659f67bd7843621c0541010b0181691e805a SOURCES/fbaa64.efi
62b636517840e4f3027a3ecd549b7b3a95b05795 SOURCES/fbaa64.efi d698a35d8a0a0a888ae18a8d01e37d75a00a911a SOURCES/mmaa64.efi
9f6113ea26646fa3322c531e43c7522802bb3ecf SOURCES/fbx64.efi 7dbef0fa3ddbdeb410dbc86d3cf2f0058c8b1ee7 SOURCES/shimaa64.efi
211c4c134f7e1375f4618daa1e4858dd4259444a SOURCES/mmaa64.efi 628c6f1c89f367a37180648d9fef870fc47bea05 SOURCES/fbx64.efi
933fe1154b024bfdab69346e78eaf4778fc2b76d SOURCES/mmx64.efi a644618036c4a3d8527c001d590194e1581987ee SOURCES/mmx64.efi
ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer 7ebdbf62e1257c3c7b86a148fdc0487b92274d0d SOURCES/shimx64.efi
e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
9c8bae2617420ba18ca6b6ac061a5bae6beb0040 SOURCES/shimaa64.efi
51bb003a7527b85e31fed0db68254a504c559dad SOURCES/shimx64.efi

Binary file not shown.

Binary file not shown.
1 s�h�i�m�x�6�4�.�e�f�i�,�m�s�v�s�p�h�e�r�e�,�,�T�h�i�s� �i�s� �t�h�e� �b�o�o�t� �e�n�t�r�y� �f�o�r� �m�s�v�s�p�h�e�r�e�
2

@ -3,8 +3,6 @@
%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.06-27.el9_0.12
%global bootcsvaa64 %{expand:%{SOURCE10}} %global bootcsvaa64 %{expand:%{SOURCE10}}
%global bootcsvx64 %{expand:%{SOURCE12}} %global bootcsvx64 %{expand:%{SOURCE12}}
#%%global bootcsvarm %%{expand:%%{SOURCE13}} #%%global bootcsvarm %%{expand:%%{SOURCE13}}
@ -21,8 +19,8 @@
%global mmefix64 %{expand:%{SOURCE42}} %global mmefix64 %{expand:%{SOURCE42}}
#%%global mmefiarm %%{expand:%%{SOURCE43} #%%global mmefiarm %%{expand:%%{SOURCE43}
%global shimveraa64 15.8-2.el9 %global shimveraa64 15.8-2.el9.inferit
%global shimverx64 15.8-2.el9 %global shimverx64 15.8-1.el9.inferit
#%%global shimverarm 15-1.el8 #%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@ -57,7 +55,6 @@ 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} \
@ -172,10 +169,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*}} \
%%verify(not mtime) %{efi_esp_dir}/*%{-a*}*.efi \ %{efi_esp_dir}/*%{-a*}*.efi \
%%verify(not mtime) %{efi_esp_dir}/BOOT%{-A*}.CSV \ %{efi_esp_dir}/BOOT%{-A*}.CSV \
%%verify(not mtime) %{efi_esp_boot}/*%{-a*}.efi \ %{efi_esp_boot}/*%{-a*}.efi \
%%verify(not mtime) %{efi_esp_boot}/*%{-A*}.EFI \ %{efi_esp_boot}/*%{-A*}.EFI \
%{nil} %{nil}
%ifarch x86_64 %ifarch x86_64

Binary file not shown.

Binary file not shown.

@ -1,6 +1,6 @@
Name: shim Name: shim
Version: 15.8 Version: 15.8
Release: 4%{?dist} Release: 4.el9_4.inferit.1
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/
@ -12,8 +12,8 @@ ExclusiveArch: %{efi}
ExcludeArch: %{arm} %{ix86} ExcludeArch: %{arm} %{ix86}
Source0: shim.rpmmacros Source0: shim.rpmmacros
Source1: redhatsecureboot501.cer Source1: spheresecureboot001.cer
Source2: redhatsecurebootca5.cer Source2: spheresecurebootca.cer
# keep these two lists of sources synched up arch-wise. That is 0 and 10 # keep these two lists of sources synched up arch-wise. That is 0 and 10
# match, 1 and 11 match, ... # match, 1 and 11 match, ...
@ -33,17 +33,18 @@ Source42: fbx64.efi
%include %{SOURCE0} %include %{SOURCE0}
BuildRequires: pesign >= 0.112-20.fc27 BuildRequires: pesign >= 0.112-20.fc27
# Right now we're just including all of the parts from them as sources here # We need this because %%{efi} won't expand before choosing where to make
# to make the build+errata process less maddening. We do this because # the src.rpm in koji, and we could be on a non-efi architecture, in which
# %%{efi} won't expand before choosing where to make the src.rpm in koji, # case we won't have a valid expansion here... To be solved in the future
# and we could be on a non-efi architecture, in which case we won't have a # (shim 16+) by making the unsigned packages all provide "shim-unsigned", so
# valid expansion here... # we can just BuildRequires that.
#%% ifarch x86_64 %ifarch x86_64
#BuildRequires: %% {unsignedx64} = %% {shimverx64} ## BuildRequires: %% {unsignedx64} = %% {shimverx64}
#%% endif BuildRequires: shim-unsigned-x64 = 15.8-1.el9.inferit
#%% ifarch aarch64 %endif
#BuildRequires: %% {unsignedaa64} = %% {shimveraa64} %ifarch aarch64
#%% endif BuildRequires: shim-unsigned-aarch64 = 15.8-2.el9.inferit
%endif
#%%ifarch arm #%%ifarch arm
#BuildRequires: %%{unsignedarm} = %%{shimverarm} #BuildRequires: %%{unsignedarm} = %%{shimverarm}
#%%endif #%%endif
@ -70,8 +71,7 @@ cd shim-%{version}
%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 %{shimdiralt}
%endif %endif
# Temporarily using _sourcedir to avoid build dep annoyances. %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
@ -100,25 +100,27 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif %endif
%if %{provide_legacy_shim} %if %{provide_legacy_shim}
%verify(not mtime) %{efi_esp_dir}/shim.efi %{efi_esp_dir}/shim.efi
%endif %endif
%changelog %changelog
* Tue Apr 16 2024 Peter Jones <pjones@redhat.com> - 15.8-4 * Wed Oct 30 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-4.el9_4.inferit.1
- Rebuild to work around build system quirks. - Added aarch64 support
Related: RHEL-11262
* Wed May 1 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-1.el9_4.inferit
- Rebuilt for MSVSphere 9.4
* Wed Apr 03 2024 Peter Jones <pjones@redhat.com> - 15.8-3.el9 * Mon Apr 22 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-1.el9.inferit
- Fix rpm verification due to mtime granularity on FAT. - 15.8-1 Release
Related: RHEL-11262
* Thu Mar 21 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el9 * Fri Mar 24 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 15.6-1.inferit
- Add the grub2-efi-ARCH conflict for SBAT. - Modified to use MSVSphere Secure Boot certificates
Resolves: RHEL-11262 - Disabled aarch64 architecture until we support it
- Rebuilt for MSVSphere 9.1
* Thu Mar 21 2024 Peter Jones <pjones@redhat.com> - 15.8-1.el9 * Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el9
- Update to shim-15.8 for CVE-2023-40547 - Update to shim-15.6
Resolves: RHEL-11262 Resolves: CVE-2022-28737
* Thu Apr 14 2022 Peter Jones <pjones@redhat.com> - 15.5-2.el9 * Thu Apr 14 2022 Peter Jones <pjones@redhat.com> - 15.5-2.el9
- Attempt to make aarch64 build. - Attempt to make aarch64 build.

Loading…
Cancel
Save