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 5fe7350..6db40e8 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 @@ -76,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