1
0
forked from rpms/shim

Compare commits

...

3 Commits
c8 ... a8

Author SHA1 Message Date
e5c6323b84 Remove definition of dist 2023-02-22 15:08:18 +03:00
8f1ca68d50 Merge branch 'c8' into a8 2022-08-23 09:43:06 +00:00
09b7c524d4 AlmaLinux changes 2021-09-15 12:46:23 +00:00
9 changed files with 16 additions and 9 deletions

View File

@ -1,3 +1,3 @@
8ab193ad7addd71e4a820081f36d47e5ef727d28 SOURCES/shimaa64.efi 8f61bdc72cf582e2fdf094eac3bd911464857d89 SOURCES/shimaa64.efi
c04dd5db5d91e8d1f597f2bfd878f55eba05a125 SOURCES/shimia32.efi cf0dc84373d0036f0420255baaa5a3b4760563ed SOURCES/shimia32.efi
9a08a40a69ba8ad6292a19aca367d819e875d789 SOURCES/shimx64.efi 5957bbccac9f22c1738039679204be0bb57c3812 SOURCES/shimx64.efi

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
SOURCES/clsecureboot001.cer Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -13,9 +13,9 @@
%global shimefix64 %{expand:%{SOURCE22}} %global shimefix64 %{expand:%{SOURCE22}}
#%%global shimefiarm %%{expand:%%{SOURCE23} #%%global shimefiarm %%{expand:%%{SOURCE23}
%global shimveraa64 15-7.el8_1 %global shimveraa64 15-7.el8_1.alma
%global shimveria32 15.6-1.el8 %global shimveria32 15.6-1.el8.alma
%global shimverx64 15.6-1.el8 %global shimverx64 15.6-1.el8.alma
#%%global shimverarm 15-1.el8 #%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@ -48,6 +48,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 \
Requires: %{efi_esp_dir}/grub%{-a*}.efi \
%{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} \

View File

@ -1,6 +1,10 @@
%global efi_vendor almalinux
%global efidir almalinux
%global efi_esp_dir /boot/efi/EFI/%{efidir}
Name: shim Name: shim
Version: 15.6 Version: 15.6
Release: 1%{?dist} Release: 1%{?dist}.alma
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/
@ -14,8 +18,7 @@ ExcludeArch: %{ix86}
ExcludeArch: %{arm} ExcludeArch: %{arm}
Source0: shim.rpmmacros Source0: shim.rpmmacros
Source1: redhatsecureboot501.cer Source1: clsecureboot001.cer
Source2: redhatsecurebootca5.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, ...
@ -101,6 +104,9 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif %endif
%changelog %changelog
* Tue Aug 23 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 15.6-1.alma
- AlmaLinux changes
* Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1 * Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1
- Update to shim-15.6 - Update to shim-15.6
Resolves: CVE-2022-28737 Resolves: CVE-2022-28737