.gitignore

@@ -1,2 +1 @@
 SOURCES/shim-15.8.tar.bz2
-SOURCES/vendordb.esl

.shim-unsigned-x64.metadata

@@ -1,2 +1 @@
-cdec924ca437a4509dcb178396996ddf92c11183 SOURCES/shim-15.8.tar.bz2
-3371b3acf8fa4f3be91e90698d5c9ed66ccc19ab SOURCES/vendordb.esl
+cdec924ca437a4509dcb178396996ddf92c11183  SOURCES/shim-15.8.tar.bz2

SOURCES/sbat.msvsphere.csv

@@ -0,0 +1 @@
+shim.msvsphere,3,MSVSphere,shim,15.8,security@msvsphere.ru

SOURCES/sbat.redhat.csv

@@ -1 +0,0 @@
-shim.redhat,3,Red Hat Inc,shim,15.8,secalert@redhat.com

SOURCES/shim-find-debuginfo.sh

@@ -20,9 +20,9 @@ fi
 findsource()
 {
     (
-        cd "${RPM_BUILD_ROOT}"
-        find usr/src/debug/ -type d | sed -e "s,^,%dir /," | sort -u | tac
-        find usr/src/debug/ -type f | sed -e "s,^,/," | sort -u | tac
+        cd ${RPM_BUILD_ROOT}
+        find usr/src/debug/ -type d | sed "s,^,%dir /,"
+        find usr/src/debug/ -type f | sed "s,^,/,"
     )
 }
 
@@ -32,12 +32,9 @@ finddebug()
     declare -a dirs=()
     declare -a files=()
     declare -a excludes=()
-    declare -a tmp=()
 
-    pushd "${RPM_BUILD_ROOT}" >/dev/null 2>&1
-
-    mapfile -t tmp < <(find usr/lib/debug/ -type f -iname "*.efi.debug")
-    for x in "${tmp[@]}" ; do
+    pushd ${RPM_BUILD_ROOT} >/dev/null 2>&1
+    for x in $(find usr/lib/debug/ -type f -iname *.efi.debug); do
         if ! [ -e "${x}" ]; then
             break
         fi
@@ -60,10 +57,8 @@ finddebug()
             excludes[${#excludes[@]}]=${x%%.debug}
         fi
     done
-    for x in "${files[@]}" ; do
-        declare name
-
-        name=$(dirname "/${x}")
+    for x in ${files[@]} ; do
+        declare name=$(dirname /${x})
         while [ "${name}" != "/" ]; do
             case "${name}" in
             "/usr/lib/debug"|"/usr/lib"|"/usr")
@@ -72,24 +67,24 @@ finddebug()
                 dirs[${#dirs[@]}]=${name}
                 ;;
             esac
-            name=$(dirname "${name}")
+            name=$(dirname ${name})
         done
     done
 
     popd >/dev/null 2>&1
-    for x in "${dirs[@]}" ; do
+    for x in ${dirs[@]} ; do
         echo "%dir ${x}"
     done | sort | uniq
-    for x in "${files[@]}" ; do
+    for x in ${files[@]} ; do
         echo "/${x}"
     done | sort | uniq
-    for x in "${excludes[@]}" ; do
+    for x in ${excludes[@]} ; do
         echo "%exclude /${x}"
     done
 }
 
-findsource > "build-${mainarch}/debugsource.list"
-finddebug "${mainarch}" > "build-${mainarch}/debugfiles.list"
+findsource > build-${mainarch}/debugsource.list
+finddebug ${mainarch} > build-${mainarch}/debugfiles.list
 if [ -v altarch ]; then
-    finddebug "${altarch}" > "build-${altarch}/debugfiles.list"
+    finddebug ${altarch} > build-${altarch}/debugfiles.list
 fi

SPECS/shim-unsigned-x64.spec

@@ -1,7 +1,7 @@
 %global pesign_vre 0.106-1
 %global openssl_vre 1.0.2j
 
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+%global efidir msvsphere
 %global shimrootdir %{_datadir}/shim/
 %global shimversiondir %{shimrootdir}/%{version}-%{release}
 %global efiarch x64
@@ -20,17 +20,17 @@
 
 Name:		shim-unsigned-%{efiarch}
 Version:	15.8
-Release:	2.el9
+Release:	1.el9.inferit
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
 License:	BSD
 URL:		https://github.com/rhboot/shim
 Source0:	https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
-Source1:	vendordb.esl
+Source1:	spheresecurebootca.cer
 %if 0%{?dbxfile}
 Source2:	%{dbxfile}
 %endif
-Source3:	sbat.redhat.csv
+Source3:	sbat.msvsphere.csv
 Source4:	shim.patches
 
 Source100:	shim-find-debuginfo.sh
@@ -103,14 +103,13 @@ mkdir build-%{efialtarch}
 cp %{SOURCE3} data/
 
 %build
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
+COMMITID=$(cat commit)
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 MAKEFLAGS+="%{_smp_mflags}"
 if [ -f "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}"
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
 fi
 %if 0%{?dbxfile}
 if [ -f "%{SOURCE2}" ]; then
@@ -125,17 +124,16 @@ make ${MAKEFLAGS} \
 cd ..
 
 %install
-COMMIT_ID=5914984a1ffeab841f482c791426d7ca9935a5e6
-MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMIT_ID=${COMMIT_ID} "
+COMMITID=$(cat commit)
+MAKEFLAGS="TOPDIR=.. -f ../Makefile COMMITID=${COMMITID} "
 MAKEFLAGS+="EFIDIR=%{efidir} PKGNAME=shim RELEASE=%{release} "
 MAKEFLAGS+="ENABLE_SHIM_HASH=true "
-MAKEFLAGS+="SBAT_AUTOMATIC_DATE=2023012900 "
 if [ -f "%{SOURCE1}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1}"
 fi
 %if 0%{?dbxfile}
 if [ -f "%{SOURCE2}" ]; then
-	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
+	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
 fi
 %endif
 
@@ -160,19 +158,16 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
-* Wed Feb 07 2024 Peter Jones <pjones@redhat.com> - 15.8-2.el9
-- Rebuild to fix the commit ident and MAKEFLAGS
-  Resolves: RHEL-11262
+* Sat Apr 20 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 15.8-1.inferit
+- Update to 15.8
 
-* Tue Jan 23 2024 Peter Jones <pjones@redhat.com> - 15.8-1.el9
-- Update to shim-15.8 for CVE-2023-40547
-  Resolves: RHEL-11262
+* Wed Mar 22 2023 Eugene Zamriy <ezamriy@@msvsphere.ru> - 15.6-1.inferit
+- Use MSVSphere vendor certificate and SBAT entry
+- Rebuilt for MSVSphere 9.1
 
 * Wed Jun 01 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el9
-- Update to shim-15.6 for CVE-2022-28737
-
-* Tue May 24 2022 Peter Jones <pjones@redhat.com> - 15.6~rc1-1.el9
-- Update to shim-15.6~rc1 for CVE-2022-28737
+- Update to shim-15.6
+  Resolves: CVE-2022-28737
 
 * Wed Mar 09 2022 Peter Jones <pjones@redhat.com> - 15.5-1
 - Update to shim-15.5