[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#928676: unblock: pesign/0.112-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pesign

I've fixed a major bug in 0.112-5 which we need for building
shim. Submitting our shim for review depends on building and testing
in buster. The fix is a single backport of an upstream fix (see
#928491).

Trivial packaging changes otherwise.

Debdiff attached.

unblock pesign/0.112-5

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru pesign-0.112/debian/changelog pesign-0.112/debian/changelog
--- pesign-0.112/debian/changelog	2017-05-13 16:36:43.000000000 +0100
+++ pesign-0.112/debian/changelog	2019-05-05 21:22:21.000000000 +0100
@@ -1,3 +1,11 @@
+pesign (0.112-5) unstable; urgency=high
+
+  * Move git repo from alioth to salsa.d.o
+  * efisiglist: Copy the header correctly (Closes: #928491)
+  * Update obsolete Build-Depends (remove dh-systemd, update debhelper)
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 05 May 2019 21:22:21 +0100
+
 pesign (0.112-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru pesign-0.112/debian/control pesign-0.112/debian/control
--- pesign-0.112/debian/control	2017-05-06 21:35:46.000000000 +0100
+++ pesign-0.112/debian/control	2019-05-05 21:22:21.000000000 +0100
@@ -2,12 +2,12 @@
 Priority: optional
 Maintainer: Debian UEFI maintainers <debian-efi@lists.debian.org>
 Uploaders: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>, Steve McIntyre <93sam@debian.org>
-Build-Depends: debhelper (>= 9.0.0), dh-systemd (>= 1.5), pkg-config, libnspr4, libnss3, libnss3-tools, libpopt-dev, coolkey, opensc (>= 0.14.0), libnspr4-dev (>= 4.9.2), libnss3-dev (>= 3.13.6), libefivar-dev (>= 0.14), uuid-dev
+Build-Depends: debhelper (>= 9.20160709), pkg-config, libnspr4, libnss3, libnss3-tools, libpopt-dev, coolkey, opensc (>= 0.14.0), libnspr4-dev (>= 4.9.2), libnss3-dev (>= 3.13.6), libefivar-dev (>= 0.14), uuid-dev
 Standards-Version: 3.9.8.0
 Section: devel
 Homepage: https://github.com/rhinstaller/pesign
-Vcs-Git: git://anonscm.debian.org/uefi/pesign.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=uefi/pesign.git
+Vcs-Git: https://salsa.debian.org/efi-team/pesign.git
+Vcs-Browser: https://salsa.debian.org/efi-team/pesign
 
 Package: pesign
 Architecture: amd64 i386 armhf arm64 armel
diff -Nru pesign-0.112/debian/patches/efisiglist_header.patch pesign-0.112/debian/patches/efisiglist_header.patch
--- pesign-0.112/debian/patches/efisiglist_header.patch	1970-01-01 01:00:00.000000000 +0100
+++ pesign-0.112/debian/patches/efisiglist_header.patch	2019-05-05 21:22:21.000000000 +0100
@@ -0,0 +1,28 @@
+commit 7c26eeff5eef526161de5365b14d323e20a4ec3f
+Author: Gary Lin <glin@suse.com>
+Date:   Fri Mar 30 12:25:34 2018 +0800
+
+    efisiglist: Copy the header correctly
+    
+    signature_list wasn't copied corretly to efi_signature_list because
+    SignatureType in signature_list is a pointer while that in
+    efi_signature_list is not.
+    
+    Signed-off-by: Gary Lin <glin@suse.com>
+
+diff --git a/src/siglist.c b/src/siglist.c
+index 6e59164..e74eb10 100644
+--- a/src/siglist.c
++++ b/src/siglist.c
+@@ -217,7 +217,10 @@ signature_list_realize(signature_list *sl, void **out, size_t *outsize)
+ 		return -1;
+ 	esl = ret;
+ 
+-	memcpy(esl, sl, sizeof (*esl));
++	memcpy(&esl->SignatureType, sl->SignatureType, sizeof(efi_guid_t));
++	esl->SignatureListSize = sl->SignatureListSize;
++	esl->SignatureHeaderSize = sl->SignatureHeaderSize;
++	esl->SignatureSize = sl->SignatureSize;
+ 
+ 	uint8_t *pos = ret + sizeof (*esl);
+ 	for (int i = 0; i < count; i++) {
diff -Nru pesign-0.112/debian/patches/series pesign-0.112/debian/patches/series
--- pesign-0.112/debian/patches/series	2017-05-13 16:07:00.000000000 +0100
+++ pesign-0.112/debian/patches/series	2019-05-05 21:22:21.000000000 +0100
@@ -1,2 +1,3 @@
 fix_cmdline.patch
 tty-prompt-race.patch
+efisiglist_header.patch

Reply to: