From 0314619567fe41cd55384cf22839f25f8e7acef60a53b29c65377f87cb1b59f0 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.com>
Date: Mon, 3 Sep 2018 10:18:14 +0000
Subject: [PATCH] - tboot-grub2-fix-menu-in-xen-host-server.patch: rebased -
 tboot-grub2-fix-xen-submenu-name.patch: rebased

OBS-URL: https://build.opensuse.org/package/show/security/tboot?expand=0&rev=81
---
 tboot-grub2-fix-menu-in-xen-host-server.patch | 12 ++++++------
 tboot-grub2-fix-xen-submenu-name.patch        |  8 ++++----
 tboot.changes                                 |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tboot-grub2-fix-menu-in-xen-host-server.patch b/tboot-grub2-fix-menu-in-xen-host-server.patch
index c524670..ed84892 100644
--- a/tboot-grub2-fix-menu-in-xen-host-server.patch
+++ b/tboot-grub2-fix-menu-in-xen-host-server.patch
@@ -23,10 +23,10 @@ v3:
 References: bnc#865815
 Porting to tboot in order to fix duplicated xen entries
 
-Index: tboot-1.9.6/tboot/20_linux_tboot
+Index: tboot-1.9.7/tboot/20_linux_tboot
 ===================================================================
---- tboot-1.9.6.orig/tboot/20_linux_tboot
-+++ tboot-1.9.6/tboot/20_linux_tboot
+--- tboot-1.9.7.orig/tboot/20_linux_tboot
++++ tboot-1.9.7/tboot/20_linux_tboot
 @@ -225,6 +225,49 @@ while [ "x${tboot_list}" != "x" ] && [ "
  		break
  	    fi
@@ -77,10 +77,10 @@ Index: tboot-1.9.6/tboot/20_linux_tboot
  	if test -n "${initrd}" ; then
  	    echo "Found initrd image: ${dirname}/${initrd}" >&2
  	else
-Index: tboot-1.9.6/tboot/20_linux_xen_tboot
+Index: tboot-1.9.7/tboot/20_linux_xen_tboot
 ===================================================================
---- tboot-1.9.6.orig/tboot/20_linux_xen_tboot
-+++ tboot-1.9.6/tboot/20_linux_xen_tboot
+--- tboot-1.9.7.orig/tboot/20_linux_xen_tboot
++++ tboot-1.9.7/tboot/20_linux_xen_tboot
 @@ -52,6 +52,12 @@ fi
  export TEXTDOMAIN=grub
  export TEXTDOMAINDIR=${prefix}/share/locale
diff --git a/tboot-grub2-fix-xen-submenu-name.patch b/tboot-grub2-fix-xen-submenu-name.patch
index 6d6c70f..2489d80 100644
--- a/tboot-grub2-fix-xen-submenu-name.patch
+++ b/tboot-grub2-fix-xen-submenu-name.patch
@@ -4,13 +4,13 @@ Subject: fix xen submenu name to show tboot version
 References: bnc#865815
 Patch-Mainline: no
 
-Index: tboot-1.9.6/tboot/20_linux_xen_tboot
+Index: tboot-1.9.7/tboot/20_linux_xen_tboot
 ===================================================================
---- tboot-1.9.6.orig/tboot/20_linux_xen_tboot
-+++ tboot-1.9.6/tboot/20_linux_xen_tboot
+--- tboot-1.9.7.orig/tboot/20_linux_xen_tboot
++++ tboot-1.9.7/tboot/20_linux_xen_tboot
 @@ -232,7 +232,7 @@ while [ "x${xen_list}" != "x" ] ; do
          rel_tboot_dirname=`make_system_path_relative_to_its_root $tboot_dirname`
-         tboot_version="1.9.6"
+         tboot_version="1.9.7"
          list="${linux_list}"
 -        echo "submenu \"Xen ${xen_version}\" \"Tboot ${tboot_version}\"{"
 +        echo "submenu \"Xen ${xen_version} with Tboot ${tboot_version}\"{"
diff --git a/tboot.changes b/tboot.changes
index 38c071d..f7d3edf 100644
--- a/tboot.changes
+++ b/tboot.changes
@@ -4,6 +4,8 @@ Mon Sep  3 10:11:39 UTC 2018 - matthias.gerstner@suse.com
 - package new upstream tarball for 1.9.7. It seems the tarball was replaced
   upstream without notice, because some version numbers have not been
   incremented.
+- tboot-grub2-fix-menu-in-xen-host-server.patch: rebased
+- tboot-grub2-fix-xen-submenu-name.patch: rebased
 
 -------------------------------------------------------------------
 Fri Aug 31 14:23:48 UTC 2018 - matthias.gerstner@suse.com