Accepting request 223108 from home:msmeissn:branches:security

- fixed path for /usr/share/grub2/grub-mkconfig_lib in our grub2
  snippets. (bnc#864633)

OBS-URL: https://build.opensuse.org/request/show/223108
OBS-URL: https://build.opensuse.org/package/show/security/tboot?expand=0&rev=30

tboot-grub2-suse.patch

@@ -0,0 +1,30 @@
+Index: tboot-1.8.0/tboot/20_linux_tboot
+===================================================================
+--- tboot-1.8.0.orig/tboot/20_linux_tboot
++++ tboot-1.8.0/tboot/20_linux_tboot
+@@ -21,8 +21,8 @@ prefix=/usr
+ exec_prefix=${prefix}
+ bindir=${exec_prefix}/bin
+ libdir=${exec_prefix}/lib
+-if test -e /usr/share/grub/grub-mkconfig_lib; then
+-  . /usr/share/grub/grub-mkconfig_lib
++if test -e /usr/share/grub2/grub-mkconfig_lib; then
++  . /usr/share/grub2/grub-mkconfig_lib
+ elif test -e ${libdir}/grub/grub-mkconfig_lib; then
+   . ${libdir}/grub/grub-mkconfig_lib
+ fi
+Index: tboot-1.8.0/tboot/20_linux_xen_tboot
+===================================================================
+--- tboot-1.8.0.orig/tboot/20_linux_xen_tboot
++++ tboot-1.8.0/tboot/20_linux_xen_tboot
+@@ -21,8 +21,8 @@ prefix=/usr
+ exec_prefix=${prefix}
+ bindir=${exec_prefix}/bin
+ libdir=${exec_prefix}/lib
+-if test -e /usr/share/grub/grub-mkconfig_lib; then
+-  . /usr/share/grub/grub-mkconfig_lib
++if test -e /usr/share/grub2/grub-mkconfig_lib; then
++  . /usr/share/grub2/grub-mkconfig_lib
+ elif test -e ${libdir}/grub/grub-mkconfig_lib; then
+   . ${libdir}/grub/grub-mkconfig_lib
+ fi

tboot.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 19 16:05:10 UTC 2014 - meissner@suse.com
+
+- fixed path for /usr/share/grub2/grub-mkconfig_lib in our grub2
+  snippets. (bnc#864633)
+
 -------------------------------------------------------------------
 Thu Jan 30 21:59:46 UTC 2014 - meissner@suse.com
 

tboot.spec

@@ -26,6 +26,7 @@ Group:          Productivity/Security
 Url:            http://sourceforge.net/projects/tboot/
 Source0:        http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz
 Patch0:         tboot-fix.patch
+Patch1:         tboot-grub2-suse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  openssl-devel
 BuildRequires:  trousers-devel
@@ -40,6 +41,7 @@ and verified launch of an OS kernel/VMM.
 %prep
 %setup -q -n %name-%ver
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"