1
0
forked from rpms/shim

Merge branch 'c8' into a8

This commit is contained in:
Andrew Lukoshko 2022-08-23 09:43:06 +00:00
commit 8f1ca68d50
3 changed files with 13 additions and 14 deletions

View File

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

View File

@ -13,9 +13,9 @@
%global shimefix64 %{expand:%{SOURCE22}}
#%%global shimefiarm %%{expand:%%{SOURCE23}
%global shimveraa64 15-6.el8
%global shimveria32 15.4-4.el8.alma
%global shimverx64 15.4-4.el8.alma
%global shimveraa64 15-7.el8_1.alma
%global shimveria32 15.6-1.el8.alma
%global shimverx64 15.6-1.el8.alma
#%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64

View File

@ -4,8 +4,8 @@
%global efi_esp_dir /boot/efi/EFI/%{efidir}
Name: shim
Version: 15.4
Release: 2%{?dist}
Version: 15.6
Release: 1%{?dist}
Summary: First-stage UEFI bootloader
License: BSD
URL: https://github.com/rhboot/shim/
@ -20,7 +20,6 @@ ExcludeArch: %{arm}
Source0: shim.rpmmacros
Source1: clsecureboot001.cer
# Source2: alnsecurebootca.cer
# keep these two lists of sources synched up arch-wise. That is 0 and 10
# match, 1 and 11 match, ...
@ -106,13 +105,13 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif
%changelog
* Wed Apr 21 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 15.4-2.alma
- Update to upstream 15.4 version
- Add support for Secure Boot
* Mon Mar 15 2021 Andrei Lukoshko <alukoshko@almalinux.org> - 15-16.alma.1
* 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
- Update to shim-15.6
Resolves: CVE-2022-28737
* Mon Sep 21 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-16
- Fix an incorrect allocation size
Resolves: rhbz#1877253