diff --git a/shim-signed.spec b/shim-signed.spec index 356c4d840dc35c6b21b8a17b04ec6b01b45cdb74..329e3cf2844a85a682e4b0e1f433d63a6d3f4403 100644 --- a/shim-signed.spec +++ b/shim-signed.spec @@ -1,12 +1,12 @@ # Note: aarch64 is actually still at shim-15-9.el7, as 15.6 does not build # with the RHEL 7 toolchain. The only reason we updated to 15.6 was for SBAT # revocation, and aarch64 isn't signed into the UEFI chain anyhow. - +%define anolis_release .0.1 Name: shim-signed Version: 15.6 -Release: 3%{?dist}%{?buildid} +Release: 3%{anolis_release}%{?dist}%{?buildid} Summary: First-stage UEFI bootloader -%define unsigned_release 3.el7 +%define unsigned_release 3.0.1.el7 License: BSD URL: https://github.com/rhboot/shim/ @@ -156,6 +156,7 @@ cd .. %ifarch x86_64 pesign -i %{shimsrc} -h -P > shim%{efiarchlc}.hash +cat /usr/share/shim/x64-%{version}-%{unsigned_release}/shimx64.hash > shimx64.hash if ! cmp shim%{efiarchlc}.hash %{unsigned_dir}shim%{efiarchlc}.hash ; then echo Invalid signature\! > /dev/stderr echo saved hash is $(cat %{unsigned_dir}shim%{efiarchlc}.hash) > /dev/stderr @@ -267,6 +268,10 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install %{_datadir}/bash-completion/completions/mokutil %changelog +* Fri May 12 2023 yangxianzhao 15.6-3.0.1 +- Fix hash compare error +- Modify unsigned_release + * Mon Apr 17 2023 Robbie Harwood - 15.6-3 - Restore old ia32 for compatibility - Resolves: #2007084