From d2bbb3350db1aed1fb70e2ae9e5cd6ec4551a735 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Thu, 27 May 2021 09:33:46 +0000
Subject: [PATCH] import grub2-2.02-99.el8
---
SOURCES/rocky-root-ca.der | Bin 0 -> 1177 bytes
SOURCES/rocky-signing.der | Bin 0 -> 1167 bytes
SPECS/grub2.spec | 18 +++++++++---------
3 files changed, 9 insertions(+), 9 deletions(-)
create mode 100644 SOURCES/rocky-root-ca.der
create mode 100644 SOURCES/rocky-signing.der
diff --git a/SOURCES/rocky-root-ca.der b/SOURCES/rocky-root-ca.der
new file mode 100644
index 0000000000000000000000000000000000000000..d86bb0e18cd7304579dfeb4fadb60ee9ac78131a
GIT binary patch
literal 1177
zcmXqLVwq~t#9X_8nTe5!Nksi}=G9BhJPw<q_9<WYXZaqZx3tE9myJ`a&7<u*FC!y2
zD}zDf6+><VPB!LH7B*p~&|pJB1AY*PgNMT<H7Bt=u_)D$&wvLc#LmO&l3$iuWT<PP
z4dQe0s08IFXICn?=9Q!t6%=I_rz!;Jr<H*8D7fX9=A|T-Waj4?DjLXxlymb)1f}Mr
zCIVHZ=A~!mrKT2T=A|o?q$cJXY8a@2lrZziLrnC^%qy)>2u@8d1sdg)pI@R71R|Ur
z4b==(;O^&S6caB7smUy<bSMHjB?qKWFTW_=Ku(<3$k4#l(9+P-)ZD~8N}Sgi#5IR<
zhpV@n7?qGCn30u%xrvdV!Jvtei>Zl`kzq^C^nX0r+{H^o7QbY<5qGt)Jy3<i%IDc_
z7M9w_W<PvZvK<Q$u-|#-nu61b1ql;gPiv11e7<nqhcnDo-T|6t9<09ip)^YAM%|r<
z?z&6gTodxGtFzG8F-!R=_;~RrnWOVdRO%n9FPF6LFHMn`7tnvb+4wn+>9dDoO)}#1
zj|DH?P%yK3=bLLOvrq1i-JDy<`D~BNchhBz0v*9JcDjb|d}naC*Xn-082<L}(tQ<T
zwn1U4RRO=RUE&Op5_)nr_rlFP+u|l?P0YAm9>4l>FW+nKt$}}e9=)Ge`N!|4=ACss
z_X<v!zT8*))<1ZW`h^eHX8PRRzouj_-fg9N^nmEzsf}KiOw5c7jEiFpq77t$2~L)e
zMT|w{Z?Vi<`-unVRwzxLoAxSYL2}QfrQjqhtIQ%{Al86g0Vqqz3bU{pFf%g#H{b^G
z_*qzh`K}E)0)ROT7y*n7{%^O4?Aau!UcY;9T~Xw+=!406Ec-*;Udem!&i&*nFZecw
zkNwOKK?|oNy$iCJ33N^Dim&!r&Arld)k#GOHom!+=Ph-5$<ug^%duYgqI<xKuW!!J
z@>?*)xw~Tm^W471-QRPp*xk?BEVx>p7B(p?%(F=-i9JbAi_3IX&c#PN51f~H+<qr%
z(bLw+#d0_GZ_GT*rEm3Or)2z+*8dJB+^dUBgB{wLlXleU&2Kt%{J-|wqQ+ynW?Ttd
z9Arv*6n!1u=1DKA+~3ro(6u_t?3>6sHT&!Hn-fz#gN`X~7qNCcbRuwP`YXOh?~WeH
c>4G^@X?yP{m>tRfHTk{aN0;dx3LN?u0sfk;yZ`_I
literal 0
HcmV?d00001
diff --git a/SOURCES/rocky-signing.der b/SOURCES/rocky-signing.der
new file mode 100644
index 0000000000000000000000000000000000000000..c1436d6c9a9ffaf0753bb242f4bd2b4c5c6011e3
GIT binary patch
literal 1167
zcmXqLV(B($VlH05%*4n9L<YQUoLX%jZQpqr8M#>*3>vQ(avN~6F^96S2{VNT8wwim
zgE$;K94@IjiRFn!sfK(8JRl)<9#)t9veY6&T?1_ppNmH&C_g#7Qo%K^B(<oZD6=?K
zAviy+1f)m7Ex$A`C9xzkKhIFnKpv!=n@1ujH77L@s46utJu@#gwJ0+$U7;j3G1pMT
zKn<jXnMWRCqEBXCX@x>?YH}&iD5w1V5``cT;p}LrW}pIhKPRJ@cri##W=W+(5y&Yy
zAbooIMd=1|;=D$N2BwCVhL)!0CKgd(u9=|)lxxs<X%KiD<QcHHWs$uN_HS@zdLAfv
zoKuTRi1u_7qY`rTGO{u-H!<=v7&I|*F*PwVGF%L4xtaU+(9V@|F_#wTuD1B}u6=qH
zTlKeXDSv;Qni9OLEiRO0MYt`GhBf0e(L5vBMJlnIG`H-Mtqr*Nyx*)lJ5teNOVV6t
zv(3A=>{&KD{Sc4w*-eLJ-48E+?PtH;-ue1V$wlWMeKGVY_@vW&`c>y?sm0cr7Yjlq
z0@P2eoGI9orZH1J)9=+Ey&E2Wu1|NR*t7VQak1yl2)-ccQ(=8yEu%os{^hhNJ@@3U
zQ~f;06OKwce|~pwd+_yw@cc6$A{;$Vg{=r&adB<MMa%!fDc;|_ex0wjX@0r)%JYcc
zXDr6|brdvnm+gFK$`{$m!_KnNYME|Zn}&RDiMQ_3xu<*`H@s(JW@KPooMDg#PSCQ#
zjEw(Tm<$*U_<*q>%MaqQFf*|?7>I%Rsvtg(0T&yGHX9==D?2l@fgVU)5G1Z*pwt9R
zlc3a(5nT#~28IeDuE8P5aRJO~z_?&!5Inm6V2z-{v$Bg9|HysMx^(urm{M9^3HvUa
z@17lTPv@jAJ(x0KgP6L{({ou@wn&$6yR)JD>(nQCXDbi!etgsAx4YVf+i8<=>2Jv$
z`@1}jb3Ao3_kU>2wJEVF;iu%<t@fviSXccjUfHNMX-RIa$4TwU{_OWR@MrFtufz36
zB-iv{_3Let2fG>i=Gn$~b7a`-h58--esX8dB){XP(>N|Ac5dsP%z4$kZ^>dFNvA|V
z8;`OJU!3-Ba(3SL|Dfrv_rV9Iwx2aS^zHR(mUJ71zImG%0&*rCTanGw@K|(rcF)sS
npEhsE4ehO|W`3~4LL_I&A;VvaPkblsEl;!CG^rx2Eq^Tl`xc{b
literal 0
HcmV?d00001
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 3667706..77960a6 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -26,8 +26,8 @@ Source9: 20-grub.install
Source12: 99-grub-mkconfig.install
Source17: sbat.csv.in
-Source90000: rockylinuxsecurebootca101test.der
-Source90001: rockylinuxsecurebootcert101test.der
+Source90000: rocky-root-ca.der
+Source90001: rocky-signing.der
%include %{SOURCE1}
@@ -168,10 +168,10 @@ git commit -m "After making subdirs"
%build
%if 0%{with_efi_arch}
-%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{SOURCE90000} %{SOURCE90001} rockylinuxsecurebootcert101test}
+%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{SOURCE90000} %{SOURCE90001} rockybootsigningcert}
%endif
%if 0%{with_alt_efi_arch}
-%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{SOURCE90000} %{SOURCE90001} rockylinuxsecurebootcert101test}
+%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{SOURCE90000} %{SOURCE90001} rockybootsigningcert}
%endif
%if 0%{with_legacy_arch}
%{expand:%do_legacy_build %%{grublegacyarch}}
@@ -502,19 +502,19 @@ fi
%endif
%changelog
-* Wed May 19 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
+* Thu May 27 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
- Porting to 8.4
-* Wed May 19 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
+* Thu May 27 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
- Cleaning up grup.macro extra signing certs and updating rocky test CA and CERT
-* Wed May 19 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
+* Thu May 27 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
- Cleaning up grup.macro extra signing certs
-* Wed May 19 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
+* Thu May 27 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-99
- Adding Rocky testing CA, CERT and sbat files
-* Wed May 19 2021 Rich Alloway <ralloway@perforce.com> - 2.02-99
+* Thu May 27 2021 Rich Alloway <ralloway@perforce.com> - 2.02-99
- Apply Rocky Linux debranding changes
* Thu Feb 25 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.02-99
--
GitLab