From 642da36b599026beee01a832f2d31631e272a7a3 Mon Sep 17 00:00:00 2001
From: Gang Wei <gang.wei@intel.com>
Date: Wed, 30 Jul 2014 11:30:53 +0800
Subject: [PATCH] Upgrade to latest upstream version which provided security
 fix for:

  tboot:argument measurement vulnerablity for GRUB2+ELF kernels
---
 .gitignore |  1 +
 sources    |  2 +-
 tboot.spec | 12 +++++-------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8715fd6..48cc27c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /tboot-20110429.tar.gz
 /tboot-1.7.0.tar.gz
 /tboot-1.7.3.tar.gz
+/tboot-1.8.2.tar.gz
diff --git a/sources b/sources
index 0fc7c98..a74b0bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b471f3230cddb33b458020dc7b88810c  tboot-1.8.1.tar.gz
+4849a56f1d8db1ec41b6b117e1931b43  tboot-1.8.2.tar.gz
diff --git a/tboot.spec b/tboot.spec
index c47d400..543becb 100644
--- a/tboot.spec
+++ b/tboot.spec
@@ -1,6 +1,6 @@
 Summary:        Performs a verified launch using Intel TXT
 Name:           tboot
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Epoch:          1
 
@@ -8,7 +8,6 @@ Group:          System Environment/Base
 License:        BSD
 URL:            http://sourceforge.net/projects/tboot/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         tboot-1.7.3-format-string.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  trousers-devel
@@ -23,11 +22,6 @@ and verified launch of an OS kernel/VMM.
 %prep
 %setup -q
 
-# Patch format strings only on 32-bit x86 builds.  size_t
-%ifarch %{ix86}
-%patch0 -p1
-%endif
-
 %build
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 make debug=y %{?_smp_mflags}
@@ -79,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 /boot/tboot-syms
 
 %changelog
+* Wed Jul 30 2014 Gang Wei <gang.wei@intel.com> - 1:1.8.2-1
+- Upgrade to latest upstream version which provided security fix for:
+  tboot:argument measurement vulnerablity for GRUB2+ELF kernels
+
 * Wed Jun 18 2014 Gang Wei <gang.wei@intel.com> - 1:1.8.1-1
 - Upgrade to latest upstream version