From e69b8ee7151d99a02ebdd42dd0a16ffe200d2af1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2020 11:00:39 -0400 Subject: [PATCH] Try to make kernel and fwupd both work at the same time. Signed-off-by: Peter Jones --- ...ros.pesign-to-pesign-rpmbuild-helper.patch | 18 ++++++------- 0012-one-more-glorious-hack.patch | 25 ------------------- pesign.spec | 3 +-- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 0012-one-more-glorious-hack.patch diff --git a/0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch b/0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch index 0a96bdb..3a62cf6 100644 --- a/0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch +++ b/0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch @@ -1,15 +1,15 @@ -From e05840efa8dc9d0a9ff3104b9fa6e5736e0ec549 Mon Sep 17 00:00:00 2001 +From 6c16b978fd33f3611e9f7aaf4f9c44bce1679485 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 6 Jul 2020 13:54:35 -0400 -Subject: [PATCH 08/11] Move most of macros.pesign to pesign-rpmbuild-helper +Subject: [PATCH] Move most of macros.pesign to pesign-rpmbuild-helper Signed-off-by: Peter Jones --- Make.defaults | 1 + src/Makefile | 8 +- - src/macros.pesign | 76 ++++-------- + src/macros.pesign | 74 ++++-------- src/pesign-rpmbuild-helper.in | 222 ++++++++++++++++++++++++++++++++++ - 4 files changed, 253 insertions(+), 54 deletions(-) + 4 files changed, 252 insertions(+), 53 deletions(-) create mode 100644 src/pesign-rpmbuild-helper.in diff --git a/Make.defaults b/Make.defaults @@ -58,10 +58,10 @@ index 74327ba13f3..a7ca89159c6 100644 $(INSTALL) -m 600 pesign-users $(INSTALLROOT)/etc/pesign/users $(INSTALL) -m 600 pesign-groups $(INSTALLROOT)/etc/pesign/groups diff --git a/src/macros.pesign b/src/macros.pesign -index 5a6da1c6809..cb066b35f4a 100644 +index 5a6da1c6809..2e984b4eeb3 100644 --- a/src/macros.pesign +++ b/src/macros.pesign -@@ -6,11 +6,11 @@ +@@ -6,7 +6,7 @@ # %pesign -s -i shim.orig -o shim.efi # And magically get the right thing. @@ -70,10 +70,6 @@ index 5a6da1c6809..cb066b35f4a 100644 %__pesign_cert %{!?pe_signing_cert:"Red Hat Test Certificate"}%{?pe_signing_cert:"%{pe_signing_cert}"} %__pesign_client_token %{!?pe_signing_token:"OpenSC Card (Fedora Signer)"}%{?pe_signing_token:"%{pe_signing_token}"} - %__pesign_client_cert %{!?pe_signing_cert:"/CN=Fedora Secure Boot Signer"}%{?pe_signing_cert:"%{pe_signing_cert}"} - - %_pesign /usr/bin/pesign - %_pesign_client /usr/bin/pesign-client @@ -24,54 +24,24 @@ # -a # rhel only # -s # perform signing @@ -140,7 +136,7 @@ index 5a6da1c6809..cb066b35f4a 100644 + %{?_buildhost:--hostname "%{_buildhost}"} \\\ + %{?vendor:--vendor "%{vendor}"} \\\ + %{?_rhel:--rhelver "%{_rhel}"} \\\ -+ %{?-n:--rhelcert "%{-n*}"}%{?!-n:--rhelcert "%{__pesign_cert}"} \\\ ++ %{?-n:--rhelcert %{-n*}}%{?!-n:--rhelcert %{__pesign_cert}} \\\ + %{?-a:--rhelcafile "%{-a*}"} \\\ + %{?-c:--rhelcertfile "%{-c*}"} \\\ + %{?-C:--certout "%{-C*}"} \\\ diff --git a/0012-one-more-glorious-hack.patch b/0012-one-more-glorious-hack.patch deleted file mode 100644 index 4ca15ec..0000000 --- a/0012-one-more-glorious-hack.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ca1fb1982b237aad86ef0adfc2f1a7bc60606701 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 30 Jul 2020 22:44:11 -0400 -Subject: [PATCH] one more glorious hack - ---- - src/macros.pesign | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/macros.pesign b/src/macros.pesign -index 730d3bc449c..b4fa04a7192 100644 ---- a/src/macros.pesign -+++ b/src/macros.pesign -@@ -34,7 +34,7 @@ - %{?__pesign_cert:--cert %{__pesign_cert}} \\\ - %{?vendor:--vendor %{vendor}} \\\ - %{?_rhel:--rhelver "%{_rhel}"} \\\ -- %{?-n:--rhelcert "%{-n*}"}%{?!-n:--rhelcert "%{__pesign_cert}"} \\\ -+ %{?-n:--rhelcert %{-n*}}%{?!-n:--rhelcert %{__pesign_cert}} \\\ - %{?-a:--rhelcafile "%{-a*}"} \\\ - %{?-c:--rhelcertfile "%{-c*}"} \\\ - %{?-C:--certout "%{-C*}"} \\\ --- -2.26.2 - diff --git a/pesign.spec b/pesign.spec index eb68d02..4d44d0d 100644 --- a/pesign.spec +++ b/pesign.spec @@ -53,7 +53,6 @@ Patch0008: 0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch Patch0009: 0009-pesign-authorize-shellcheck.patch Patch0010: 0010-pesign-authorize-don-t-setfacl-etc-pki-pesign-foo.patch Patch0011: 0011-kernel-building-hack.patch -Patch0012: 0012-one-more-glorious-hack.patch %description This package contains the pesign utility for signing UEFI binaries as @@ -166,7 +165,7 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null %{python3_sitelib}/mockbuild/plugins/pesign.* %changelog -* Thu Jul 30 2020 Peter Jones - 113-12 +* Mon Aug 03 2020 Peter Jones - 113-12 - Try to make kernel and fwupd both work at the same time. * Tue Jul 28 2020 Fedora Release Engineering - 113-11