diff --git a/.gitignore b/.gitignore index 9d75cdb..b40443b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,10 @@ -SOURCES/BOOTAA64.CSV -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/shimia32.efi -SOURCES/shimx64.efi +BOOTAA64.CSV +BOOTX64.CSV +fbaa64.efi +fbx64.efi +mmaa64.efi +mmx64.efi +redhatsecureboot501.cer +redhatsecurebootca5.cer +shimaa64.efi +shimx64.efi diff --git a/.shim.metadata b/.shim.metadata deleted file mode 100644 index 46db528..0000000 --- a/.shim.metadata +++ /dev/null @@ -1,14 +0,0 @@ -fe978419c312c0c415d52befb4f6561e2d9556a7 SOURCES/BOOTAA64.CSV -9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV -6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV -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 diff --git a/SOURCES/shim.rpmmacros b/shim.rpmmacros similarity index 94% rename from SOURCES/shim.rpmmacros rename to shim.rpmmacros index d606297..ccd0a92 100644 --- a/SOURCES/shim.rpmmacros +++ b/shim.rpmmacros @@ -3,40 +3,33 @@ %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 grub_version 2.02-87.el8_1.11 +%global grub_version 2.06-27.el9_0.12 %global bootcsvaa64 %{expand:%{SOURCE10}} -%global bootcsvia32 %{expand:%{SOURCE11}} %global bootcsvx64 %{expand:%{SOURCE12}} #%%global bootcsvarm %%{expand:%%{SOURCE13}} %global shimefiaa64 %{expand:%{SOURCE20}} -%global shimefiia32 %{expand:%{SOURCE21}} %global shimefix64 %{expand:%{SOURCE22}} #%%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 shimveria32 15.8-2.el8 -%global shimverx64 15.8-2.el8 +%global shimveraa64 15.8-2.el9 +%global shimverx64 15.8-2.el9 #%%global shimverarm 15-1.el8 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 -%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm %global unsignedaa64 shim-unsigned-aarch64 -%global unsignedia32 shim-unsigned-ia32 %global unsignedx64 shim-unsigned-x64 #%%global unsignedarm shim-unsigned-arm @@ -187,7 +180,7 @@ install -m 0700 fb%{-a*}.efi \\\ %ifarch x86_64 %global is_signed yes -%global is_alt_signed yes +%global is_alt_signed no %global provide_legacy_shim 1 %endif %ifarch aarch64 diff --git a/SPECS/shim.spec b/shim.spec similarity index 72% rename from SPECS/shim.spec rename to shim.spec index 674269a..1bd0d23 100644 --- a/SPECS/shim.spec +++ b/shim.spec @@ -5,13 +5,11 @@ Summary: First-stage UEFI bootloader License: BSD URL: https://github.com/rhboot/shim/ BuildRequires: efi-filesystem -BuildRequires: efi-srpm-macros >= 3-2 +BuildRequires: efi-srpm-macros >= 6 ExclusiveArch: %{efi} -# but we don't build a .i686 package, just a shim-ia32.x86_64 package -ExcludeArch: %{ix86} # and we don't have shim-unsigned-arm builds *yet* -ExcludeArch: %{arm} +ExcludeArch: %{arm} %{ix86} Source0: shim.rpmmacros Source1: redhatsecureboot501.cer @@ -23,10 +21,6 @@ Source10: BOOTAA64.CSV Source20: shimaa64.efi Source30: mmaa64.efi Source40: fbaa64.efi -Source11: BOOTIA32.CSV -Source21: shimia32.efi -Source31: mmia32.efi -Source41: fbia32.efi Source12: BOOTX64.CSV Source22: shimx64.efi Source32: mmx64.efi @@ -44,13 +38,12 @@ BuildRequires: pesign >= 0.112-20.fc27 # %%{efi} won't expand before choosing where to make the src.rpm in koji, # and we could be on a non-efi architecture, in which case we won't have a # valid expansion here... -# %% ifarch x86_64 -# BuildRequires: %% {unsignedx64} = %% {shimverx64} -# BuildRequires: %% {unsignedia32} = %% {shimveria32} -# %% endif -# %% ifarch aarch64 -# BuildRequires: %% {unsignedaa64} = %% {shimveraa64} -# %% endif +#%% ifarch x86_64 +#BuildRequires: %% {unsignedx64} = %% {shimverx64} +#%% endif +#%% ifarch aarch64 +#BuildRequires: %% {unsignedaa64} = %% {shimveraa64} +#%% endif #%%ifarch arm #BuildRequires: %%{unsignedarm} = %%{shimverarm} #%%endif @@ -74,10 +67,10 @@ mkdir shim-%{version} export PS4='${LINENO}: ' cd shim-%{version} -# Temporarily using _sourcedir to avoid build dep annoyances. %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 %{_sourcedir} +%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{shimdiralt} %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 %{_sourcedir} %install @@ -112,89 +105,66 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %changelog * Tue Apr 16 2024 Peter Jones - 15.8-4 -- Bump the release to *-4* to work around a build system issue. - Related: RHEL-11259 +- Rebuild to work around build system quirks. + Related: RHEL-11262 -* Wed Apr 10 2024 Peter Jones - 15.8-3 -- Bump the release to -3 to work around a build system issue. - Related: RHEL-11259 +* Wed Apr 03 2024 Peter Jones - 15.8-3.el9 +- Fix rpm verification due to mtime granularity on FAT. + Related: RHEL-11262 -* Thu Mar 28 2024 Peter Jones - 15.8-2.el8 -- Fix rpm verify issue found in testing. - Related: RHEL-11259 +* Thu Mar 21 2024 Peter Jones - 15.8-2.el9 +- Add the grub2-efi-ARCH conflict for SBAT. + Resolves: RHEL-11262 -* Thu Mar 21 2024 Peter Jones - 15.8-1.el8 +* Thu Mar 21 2024 Peter Jones - 15.8-1.el9 - Update to shim-15.8 for CVE-2023-40547 - Resolves: RHEL-11259 + Resolves: RHEL-11262 -* Wed Apr 20 2022 Peter Jones - 15.5-2.el8 -- Include the actual signed shim binaries. - Resolves: rhbz#1970632 - Resolves: rhbz#1982071 - Resolves: rhbz#2000946 - Resolves: rhbz#2002265 +* Thu Apr 14 2022 Peter Jones - 15.5-2.el9 +- Attempt to make aarch64 build. + Related: rhbz#1932057 -* Tue Apr 19 2022 Peter Jones - 15.5-1 -- Update to shim-15.5 - Resolves: rhbz#1970632 - Resolves: rhbz#1982071 - Resolves: rhbz#2000946 - Resolves: rhbz#2002265 +* Thu Apr 14 2022 Peter Jones - 15.5-1.el9 +- Rebuild for rhel-9.0.0 + Resolves: rhbz#1932057 * Mon Sep 21 2020 Javier Martinez Canillas - 15-16 - Fix an incorrect allocation size - Resolves: rhbz#1877253 * Fri Jul 31 2020 Peter Jones - 15-15 - Update once again for new signed shim builds. - Resolves: rhbz#1861977 * Tue Jul 28 2020 Peter Jones - 15-14 - Get rid of our %%dist hack for now. * Tue Jul 28 2020 Peter Jones - 15-13 - New signing keys - Related: CVE-2020-10713 - Related: CVE-2020-14308 - Related: CVE-2020-14309 - Related: CVE-2020-14310 - Related: CVE-2020-14311 * Thu Jun 11 2020 Javier Martinez Canillas - 15-12 - Fix firmware update bug in aarch64 caused by shim ignoring arguments - Resolves: rhbz#1830871 - Fix a shim crash when attempting to netboot - Resolves: rhbz#1795654 * Fri Jun 07 2019 Javier Martinez Canillas - 15-11 - Update the shim-unsigned-aarch64 version number - Related: rhbz#1715879 * Fri Jun 07 2019 Javier Martinez Canillas - 15-10 - Add a gating.yaml file so the package can be properly gated - Related: rhbz#1681809 * Wed Jun 05 2019 Javier Martinez Canillas - 15-9 - Bump the NVR - Related: rhbz#1715879 * Wed Jun 05 2019 Javier Martinez Canillas - 15-7 - Make EFI variable copying fatal only on secureboot enabled systems - Resolves: rhbz#1715879 - Fix booting shim from an EFI shell using a relative path - Resolves: rhbz#1717061 * Thu Mar 14 2019 Peter Jones - 15-6 - Fix MoK mirroring issue which breaks kdump without intervention - Resolves: rhbz#1668966 * Thu Jan 24 2019 Peter Jones - 15-5 - Rebuild for signing once again. If the signer actually works, then: - Resolves: rhbz#1620941 * Tue Oct 16 2018 Peter Jones - 15-4 - Rebuild for signing - Resolves: rhbz#1620941 * Mon Aug 13 2018 Troy Dawson - Release Bumped for el8 Mass Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..e600756 --- /dev/null +++ b/sources @@ -0,0 +1,10 @@ +SHA512 (BOOTAA64.CSV) = 1c1bac8c2627b704e8b091d2e0c81d55a8bd7420450fe429e20efe8830fa377fdf48c51c2e658e3d0ecee491845bf5cc696ba848669dc26d23687ed5fe5efa76 +SHA512 (BOOTX64.CSV) = 3ed565c94bfc6f94136780ebbfebc0b19cb408b80e459bfece5de2e478d66605c1c7dd9f4186864cedbd420626945ae7b86e938e2d67f0163de596d05d859e0b +SHA512 (fbaa64.efi) = daf5aa484238aa4718ad72dadb9693fa3779ba611b354e078499b80ae50ea278bbbfca6015240549ad2aed77cea188b16f951a952b0ce7bbcbd2f665cf7b71ce +SHA512 (fbx64.efi) = 5da196c917fb8aca45adf054fc11db299bbcc1b95e8574776840aa3977f6a3ce59cc1afc3d2e8b1f1412446a80e76541eb0333747990ca7f2cd526066a69d2d1 +SHA512 (mmaa64.efi) = fd14191f19f3e31b7191d4ee3c52549f9f32012a51e723a6006ff4a59d4da70687337bbb82e852631534ac4e1098f3ef1c493596509aa64c9f6b08b3c1d83ae2 +SHA512 (mmx64.efi) = f63a76e7abd72d90e5a24649960f2918bc1f3a18c40f04e3c2264301ba88738a68e7817b9d2e23f45771ecbda628ed2b281c960a9e2e1852d505b166bda54e3c +SHA512 (redhatsecureboot501.cer) = eb2c2d342680d4c3453d3e4f30abdd1f6b0e98292e1be0410d0163afd01552a863b70ffaabeecd6e3981cd4d167198091a837c7d70f96a3a06de2d28b3355308 +SHA512 (redhatsecurebootca5.cer) = 0285fd7cb1755b399cdd2d848d9eba51b72ef2dd8ea5d40d7061c29685a12e15bf8eb083cb2f8c14eb69d248cb3af2c2332e06f80e19ed4cc029070198c0d522 +SHA512 (shimaa64.efi) = 7eb1d50589134636e1eb28b2282676a37cd1fa1b5334b629e16c7ffd9b2b77c4617a6dfe855161f6578b8d76663b60a00788261974fed76488006d9c965c9a3f +SHA512 (shimx64.efi) = 29079c05ee529d981f5c16d4a68a84bfde40945da3b06b1cb4779a38668f43102138f8e5a9210834d2c426e50736cc3dc81f988334e0f817872b2926b5f1d909