packages/pesign
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!15 解决软件包pesign在mainline的编译失败问题

Browse Source 
From: @tushenmei
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-07-31 15:23:10 +00:00 committed by Gitee
commit f9566b5556
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pesign.spec
View File

@ -2,7 +2,7 @@
Name: pesign Name: pesign
Summary: Signing utility for UEFI binaries Summary: Signing utility for UEFI binaries
Version: 0.113 Version: 0.113
Release: 4 Release: 5
License: GPLv2 License: GPLv2
URL: https://github.com/vathpela/pesign URL: https://github.com/vathpela/pesign
Source0: https://github.com/rhboot/pesign/archive/113.tar.gz Source0: https://github.com/rhboot/pesign/archive/113.tar.gz
@ -17,6 +17,7 @@ BuildRequires: nss-devel >= 3.13.6-1 efivar-devel >= 31-1 libuuid-devel tar xz
BuildRequires: python3-rpm-macros python3 systemd python3-devel gcc BuildRequires: python3-rpm-macros python3 systemd python3-devel gcc
Patch0001: Fix-the-build-with-nss-3.44.patch Patch0001: Fix-the-build-with-nss-3.44.patch
Patch0002: remove-superfluous-type-settings.patch
%description %description
pesign is a command line tool for manipulating signatures and pesign is a command line tool for manipulating signatures and
@ -93,6 +94,9 @@ exit 0
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Sat July 31 2021 Shenmei Tu <tushenmei@huawei.com> - 0.113-5
- remove-superfluous-type-settings.patch
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 0.113-4 * Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 0.113-4
- Completing build dependencies - Completing build dependencies

19
remove-superfluous-type-settings.patch Normal file
View File

@ -0,0 +1,19 @@
diff -Nur pesign-113/src/pesigcheck.c pesign-113-new/src/pesigcheck.c
--- pesign-113/src/pesigcheck.c 2019-05-11 02:53:51.000000000 +0800
+++ pesign-113-new/src/pesigcheck.c 2021-07-30 11:25:25.000000000 +0800
@@ -318,7 +318,6 @@
reason->type = SIGNATURE;
reason->sig.data = data;
reason->sig.len = datalen;
- reason->type = siBuffer;
nreason += 1;
is_invalid = true;
}
@@ -330,7 +329,6 @@
reason->type = SIGNATURE;
reason->sig.data = data;
reason->sig.len = datalen;
- reason->type = siBuffer;
nreason += 1;
has_valid_cert = true;
}