diff --git a/SOURCES/centos-ca-secureboot.der b/SOURCES/centos-ca-secureboot.der deleted file mode 100644 index 44a2563..0000000 Binary files a/SOURCES/centos-ca-secureboot.der and /dev/null differ diff --git a/SOURCES/centossecureboot001.der b/SOURCES/centossecureboot001.der deleted file mode 100644 index e8216b1..0000000 Binary files a/SOURCES/centossecureboot001.der and /dev/null differ diff --git a/SOURCES/centossecureboot203.der b/SOURCES/centossecureboot203.der deleted file mode 100644 index 5df41c2..0000000 Binary files a/SOURCES/centossecureboot203.der and /dev/null differ diff --git a/SOURCES/centossecurebootca2.der b/SOURCES/centossecurebootca2.der deleted file mode 100644 index 42bdfcf..0000000 Binary files a/SOURCES/centossecurebootca2.der and /dev/null differ diff --git a/SOURCES/redhatsecureboot301.cer b/SOURCES/redhatsecureboot301.cer new file mode 100644 index 0000000..4ff8b79 Binary files /dev/null and b/SOURCES/redhatsecureboot301.cer differ diff --git a/SOURCES/redhatsecureboot503.cer b/SOURCES/redhatsecureboot503.cer new file mode 100644 index 0000000..50e375c Binary files /dev/null and b/SOURCES/redhatsecureboot503.cer differ diff --git a/SOURCES/redhatsecurebootca3.cer b/SOURCES/redhatsecurebootca3.cer new file mode 100644 index 0000000..b235400 Binary files /dev/null and b/SOURCES/redhatsecurebootca3.cer differ diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer new file mode 100644 index 0000000..dfb0284 Binary files /dev/null and b/SOURCES/redhatsecurebootca5.cer differ diff --git a/SPECS/fwupd.spec b/SPECS/fwupd.spec index 6b15a80..23703c1 100644 --- a/SPECS/fwupd.spec +++ b/SPECS/fwupd.spec @@ -54,10 +54,10 @@ Source15: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-x64.cab # these are numbered high just to keep them wildly away from colliding with # the real package sources, in order to reduce churn. -Source300: centos-ca-secureboot.der -Source301: centossecureboot001.der -Source500: centossecurebootca2.der -Source503: centossecureboot203.der +Source300: redhatsecurebootca3.cer +Source301: redhatsecureboot301.cer +Source500: redhatsecurebootca5.cer +Source503: redhatsecureboot503.cer Patch2: 0001-Do-not-use-the-LVFS.patch Patch4: deps.patch @@ -258,8 +258,8 @@ install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %global efiarch aa64 %endif %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi -%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n centossecureboot001 -%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n centossecureboot203 +%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301 +%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503 rm -fv %{fwup_efi_fn}.tmp %endif @@ -492,15 +492,15 @@ done %endif %changelog -* Tue Apr 13 2021 Richard Hughes 1.5.9-1 +* Tue Apr 13 2021 Richard Hughes 1.5.9-3 - Rebase to include the SBAT metadata section to allow fixing BootHole -- Resolves: rhbz#1933010 -- Resolves: rhbz#1932951 -- Resolves: rhbz#1932907 -- Resolves: rhbz#1932880 -- Resolves: rhbz#1932578 -- Resolves: rhbz#1932552 -- Resolves: rhbz#1932422 +- Resolves: rhbz#1933012 +- Resolves: rhbz#1932953 +- Resolves: rhbz#1932909 +- Resolves: rhbz#1932882 +- Resolves: rhbz#1932579 +- Resolves: rhbz#1932553 +- Resolves: rhbz#1932423 * Wed Feb 10 2021 Richard Hughes 1.5.5-3 - Backport a fix from upstream to fix a crash in the Goodix MOC plugin.