!20 update version to 15.4

Merge pull request !20 from panxh_purple/master

0001-fix-unaligned-point-value-with-GCC9.patch

@@ -1,76 +0,0 @@
-From 943b332a3848511e1f31d3e48d3108f410854f20 Mon Sep 17 00:00:00 2001
-From: lei_ju <lj3074194431@163.com>
-Date: Mon, 22 Jun 2020 17:49:19 +0800
-Subject: [PATCH] fix unaligned point value with GCC9
-
-Follow those steps:
-  osc build
-
-and occurs error:taking address of packed member of 'struct <anonymous>' may result in an unaligned point value [-Werror=address-of-packed-member]
-
-This is because warning [-Werror=address-of-packed-member] is dealing with error in gcc9
-
-Fix MokManager.c code to deal with this issue
-
-Signed-off-by: lei_ju <lj3074194431@163.com>
----
- MokManager.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/MokManager.c b/MokManager.c
-index 7e40a38..16efabd 100644
---- a/MokManager.c
-+++ b/MokManager.c
-@@ -1078,7 +1078,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
- 			continue;
- 
- 		DataSize += sizeof(EFI_SIGNATURE_LIST);
--		if (CompareGuid(&(list[i].Type), &X509_GUID) == 0)
-+		if (CompareMem(&(list[i].Type), &X509_GUID,
-+                    sizeof(EFI_GUID)) == 0)
- 			DataSize += sizeof(EFI_GUID);
- 		DataSize += list[i].MokSize;
- 	}
-@@ -1100,7 +1101,8 @@ static EFI_STATUS write_back_mok_list(MokListNode * list, INTN key_num,
- 		CertList->SignatureType = list[i].Type;
- 		CertList->SignatureHeaderSize = 0;
- 
--		if (CompareGuid(&(list[i].Type), &X509_GUID) == 0) {
-+		if (CompareMem(&(list[i].Type), &X509_GUID,
-+                    sizeof(EFI_GUID)) == 0) {
- 			CertList->SignatureListSize = list[i].MokSize +
- 			    sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_GUID);
- 			CertList->SignatureSize =
-@@ -1141,7 +1143,8 @@ static void delete_cert(void *key, UINT32 key_size,
- 	int i;
- 
- 	for (i = 0; i < mok_num; i++) {
--		if (CompareGuid(&(mok[i].Type), &X509_GUID) != 0)
-+		if (CompareMem(&(mok[i].Type), &X509_GUID,
-+                    sizeof(EFI_GUID)) != 0)
- 			continue;
- 
- 		if (mok[i].MokSize == key_size &&
-@@ -1192,7 +1195,8 @@ static void delete_hash_in_list(EFI_GUID Type, UINT8 * hash, UINT32 hash_size,
- 	sig_size = hash_size + sizeof(EFI_GUID);
- 
- 	for (i = 0; i < mok_num; i++) {
--		if ((CompareGuid(&(mok[i].Type), &Type) != 0) ||
-+		if ((CompareMem(&(mok[i].Type), &Type,
-+                        sizeof(EFI_GUID)) != 0) ||
- 		    (mok[i].MokSize < sig_size))
- 			continue;
- 
-@@ -1356,7 +1360,8 @@ static EFI_STATUS delete_keys(void *MokDel, UINTN MokDelSize, BOOLEAN MokX)
- 
- 	/* Search and destroy */
- 	for (i = 0; i < del_num; i++) {
--		if (CompareGuid(&(del_key[i].Type), &X509_GUID) == 0) {
-+		if (CompareMem(&(del_key[i].Type), &X509_GUID,
-+                    sizeof(EFI_GUID)) == 0) {
- 			delete_cert(del_key[i].Mok, del_key[i].MokSize,
- 				    mok, mok_num);
- 		} else if (is_sha2_hash(del_key[i].Type)) {
--- 
-2.23.0
-

shim.spec

@@ -21,17 +21,15 @@
 %global shimBOOT  /boot/efi/EFI/BOOT/
 
 Name:	   	   shim
-Version:	   15
-Release:       20
+Version:	   15.4
+Release:	   1
 Summary:	   First-stage UEFI bootloader
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch:     x86_64 aarch64
 License:	   BSD
 URL:	 	   https://github.com/rhboot/shim
 Source0:	   https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
-Source1:       BOOTAA64.CSV
-Source2:       BOOTX64.CSV
-
-Patch0000:     0001-fix-unaligned-point-value-with-GCC9.patch
+Source1:	   BOOTAA64.CSV
+Source2:	   BOOTX64.CSV
 
 BuildRequires: elfutils-libelf-devel openssl-devel openssl git pesign gnu-efi gnu-efi-devel gcc
 Requires:      dbxtool efi-filesystem mokutil
@@ -122,7 +120,9 @@ cd ..
 %files debuginfo
 %defattr(-,root,root,-)
 /usr/lib/debug/*
-/usr/lib/debug/.build-id/*
+%ifarch x86_64
+%exclude /usr/lib/debug/.build-id
+%endif
 
 %files debugsource
 %defattr(-,root,root,-)
@@ -130,6 +130,9 @@ cd ..
 /usr/src/debug/%{name}-%{version}-%{release}/*
 
 %changelog
+* Tue Dec 21 2021 panxiaohe <panxiaohe@huawei.com> - 15.4-1
+- update version to 15.4
+
 * Tue Mar 9 2021 panxiaohe <panxiaohe@huawei.com> - 15-20
 - modify efidir to _vendor
 
@@ -148,7 +151,7 @@ cd ..
 * Sun Jan 12 2020 openEuler Buildteam <buildteam@openeuler.org> - 15-15
 - List debug files
 
-* Tue Nov 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 15-14
+* Wed Nov 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 15-14
 - Remove excess install
 
 * Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 15-13