From ef00ee049f30c58181d73239511e92f97d62ca280c00d439163c30231da4c383 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 30 Apr 2017 06:05:38 +0000
Subject: [PATCH] Accepting request 492188 from
 home:bmwiedemann:branches:security

Add reproducible.patch to call gzip -n to make build fully reproducible

OBS-URL: https://build.opensuse.org/request/show/492188
OBS-URL: https://build.opensuse.org/package/show/security/tboot?expand=0&rev=60
---
 reproducible.patch | 13 +++++++++++++
 tboot.changes      |  5 +++++
 tboot.spec         |  3 +++
 3 files changed, 21 insertions(+)
 create mode 100644 reproducible.patch

diff --git a/reproducible.patch b/reproducible.patch
new file mode 100644
index 0000000..fc882a4
--- /dev/null
+++ b/reproducible.patch
@@ -0,0 +1,13 @@
+Index: tboot-1.9.5/tboot/Makefile
+===================================================================
+--- tboot-1.9.5.orig/tboot/Makefile
++++ tboot-1.9.5/tboot/Makefile
+@@ -32,7 +32,7 @@ OBJS := $(obj-y)
+ TARGET_LDS := $(CURDIR)/common/tboot.lds
+ 
+ $(TARGET).gz : $(TARGET)
+-	gzip -f -9 < $< > $@
++	gzip -n -f -9 < $< > $@
+ 
+ $(TARGET) : $(OBJS) $(TARGET_LDS)
+ 	$(LD) $(LDFLAGS) -T $(TARGET_LDS) -N $(OBJS) -o $(@D)/.$(@F).0
diff --git a/tboot.changes b/tboot.changes
index 7cc997e..98c0d1d 100644
--- a/tboot.changes
+++ b/tboot.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr 30 05:29:57 UTC 2017 - bwiedemann@suse.com
+
+- Add reproducible.patch to call gzip -n to make build fully reproducible
+
 -------------------------------------------------------------------
 Fri Feb 10 16:56:03 UTC 2017 - jengelh@inai.de
 
diff --git a/tboot.spec b/tboot.spec
index c8b41ed..fa96cc5 100644
--- a/tboot.spec
+++ b/tboot.spec
@@ -28,6 +28,8 @@ Source0:        http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver
 Patch1:         tboot-grub2-suse.patch
 Patch3:         tboot-grub2-fix-menu-in-xen-host-server.patch
 Patch4:         tboot-grub2-fix-xen-submenu-name.patch
+# PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/tboot/code/merge-requests/1/
+Patch5:         reproducible.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  openssl-devel
 BuildRequires:  trousers-devel
@@ -43,6 +45,7 @@ verified launch of an OS kernel/VMM.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 export CFLAGS="%{optflags}"