Accepting request 625007 from Base:System

OBS-URL: https://build.opensuse.org/request/show/625007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/efivar?expand=0&rev=14

efivar.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 24 07:45:35 UTC 2018 - bwiedemann@suse.com
+
+- Add reproducible.patch to initialize memory (boo#1061219)
+
 -------------------------------------------------------------------
 Mon Jul 16 07:45:14 UTC 2018 - glin@suse.com
 

efivar.spec

@@ -36,6 +36,8 @@ Group:          Development/Libraries/C and C++
 Url:            https://github.com/rhinstaller/efivar
 Source:         https://github.com/rhinstaller/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         libefiboot-export-disk_get_partition_info.patch
+# PATCH-FIX-UPSTREAM https://github.com/rhboot/efivar/pull/115
+Patch1:         reproducible.patch
 %if "0%{?buildroot}" == "0"
 # set a sane value for buildroot, unless it's already there!
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -78,6 +80,7 @@ perl -pi -e 's{^.*PKGS=popt.*$}{}; s{^(efivar\S* : LIBS=.*)dl}{$1popt dl}' \
 perl -pi -e 's{\#include \<uchar\.h\>}{typedef __CHAR16_TYPE__ char16_t;}' \
    src/export.c
 %endif
+%patch1 -p1
 
 %build
 CFLAGS="%{optflags} -Wno-nonnull -flto"

reproducible.patch

@@ -0,0 +1,24 @@
+From a02f33199a3c28a655178d35188efda71406a6a0 Mon Sep 17 00:00:00 2001
+From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
+Date: Tue, 24 Jul 2018 09:34:21 +0200
+Subject: [PATCH] makeguids: initialize memory
+
+so that we do not write uninitialized memory into guids.bin and names.bin
+which made the resulting libefivar.so.1.36 unreproducible.
+See https://reproducible-builds.org/ for why this matters.
+---
+ src/makeguids.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/makeguids.c b/src/makeguids.c
+index f84fbb8..a15356b 100644
+--- a/src/makeguids.c
++++ b/src/makeguids.c
+@@ -147,6 +147,7 @@ main(int argc, char *argv[])
+ 		outbuf = realloc(outbuf, line * sizeof (struct guidname));
+ 		if (!outbuf)
+ 			err(1, "makeguids");
++		memset(outbuf + line - 1, 0, sizeof(struct guidname));
+ 
+ 		char *symbol = strchr(guidstr, '\t');
+ 		if (symbol == NULL)