From c63feac13a222b7e97cdd2962d7ac8b02c599ee0 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 10 May 2024 10:49:39 +0000 Subject: [PATCH] import EuroLinux shim-15.8-4.el8_9 --- .gitignore | 11 +++++ .shim.metadata | 17 +++++-- SOURCES/BOOTAA64.CSV | Bin 184 -> 0 bytes SOURCES/BOOTIA32.CSV | Bin 184 -> 0 bytes SOURCES/BOOTX64.CSV | Bin 182 -> 0 bytes SOURCES/redhatsecureboot501.cer | Bin 964 -> 0 bytes SOURCES/redhatsecurebootca5.cer | Bin 920 -> 0 bytes SOURCES/shim.rpmmacros | 77 +++++++++++++++++++++++--------- SPECS/shim.spec | 76 ++++++++++++++++++++++--------- 9 files changed, 138 insertions(+), 43 deletions(-) delete mode 100644 SOURCES/BOOTAA64.CSV delete mode 100644 SOURCES/BOOTIA32.CSV delete mode 100644 SOURCES/BOOTX64.CSV delete mode 100644 SOURCES/redhatsecureboot501.cer delete mode 100644 SOURCES/redhatsecurebootca5.cer diff --git a/.gitignore b/.gitignore index 1d48086..9d75cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,14 @@ +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 diff --git a/.shim.metadata b/.shim.metadata index 0cbbf98..46db528 100644 --- a/.shim.metadata +++ b/.shim.metadata @@ -1,3 +1,14 @@ -8ab193ad7addd71e4a820081f36d47e5ef727d28 SOURCES/shimaa64.efi -c04dd5db5d91e8d1f597f2bfd878f55eba05a125 SOURCES/shimia32.efi -9a08a40a69ba8ad6292a19aca367d819e875d789 SOURCES/shimx64.efi +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/BOOTAA64.CSV b/SOURCES/BOOTAA64.CSV deleted file mode 100644 index 2dad06e30e5c8f08d7ba2dd1a6bdfe2a05065d4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmb7-%L#x$5JTVDDz*UeBz7Qp@FX^%xQibAu&bcWt8qJ!FeD^1ndc6SOw4pbK~9Fn z$w_IX1`L&wU0kw=EuKv?5u^>Z)WX53ill-Y;5sd(oUWi|NWHk E0^c+t{{R30 diff --git a/SOURCES/BOOTIA32.CSV b/SOURCES/BOOTIA32.CSV deleted file mode 100644 index 4e658b2f4fc811efe3f482f81efef435dab58626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmb7-OAbIl5JcbFDdqrT!5JhLR^kH0Oj!72hJ?$b%nhW|sp_ik>gNuOOw8(zf}9MC z)0EPP4HzmpyRc*tT0EP2B8VGmv4w+E7b$H_3(`N|Xn%}bJ*(JmSc{R=rq?Dv-nm%`6WMbx|ASc7( zG^aFT1BQx@U0AXREuKw15yTC(*utUfRMp0;ApP4L`N!z$Syf+(jVYc>+)4Aozn>Cb DrCcGk diff --git a/SOURCES/redhatsecureboot501.cer b/SOURCES/redhatsecureboot501.cer deleted file mode 100644 index dfa7afb4699f9da2610ccf889eac6269b4e368ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmXqLVm@Hd#I#}oGZP~d6DPygP|MB7r^(JW;AP{~YV&CO&dbQi&B|a9ZzyIU!p0oR z!o|ZIl$xU8kyxUm;F*`KXQ*f(4-#kQk${RT1g9pK7NsgU<>!|uI6Eqs8Y&qmz)j<1 z6ca8^O-{^7Eh=#+N=?Z~EYVBO&oz(}=QT1gFf*_;ur#$aF^m%DHMTG?G_-(n4bpHr zK*K-{;sAMU4hYUn&&$k9S1<({MvOa}7?qIy&dAEZ+{DPwV9>?_b=fyaz_nMgbCq_4}%h&s@!! ze1+-H$r$aU3#Wbib#?#k&uh{GYUM6Zj@vtn;gxywxjzdyRhQhFw_E3gr&3h2=~R{1 zj&**wnV1`gIDK=C)Q=HpH6<5w#musUBRX5*FRT%+S?q^ zlC!X|$Tr`#TvsL{aXYvlkoIbiCkx z5_D~Q*@8!%rFvVIJk+SN&YvaV#ohSi!kzD4u!L^;lrQW*W7-1#!tQ%Ev()B&_RmzfDxh^SOyp9_ zQ{CMgMRQYpd7N(ray<%vF*_r`|Ig1qJ?keW%w>8X>p8K%ckRW_k5{=r91h)XDEdQO n!11X)D#7e#1b6^&%9(kLq!95kT^4s1XNrhI5oMnC{@8JKfgr5*-^pNP{}|6ZW6NxP$#b?ru1p1aqn$3D)YB{Qqo zjCvjz?|=HkE#3AN-xTZpws*U~)f@DZ{t~uwMZy8<;F%jD%$u6!n#qYzp^Sryh{C;x9qf@!N=T4ui@b#({ zSD&^p3kNZ=9lAQ9%xdfP9doNToV+k2^LHOFD{5oE&78StJa^8n7$i2k94PWc<&xr*# z`sciS&XK#@>h!OC8{=mczNLHbADCJ+pE=-CsaDOF#s}?5Q)1qq&%R~#cz>QmiAiVx zk5XXYstAL9d+iK-w@u$FESybMIPOFY~9lmn~9nUf%vMc88@((p0B(#qL+!COmt7`j5IhPVzo{cRPw} Pd!}BnFF!b8N6JS4>O*3Z diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros index fa7a833..d606297 100644 --- a/SOURCES/shim.rpmmacros +++ b/SOURCES/shim.rpmmacros @@ -3,6 +3,8 @@ %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 bootcsvaa64 %{expand:%{SOURCE10}} %global bootcsvia32 %{expand:%{SOURCE11}} %global bootcsvx64 %{expand:%{SOURCE12}} @@ -13,9 +15,19 @@ %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.6-1.el8 -%global shimverx64 15.6-1.el8 +%global shimveria32 15.8-2.el8 +%global shimverx64 15.8-2.el8 #%%global shimverarm 15-1.el8 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 @@ -36,6 +48,10 @@ %global shimveralt %{expand:%{shimver%{?efi_alt_arch}}} %global shimdir %{expand:%{shimdir%{efi_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 unsigned %{expand:%%{unsigned%{efi_arch}}} @@ -48,6 +64,7 @@ Requires: mokutil >= 1:0.3.0-1 \ Requires: efi-filesystem \ Provides: shim-signed-%{-a*} = %{version}-%{release} \ Requires: dbxtool >= 0.6-3 \ +Conflicts: grub2-efi-%{-a*} < %{grub_version} \ %{expand:%%if 0%%{-p*} \ Provides: shim = %{version}-%{release} \ Provides: shim-signed = %{version}-%{release} \ @@ -68,15 +85,17 @@ version signed by the UEFI signing service. \ # -a # -i -%define hash(a:i:d:) \ - pesign -i %{-i*} -h -P > shim.hash \ - read file0 hash0 < shim.hash \ - read file1 hash1 < %{-d*}/shim%{-a*}.hash \ - if ! [ "$hash0" = "$hash1" ]; then \ - echo Invalid signature\! > /dev/stderr \ - echo $hash0 vs $hash1 \ - exit 1 \ - fi \ +%define hash(a:i:d:) \ + if [ 0%{?_unsigned_test_build:%{_unsigned_test_build}} -ne 0 ] ; then \ + pesign -i %{-i*} -h -P > shim.hash \ + read file0 hash0 < shim.hash \ + read file1 hash1 < %{-d*}/shim%{-a*}.hash \ + if ! [ "$hash0" = "$hash1" ] ; then \ + echo Invalid signature\! > /dev/stderr \ + echo $hash0 vs $hash1 \ + exit 1 \ + fi \ + fi \ %{nil} # -i @@ -88,9 +107,25 @@ version signed by the UEFI signing service. \ # -b # -a # -i -%define distrosign(b:a:d:) \ - cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ - %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi -n redhatsecureboot501 -a %{SOURCE2} -c %{SOURCE1} }\ +%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 \ + fi \ + %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi -n redhatsecureboot501 -a %{SOURCE2} -c %{SOURCE1} } \ %{nil} # -a @@ -98,16 +133,18 @@ version signed by the UEFI signing service. \ # -b <1|0> # signed by this builder? # -c <1|0> # signed by UEFI CA? # -i +# -d /usr/share dir for this build (full path) %define define_build(a:A:b:c:i:d:) \ if [ "%{-c*}" = "yes-temporarily-disabled-20180723" ]; then \ %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \ fi \ cp %{-i*} shim%{-a*}.efi \ -if [ "%{-b*}" = "yes" ]; then \ +if [ "%{-b*}" = "yes" ] ; then \ %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \ 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 \ fi \ %{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ @@ -142,10 +179,10 @@ install -m 0700 fb%{-a*}.efi \\\ # -A %define define_files(a:A:) \ %{expand:%%files -n shim-%{-a*}} \ -%{efi_esp_dir}/*%{-a*}*.efi \ -%{efi_esp_dir}/BOOT%{-A*}.CSV \ -%{efi_esp_boot}/*%{-a*}.efi \ -%{efi_esp_boot}/*%{-A*}.EFI \ +%%verify(not mtime) %{efi_esp_dir}/*%{-a*}*.efi \ +%%verify(not mtime) %{efi_esp_dir}/BOOT%{-A*}.CSV \ +%%verify(not mtime) %{efi_esp_boot}/*%{-a*}.efi \ +%%verify(not mtime) %{efi_esp_boot}/*%{-A*}.EFI \ %{nil} %ifarch x86_64 diff --git a/SPECS/shim.spec b/SPECS/shim.spec index 4b1439f..674269a 100644 --- a/SPECS/shim.spec +++ b/SPECS/shim.spec @@ -1,6 +1,6 @@ Name: shim -Version: 15.6 -Release: 1%{?dist} +Version: 15.8 +Release: 4%{?dist} Summary: First-stage UEFI bootloader License: BSD URL: https://github.com/rhboot/shim/ @@ -21,28 +21,36 @@ Source2: redhatsecurebootca5.cer # match, 1 and 11 match, ... 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 +Source42: fbx64.efi #Source13: BOOTARM.CSV #Source23: shimarm.efi +#Source33: mmarm.efi +#Source43: fbarm.efi %include %{SOURCE0} BuildRequires: pesign >= 0.112-20.fc27 -# We need this because %%{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... To be solved in the future -# (shim 16+) by making the unsigned packages all provide "shim-unsigned", so -# we can just BuildRequires that. -%ifarch x86_64 -BuildRequires: %{unsignedx64} = %{shimverx64} -BuildRequires: %{unsignedia32} = %{shimveria32} -%endif -%ifarch aarch64 -BuildRequires: %{unsignedaa64} = %{shimveraa64} -%endif +# Right now we're just including all of the parts from them as sources here +# to make the build+errata process less maddening. We do this because +# %%{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 arm #BuildRequires: %%{unsignedarm} = %%{shimverarm} #%%endif @@ -63,12 +71,14 @@ rm -rf shim-%{version} mkdir shim-%{version} %build +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 %{shimdiralt} +%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{_sourcedir} %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 rm -rf $RPM_BUILD_ROOT @@ -97,13 +107,39 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %endif %if %{provide_legacy_shim} -%{efi_esp_dir}/shim.efi +%verify(not mtime) %{efi_esp_dir}/shim.efi %endif %changelog -* Mon Jun 06 2022 Peter Jones - 15.6-1 -- Update to shim-15.6 - Resolves: CVE-2022-28737 +* Tue Apr 16 2024 Peter Jones - 15.8-4 +- Bump the release to *-4* to work around a build system issue. + Related: RHEL-11259 + +* Wed Apr 10 2024 Peter Jones - 15.8-3 +- Bump the release to -3 to work around a build system issue. + Related: RHEL-11259 + +* 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-1.el8 +- Update to shim-15.8 for CVE-2023-40547 + Resolves: RHEL-11259 + +* 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 + +* 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 * Mon Sep 21 2020 Javier Martinez Canillas - 15-16 - Fix an incorrect allocation size