CentOS 8: Upgrade shim-unsigned to version 15

(1)Release Version Upgrade
(2)Matching code changes with el7 to el8

For CentOS 7, shim srpm for shim-unsigned
for CentOS 8, shim-unsigned srpm for shim-unsigned.

Story: 2006729
Task: 38736

Change-Id: If5255a3397c0fafb7a9a0dd779afaf6d8a340f35
Signed-off-by: Long Li <lilong-neu@neusoft.com>

security/shim-unsigned/centos/build_srpm.data

@@ -1,2 +1,2 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=1
 COPY_LIST="$PKG_BASE/files/tis-shim.crt"

security/shim-unsigned/centos/meta_patches/0001-Ti-version-string.patch

@@ -4,24 +4,22 @@ Date: Mon, 15 Jan 2018 13:09:41 -0500
 Subject: [PATCH 1/2] Ti version string
 
 ---
- SPECS/shim.spec | 2 +-
+ SPECS/shim-unsigned-x64.spec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100755 => 100644 SPECS/shim.spec
 
-diff --git a/SPECS/shim.spec b/SPECS/shim.spec
-old mode 100755
-new mode 100644
-index afd533b..de216b6
---- a/SPECS/shim.spec
-+++ b/SPECS/shim.spec
-@@ -1,6 +1,6 @@
- Name:           shim
- Version:        15
--Release:        1%{?dist}
-+Release:        1.el7%{?_tis_dist}.%{tis_patch_ver}
- Summary:        First-stage UEFI bootloader
+diff --git a/SPECS/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64.spec
+index 0261a47..aa45c33 100755
+--- a/SPECS/shim-unsigned-x64.spec
++++ b/SPECS/shim-unsigned-x64.spec
+@@ -18,7 +18,7 @@
  
- License:        BSD
+ Name:		shim-unsigned-%{efiarch}
+ Version:	15
+-Release:	2%{?dist}
++Release:	2.el8%{?_tis_dist}.%{tis_patch_ver}
+ Summary:	First-stage UEFI bootloader
+ ExclusiveArch:	x86_64
+ License:	BSD
 -- 
-1.8.3.1
+2.7.4
 

security/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch

@@ -4,43 +4,37 @@ Date: Mon, 15 Jan 2018 13:22:09 -0500
 Subject: [PATCH 2/2] Add Ti certificate
 
 ---
- SPECS/shim.spec | 4 ++++
+ SPECS/shim-unsigned-x64.spec | 4 ++++
  1 file changed, 4 insertions(+)
- mode change 100644 => 100755 SPECS/shim.spec
 
-diff --git a/SPECS/shim.spec b/SPECS/shim.spec
-old mode 100644
-new mode 100755
-index de216b6..83da6cd
---- a/SPECS/shim.spec
-+++ b/SPECS/shim.spec
-@@ -12,8 +12,10 @@ Source0:        https://github.com/mjg59/shim/releases/download/%{version}/shim-
- #Source3:       dbx-aa64.esl
- Source4:        shim-find-debuginfo.sh
- Source5:	centos.esl
+diff --git a/SPECS/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64.spec
+index aa45c33..384d339 100755
+--- a/SPECS/shim-unsigned-x64.spec
++++ b/SPECS/shim-unsigned-x64.spec
+@@ -30,12 +30,14 @@ Source1:	centossecureboot001.der
+ Source2:	dbx.esl
+ 
+ Source100:	shim-find-debuginfo.sh
 +Source1000:     tis-shim.crt
  
- Patch0:		0001-Add-vendor-esl.patch
+ Patch0001:	0001-Make-sure-that-MOK-variables-always-get-mirrored.patch
+ Patch0002:	0002-mok-fix-the-mirroring-of-RT-variables.patch
+ Patch0003:	0003-mok-consolidate-mirroring-code-in-a-helper-instead-o.patch
+ Patch0004:	0004-Make-VLogError-behave-as-expected.patch
+ Patch0005:	0005-MokListRT-Fatal.patch
 +Patch1000:	0001-Use-Titanium-certificate.patch
  
- BuildRequires: git openssl-devel openssl
- BuildRequires: pesign >= 0.106-1
-@@ -104,6 +106,7 @@ git commit -a -q -m "%{version} baseline."
- git am --ignore-whitespace %{patches} </dev/null
+ BuildRequires:	elfutils-libelf-devel
+ BuildRequires:	git openssl-devel openssl
+@@ -100,6 +102,8 @@ BuildArch:	noarch
+ %autosetup -S git -n shim-%{version}
  git config --unset user.email
  git config --unset user.name
 +cp %{SOURCE1000} .
++
+ mkdir build-%{efiarch}
+ mkdir build-%{efialtarch}
  
- %ifarch x86_64
- cd ..
-@@ -118,6 +121,7 @@ git commit -a -q -m "%{version} baseline."
- git am --ignore-whitespace %{patches} </dev/null
- git config --unset user.email
- git config --unset user.name
-+cp %{SOURCE1000} .
- %endif
- 
- %build
 -- 
-1.8.3.1
+2.7.4
 

security/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] Use Titanium certificate
  2 files changed, 18 insertions(+), 8 deletions(-)
 
 diff --git a/Make.defaults b/Make.defaults
-index 3cec82d..d7606db 100644
+index e11ab5a..d16510c 100644
 --- a/Make.defaults
 +++ b/Make.defaults
 @@ -51,6 +51,12 @@ CLANG_BUGS	= $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
@@ -26,7 +26,7 @@ index 3cec82d..d7606db 100644
  	CFLAGS	+= -DOVERRIDE_SECURITY_POLICY
  endif
 diff --git a/Makefile b/Makefile
-index 115e7f0..8964a97 100644
+index 115e7f0..933c859 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -34,7 +34,7 @@ else
@@ -76,5 +76,5 @@ index 115e7f0..8964a97 100644
  shim.o: $(SOURCES)
  ifneq ($(origin ENABLE_SHIM_CERT),undefined)
 -- 
-1.8.3.1
+2.7.4
 

security/shim-unsigned/centos/srpm_path

@@ -1 +1 @@
-mirror:Source/shim-15-1.el7.centos.src.rpm
+mirror:Source/shim-unsigned-x64-15-2.el8.src.rpm