From 286da5020e531e6544d281e5ab74c9262166a1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Mar 2019 09:28:41 +0100 Subject: [PATCH 1/3] Add missing BR:gcc, make BRs one-per-line This fixes build in mock. --- pesign.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pesign.spec b/pesign.spec index 5fe7350..0fbeda6 100644 --- a/pesign.spec +++ b/pesign.spec @@ -3,23 +3,34 @@ Name: pesign Summary: Signing utility for UEFI binaries Version: 0.112 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2 URL: https://github.com/vathpela/pesign Obsoletes: pesign-rh-test-certs <= 0.111-7 -BuildRequires: git nspr nss nss-util popt-devel +BuildRequires: gcc +BuildRequires: git +BuildRequires: nspr +BuildRequires: nss +BuildRequires: nss-util +BuildRequires: popt-devel BuildRequires: nss-tools BuildRequires: nspr-devel >= 4.9.2-1 BuildRequires: nss-devel >= 3.13.6-1 BuildRequires: efivar-devel >= 31-1 BuildRequires: libuuid-devel -BuildRequires: tar xz -BuildRequires: python3-rpm-macros python3 +BuildRequires: tar +BuildRequires: xz +BuildRequires: python3-rpm-macros +BuildRequires: python3 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 17 BuildRequires: systemd %endif -Requires: nspr nss nss-util popt rpm +Requires: nspr +Requires: nss +Requires: nss-util +Requires: popt +Requires: rpm Requires(pre): shadow-utils ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} %if 0%{?rhel} == 7 @@ -163,6 +174,9 @@ exit 0 %{python3_sitelib}/mockbuild/plugins/pesign.* %changelog +* Wed Mar 6 2019 Zbigniew Jędrzejewski-Szmek - 0.112-25 +- Fix build (#1605427) + * Fri Jul 13 2018 Fedora Release Engineering - 0.112-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 487af474b53676d12957907228de538598cb7901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Mar 2019 09:44:23 +0100 Subject: [PATCH 2/3] Add missing closing quote in macro Patch from John Soros. --- ...rpm-Make-the-client-signer-use-the-fedora-values-unl.patch | 4 ++-- pesign.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch b/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch index ad9da8d..3f0b2e1 100644 --- a/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch +++ b/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch @@ -17,8 +17,8 @@ index 69280e9..22a3ee6 100644 %__pesign_token %{nil}%{?pe_signing_token:-t "%{pe_signing_token}"} %__pesign_cert %{!?pe_signing_cert:"Red Hat Test Certificate"}%{?pe_signing_cert:"%{pe_signing_cert}"} -+%__pesign_client_token %{!?pe_signing_token:"Fedora Signer (OpenSC Card)"}%{?pe_signing_token:"%{pe_signing_token}} -+%__pesign_client_cert %{!?pe_signing_cert:"/CN=Fedora Secure Boot Signer"}%{?pe_signing_cert:"%{pe_signing_cert}} ++%__pesign_client_token %{!?pe_signing_token:"Fedora Signer (OpenSC Card)"}%{?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 diff --git a/pesign.spec b/pesign.spec index 0fbeda6..830d854 100644 --- a/pesign.spec +++ b/pesign.spec @@ -176,6 +176,7 @@ exit 0 %changelog * Wed Mar 6 2019 Zbigniew Jędrzejewski-Szmek - 0.112-25 - Fix build (#1605427) +- Add missing closing quote in macro (#1651020) * Fri Jul 13 2018 Fedora Release Engineering - 0.112-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 550f7f9ec23c401a55e5ce914f02cc59403d8be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Mar 2019 09:54:16 +0100 Subject: [PATCH 3/3] Update obsolete /var/run/ path --- pesign.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pesign.spec b/pesign.spec index 830d854..6db40e8 100644 --- a/pesign.spec +++ b/pesign.spec @@ -87,6 +87,9 @@ git am %{patches} - 0.112-25 - Fix build (#1605427) - Add missing closing quote in macro (#1651020) +- Update obsolete /var/run/ path (#1678146) * Fri Jul 13 2018 Fedora Release Engineering - 0.112-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild