Accepting request 753850 from home:gary_lin:branches:Base:System

remove the superfluous type settings in pesigcheck to fix the gcc10 errors (boo#1158197)

OBS-URL: https://build.opensuse.org/request/show/753850
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=54

pesign-boo1158197-fix-pesigncheck-gcc10.patch

@@ -0,0 +1,39 @@
+From b0b740f38da6d4584417d65a7c97fd4faf982cf6 Mon Sep 17 00:00:00 2001
+From: Gary Lin <glin@suse.com>
+Date: Wed, 4 Dec 2019 10:28:28 +0800
+Subject: [PATCH] pesigcheck: remove superfluous type settings
+
+When setting the type of reason in check_signature(), the type was
+accidentally set as "siBuffer". Since the type is already set as
+"SIGNATURE", we only need to remove those two lines of code.
+
+Fixes: https://github.com/rhboot/pesign/issues/55
+
+Signed-off-by: Gary Lin <glin@suse.com>
+---
+ src/pesigcheck.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/pesigcheck.c b/src/pesigcheck.c
+index 524cce3..d197c30 100644
+--- a/src/pesigcheck.c
++++ b/src/pesigcheck.c
+@@ -318,7 +318,6 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
+ 			reason->type = SIGNATURE;
+ 			reason->sig.data = data;
+ 			reason->sig.len = datalen;
+-			reason->type = siBuffer;
+ 			nreason += 1;
+ 			is_invalid = true;
+ 		}
+@@ -330,7 +329,6 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
+ 			reason->type = SIGNATURE;
+ 			reason->sig.data = data;
+ 			reason->sig.len = datalen;
+-			reason->type = siBuffer;
+ 			nreason += 1;
+ 			has_valid_cert = true;
+ 		}
+-- 
+2.24.0
+

pesign.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec  4 02:38:05 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Add pesign-boo1158197-fix-pesigncheck-gcc10.patch to remove the
+  superfluous type settings in pesigcheck to fix the gcc10 errors
+  (boo#1158197)
+
 -------------------------------------------------------------------
 Wed Jul 31 03:26:37 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
 

pesign.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pesign
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Signing tool for PE-COFF binaries
 License:        GPL-3.0-or-later
 Group:          Productivity/Security
-Url:            https://github.com/rhinstaller/pesign
+URL:            https://github.com/rhinstaller/pesign
 Source:         https://github.com/rhinstaller/pesign/releases/download/%{version}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-SUSE pesign-suse-build.patch glin@suse.com -- Adjust Makefile for the build service
 Patch1:         pesign-suse-build.patch
@@ -36,6 +36,8 @@ Patch4:         pesign-fix-authvar-write-loop.patch
 Patch5:         pesign-efikeygen-Fix-the-build-with-nss-3.44.patch
 # PATCH-FIX-SUSE pesign-boo1143063-remove-var-tracking.patch -- boo#1143063 Remove var-tracking from default CFLAGS
 Patch6:         pesign-boo1143063-remove-var-tracking.patch
+# PATCH-FIX-UPSTREAM pesign-boo1158197-fix-pesigncheck-gcc10.patch glin@suse.com -- boo#1158197 Fix the gcc10 errors
+Patch7:         pesign-boo1158197-fix-pesigncheck-gcc10.patch
 BuildRequires:  efivar-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  mozilla-nss-devel
@@ -58,6 +60,7 @@ with the PE and Authenticode specifications.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}"