From 049251f8469e317d1722ba9d5d7d0d7096ad43b8 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 31 May 2024 16:38:36 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .fwupdate.metadata       |   1 -
 .gitignore               |   1 +
 SOURCES/secureboot.cer   | Bin 839 -> 0 bytes
 SOURCES/securebootca.cer | Bin 977 -> 0 bytes
 SPECS/fwupdate.spec      |  20 ++++++++++++++------
 5 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 .fwupdate.metadata
 delete mode 100644 SOURCES/secureboot.cer
 delete mode 100644 SOURCES/securebootca.cer

diff --git a/.fwupdate.metadata b/.fwupdate.metadata
deleted file mode 100644
index 79e7384..0000000
--- a/.fwupdate.metadata
+++ /dev/null
@@ -1 +0,0 @@
-ac50edbe32f61d4402c10a0eaea4643f617132f6 SOURCES/fwupdate-11.tar.bz2
diff --git a/.gitignore b/.gitignore
index 333dca6..08b885b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+SOURCES/almalinuxsecurebootca0.cer
 SOURCES/fwupdate-11.tar.bz2
diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer
deleted file mode 100644
index 4ff8b79e6736e566dbf39603e0887a53345aa4e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 839
zcmXqLVs<uYV$xo~%*4pV#L4h}zvyHQr&Ia{ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF
zn1$tnQd1N>5=#_<Q<F=JQWc!?^Gg&ooE;UiQ!5n=H4T*v6ySO}8O4N)Q<D>OQj1C)
zic(WD5=-=w^K%X4#CZ)(42%qc(A3<>AWEFq*xbO#zzobaj4}u^)G^S4Sf`BDy5h|A
zyv)3GQtWJER6_O@BP#=Q6C*!^K@%evQxhX2!zT5vqmx`?o`(oz{$eeCezR_cLPyl%
zHpef<Z?c)s9bV+G*2GY{zUlen&--<nt5(QI#He!|D#@MA6@S7f!DrgWI=@zC&C^a<
zS^NJVseCT_+kC+hmfzF#Tx_$BdDsQaxH<oTd&Lst*YdY!eYroouj_1-&+(6kqHpHi
znY}t@nRQ&w=1_h6OY<eQl|Q`<JrTM7n!i`t_o#KdW$w9@pD!~JJ80ql!v4;Yj`D4+
zCJ#<$T1i;hJiEmZa%<xJ%U=UFoRVA<Io&opOJuT!pLNleeH**jw6<(2uj!q8$Hi$^
z<>qUbuO&%O^nA}y6#9BjM%~U7Q(5kw6_YN1epR)|xb9Elg4_B`%!~|-ixmyz4P=2K
zFU!Xw#v&5#_@80Rp3FS`6#W&an$HJBb(91l2O=<O00WVcA<H>d+v%~@6}B_2%&Mg`
zDvt6_STWb-ZhXD^RgaJz3Cq5o4B43+oEZD&XVQnj{jXOGHfUJJB>qmC?A`ut>Ahpw
zdM-|DZzz7Yc^I3-u|J*vqdKqQ`kIF?LJd~2r8XOg&f%Z+Yj((@r{(*;Y?_w8rSDJJ
zntk_K74NJ(drfx5hIZaKImf>p{fSPd=}qfHlV8OA-0dHz$M#&#on!XF_3NjY{(Hxy
zbKN4k{8NvC{Y9;Yo!51>R!)l5n2-{5CgAUe(k!NLc|1u*B2w==ttY-NzWb+N=75O&
zzv2uf{%c3S9%5x`<-dQv`g=w9>l=;D-vz#WO}UeuefPU1`=|Tw9$I=mIi&>vg+x|L

diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer
deleted file mode 100644
index b2354007b9668258683b99a68fa5bdd3067c31b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmXqLVm@oo#I$t*GZP~d6DPykKFO2}lmD>>ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF
zn1$tnQd1N>5=#_<Q<F=JQWc!?^Gg&ooE;UiQ!5n=H4T*v6ySO}8O4N)Q<D>OQj1C)
zic(WD5=-=w^K%X4#CZ)(42%qc(8R>VG)kP;*xbO#zzoWzwslR6O2{5!WMyD(V&rEq
zXkz4IYGPz$nC+~<?2{)QQnbB!-tOilfvp!W+5DVoSG#L+<>vi6EDouC4!V-;tv&JA
zN}nf->iaHo2tM8rAb&8=Njdj{a^${=Z?aE)&k<1VH{Q3Wx7jKD-_5CYum4K4d~JV`
z`ccOE*<7!m22LI4&u3g0F3h!NN?ysm?c*7~^lIfF3D-Xhnr_&uU!bJ$?ZS8WW+A0-
zr9raw{Iep~On)hDAUrqc*pZy>@YoE^;z#ABPp))utMY{K9XOZuN+87Vv97^}gccFK
z6&c%&T=rzVyKuJ1S>c?R<K#PxtGGq~?cMg~=gYe$SJ$!S^;`(O<ep~wX+Qso!rIJ(
zZL23GL@b?{ZqYAz@%i~&roT+gj0}v68`m2&t}&1W#<DCQix`WDgIJ50%Q>q?77kYS
zv==`X%}M<cV^9l{R%R(PC~3f|U}4}Ae=0{`6H>C|0a-81!fL?G$oL;QPJxLO7^jR3
zp{b9(0{X(lQ;+K%h_CKtxc%nd+9kH!CBia&JkgcqO9LvF9(I1~^2+p(_fBqs&+@+g
zjZG)^b(y8?lr#NV`RkoR|I-BpaSiJiPBV7drX0Bbe!0fPB95K&)ygj1YM5%bK;(6L
z=7Y@r2hM%A`uyr;o|A^(c{icYtu_B=WuE^MZ_<<d&TsQv+iB;vWxkm>i|1QMhsQHT
z<L>4}wg*#%C!d<*ePQAKPyWoS|9R;jPUx*P-5Ksuo_~6c3tyKHzf+y+r*{_;vOAw>
zmv4Wk&h*1hGe;ze)#t#BH;PsH)$e|FOmna8+@9jW!^ymRMf{q+C84h)mppfN*sxn6
NnfI|Q%N6m!6aeL$dME$@

diff --git a/SPECS/fwupdate.spec b/SPECS/fwupdate.spec
index 673a171..6ecaf64 100644
--- a/SPECS/fwupdate.spec
+++ b/SPECS/fwupdate.spec
@@ -5,12 +5,12 @@
 
 Name:           fwupdate
 Version:        11
-Release:        3%{?dist}
+Release:        3%{?dist}.alma.2
 Summary:        Tools to manage UEFI firmware updates
 License:        GPLv2+
 URL:            https://github.com/rhinstaller/fwupdate
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-BuildRequires:  efivar-devel >= %{efivar_version}
+BuildRequires:  efivar-devel < 37
 BuildRequires:  gnu-efi >= %{gnu_efi_version}
 BuildRequires:  gnu-efi-devel >= %{gnu_efi_version}
 BuildRequires:  pesign
@@ -23,8 +23,7 @@ BuildRequires: libsmbios-devel
 ExclusiveArch:  x86_64 aarch64
 Source0:        https://github.com/rhinstaller/fwupdate/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 Source1:        find-debuginfo-efi.sh
-Source2:        securebootca.cer
-Source3:        secureboot.cer
+Source2:        almalinuxsecurebootca0.cer
 
 Patch0001: Fix-dependency-chain-for-a-parallel-make-issue.patch
 
@@ -105,7 +104,7 @@ make TOPDIR=.. -f ../Makefile OPT_FLAGS="$RPM_OPT_FLAGS" \
      libdir=%{_libdir} bindir=%{_bindir} \
      EFIDIR=%{efidir} %{?_smp_mflags}
 mv -v efi/fwup%{efiarch}.efi efi/fwup%{efiarch}.unsigned.efi
-%pesign -s -i efi/fwup%{efiarch}.unsigned.efi -o efi/fwup%{efiarch}.efi -a %{SOURCE2} -n redhatsecureboot301 -c %{SOURCE3}
+%pesign -s -i efi/fwup%{efiarch}.unsigned.efi -o efi/fwup%{efiarch}.efi -a %{SOURCE2} -n clsecureboot001 -c %{SOURCE3}
 cd ..
 
 %ifarch x86_64
@@ -115,7 +114,7 @@ setarch linux32 -B make TOPDIR=.. -f ../Makefile ARCH=%{efialtarch} \
                         libdir=%{_libdir} bindir=%{_bindir} \
                         EFIDIR=%{efidir} %{?_smp_mflags}
 mv -v efi/fwup%{efialtarch}.efi efi/fwup%{efialtarch}.unsigned.efi
-%pesign -s -i efi/fwup%{efialtarch}.unsigned.efi -o efi/fwup%{efialtarch}.efi -a %{SOURCE2} -n redhatsecureboot301 -c %{SOURCE3}
+%pesign -s -i efi/fwup%{efialtarch}.unsigned.efi -o efi/fwup%{efialtarch}.efi -a %{SOURCE2} -n clsecureboot001 -c %{SOURCE3}
 cd ..
 %endif
 
@@ -201,6 +200,15 @@ make abicheck
 %defattr(-,root,root)
 
 %changelog
+* Mon Feb 27 2023 Eduard Abdullin <eabdullin@cloudlinux.com> - 11-3.alma.2
+- Use AlmaLinux cert
+
+* Thu Oct 14 2021 Eduard Abdullin <eabdullin@cloudlinux.com> - 11-3.alma.1
+- Downgrade to old version efi
+
+* Fri Apr 09 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 11-3.alma
+- Debrand for AlmaLinux
+
 * Thu Feb 21 2019 Javier Martinez Canillas <javierm@redhat.com> 11-3
 - Fix dependency chain issue when doing a parallel make
   Related: rhbz#1677579