pesign - upgrade from 0.112 to 113

pesign has changed its versioning, so this is only a difference of one release. Note that pesign builds to be used on the host, not on the ONIE filesystem, and uses the host's efivar headers, not the ones supplied by the ONIE version of efivar. Signed-off-by: Alex Doyle <[email protected]>
ehdoyle · Jan 12, 2021 · f81ecaf · f81ecaf
1 parent 3c4d187
commit f81ecaf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/build-config/make/pesign.make b/build-config/make/pesign.make
@@ -1,5 +1,6 @@
 #-------------------------------------------------------------------------------
 #
+#  Copyright (C) 2020 Alex Doyle <[email protected]>
 #  Copyright (C) 2017 Curt Brune <[email protected]>
 #
 #  SPDX-License-Identifier:     GPL-2.0
@@ -9,7 +10,7 @@
 # This is a makefile fragment that defines the build of pesign
 #
 
-PESIGN_VERSION			= 0.112
+PESIGN_VERSION			= 113
 PESIGN_TARBALL			= pesign-$(PESIGN_VERSION).tar.bz2
 PESIGN_TARBALL_URLS		+= $(ONIE_MIRROR) https://github.com/rhinstaller/pesign/releases/download/$(PESIGN_VERSION)
 PESIGN_BUILD_DIR		= $(USER_BUILDDIR)/pesign

diff --git a/patches/pesign/brace-initialization.patch b/patches/pesign/brace-initialization.patch
@@ -1,19 +1,28 @@
-brace-initialization-patch
+From 96576124252305d23e486e068d8abe0b0cc1bc93 Mon Sep 17 00:00:00 2001
+From: Alex Doyle <[email protected]>
+Date: Fri, 18 Dec 2020 10:16:28 -0800
+Subject: [PATCH] brace-initialization-patch for pesign-113
 
 Fix strict warning message treated as an error
 (-Werror=missing-braces) by explicitly initializing every struct
 member to zero.
+---
+ libdpe/pe_allocspace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libdpe/pe_allocspace.c b/libdpe/pe_allocspace.c
-index d30de1f..b813874 100644
+index a2898f6..cdd6a5d 100644
 --- a/libdpe/pe_allocspace.c
 +++ b/libdpe/pe_allocspace.c
 @@ -61,7 +61,7 @@ pe_set_image_size(Pe *pe)
  	struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
 
  	Pe_Scn *scn = NULL;
--	struct section_header shdr = { 0, }, tmp_shdr;
+-	struct section_header shdr = { "", 0, }, tmp_shdr;
 +	struct section_header shdr = {{ 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, tmp_shdr;
  	if (pehdr->sections < 1)
  		return -1;
 
+-- 
+2.20.1
+
diff --git a/patches/pesign/series b/patches/pesign/series
@@ -1,3 +1,3 @@
-# This series applies on GIT commit 3fc75c97acf42f6f7a472f6ab5081d00d1d4f945
+# This series applies for building pesign version 113
 brace-initialization.patch
-implicit-fallthrough.patch
+
diff --git a/upstream/pesign-113.tar.bz2.sha1 b/upstream/pesign-113.tar.bz2.sha1
@@ -0,0 +1 @@
+1fabe291298395b6dd3129e250d8b67345745834  pesign-113.tar.bz2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		1fabe291298395b6dd3129e250d8b67345745834 pesign-113.tar.bz2