Hello community,
here is the log from the commit of package tboot for openSUSE:Factory checked in at 2014-05-21 16:31:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tboot (Old)
and /work/SRC/openSUSE:Factory/.tboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tboot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tboot/tboot.changes 2014-05-02 14:03:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tboot.new/tboot.changes 2014-05-21 16:31:20.000000000 +0200
@@ -1,0 +2,42 @@
+Mon May 19 11:11:10 UTC 2014 - meissner@suse.com
+
+- updated to 1.8.1/20140516
+ Fix build error "may be used uninitialized"
+ Reset eventlog when S3
+ Update tboot version to 1.8.1 in grub title
+ Fix grub cfg file generation scripts for SLES12
+ Fix seal failure issue
+ tpm2 lcptools
+ Restore local apic base for AP
+ Fix typo in hash_alg_to_string()
+ Change to create primary object only once
+ Add prepare_tpm call in S3 path to ensure locality 0 was released before senter
+ Fix possible dead loop in print_bios_data when bios_data version 4
+ Fix possible null pointer dereference in loader.c
+ Fix possible null pointer dereference in tpm_12.c and tpm_20.c
+ Avoid buffer overrun when append tpm12 eventlog
+ Fix possible NULL pointer dereference
+ Fix one event log issue caused by wrong append and print operation
+ Fix error "unsupported hash alg" for agile extend policy
+ Fix warning "ACM info_table version mismatch"
+ Update the tpm family detection with a general way
+ Fix a lcp tools issue caused by redefining TB_HALG_SHA1 from 0 to 4
+ Assign g_tpm a value for no tpm case to avoid NULL checks
+ Fix crash when TPM is missing
+ Fix infinite loop in determine_multiboot_type()
+ Fix typo in tpm20_init() and remove unused variable
+ Allow the to-be-measured nv to be protected by AUTHWRITE
+ Check cpu vendor id to avoid unexpected behavior in non-intel cpu
+ Change to detect TPM family only once
+ Fix some typos caused by copy-paste
+
+- removed tboot-cs381.patch: upstream
+
+-------------------------------------------------------------------
+Fri May 16 06:10:17 UTC 2014 - mchang@suse.com
+
+- fix grub2 boot menu after installing lots of kernels (bnc#865815)
+- add tboot-grub2-fix-menu-in-xen-host-server.patch
+- add tboot-grub2-fix-xen-submenu-name.patch
+
+-------------------------------------------------------------------
Old:
----
tboot-1.8.0.tar.gz
tboot-cs381.patch
New:
----
tboot-1.8.1.tar.gz
tboot-grub2-fix-menu-in-xen-host-server.patch
tboot-grub2-fix-xen-submenu-name.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tboot.spec ++++++
--- /var/tmp/diff_new_pack.F0ZzxV/_old 2014-05-21 16:31:22.000000000 +0200
+++ /var/tmp/diff_new_pack.F0ZzxV/_new 2014-05-21 16:31:22.000000000 +0200
@@ -17,7 +17,7 @@
Name: tboot
-%define ver 1.8.0
+%define ver 1.8.1
Version: 20130705_1.8.0
Release: 0
Summary: Performs a verified launch using Intel(R) TXT
@@ -27,7 +27,8 @@
Source0: http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz
Patch0: tboot-fix.patch
Patch1: tboot-grub2-suse.patch
-Patch2: tboot-cs381.patch
+Patch3: tboot-grub2-fix-menu-in-xen-host-server.patch
+Patch4: tboot-grub2-fix-xen-submenu-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openssl-devel
BuildRequires: trousers-devel
@@ -43,7 +44,8 @@
%setup -q -n %name-%ver
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -72,6 +74,10 @@
%{_sbindir}/tpmnv_lock
%{_sbindir}/tpmnv_relindex
%{_sbindir}/txt-stat
+%{_sbindir}/lcp2_crtpol
+%{_sbindir}/lcp2_crtpolelt
+%{_sbindir}/lcp2_crtpollist
+%{_sbindir}/lcp2_mlehash
/boot/tboot.gz
/boot/tboot-syms
%{_mandir}/man8/*
++++++ tboot-1.8.0.tar.gz -> tboot-1.8.1.tar.gz ++++++
++++ 7573 lines of diff (skipped)
++++++ tboot-grub2-fix-menu-in-xen-host-server.patch ++++++
From: Michael Chang
Subject: [PATCH] fix menu in xen host server
References: bnc#771689, bnc#757895
Patch-Mainline: no
When system is configred as "Xen Virtual Machines Host Server", the
grub2 menu is not well organized. We could see some issues on it.
- Many duplicated xen entries generated by links to xen hypervisor
- Non bootable kernel entries trying to boot xen kernel natively
- The -dbg xen hypervisor takes precedence over release version
This patch fixes above three issues.
v2:
References: bnc#877040
Create only hypervisor pointed by /boot/xen.gz symlink to not clutter
the menu with multiple versions and also not include -dbg. Use custom.cfg
if you need any other custom entries.
v3:
References: bnc#865815
Porting to tboot in order to fix duplicated xen entries
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
@@ -166,6 +166,49 @@ while [ "x${tboot_list}" != "x" ] && [ "
break
fi
done
+
+ config=
+ for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+ if test -e "${i}" ; then
+ config="${i}"
+ break
+ fi
+ done
+
+ # try to get the kernel config if $linux is a symlink
+ if test -z "${config}" ; then
+ lnk_version=`basename \`readlink -f $linux\` | sed -e "s,^[^0-9]*-,,g"`
+ if (test -n ${lnk_version} && test -e "${dirname}/config-${lnk_version}") ; then
+ config="${dirname}/config-${lnk_version}"
+ fi
+ fi
+
+ # check if we are in xen domU
+ if [ ! -e /proc/xen/xsd_port -a -e /proc/xen ]; then
+ # we're running on xen domU guest
+ dmi=/sys/class/dmi/id
+ if [ -r "${dmi}/product_name" -a -r "${dmi}/sys_vendor" ]; then
+ product_name=`cat ${dmi}/product_name`
+ sys_vendor=`cat ${dmi}/sys_vendor`
+ if test "${sys_vendor}" = "Xen" -a "${product_name}" = "HVM domU"; then
+ # xen HVM guest
+ xen_pv_domU=false
+ fi
+ fi
+ else
+ # we're running on baremetal or xen dom0
+ xen_pv_domU=false
+ fi
+
+ if test "$xen_pv_domU" = "false" ; then
+ # prevent xen kernel without pv_opt support from booting
+ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && grep -qvx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then
+ echo "Skip xenlinux kernel $linux" >&2
+ list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+ continue
+ fi
+ fi
+
if test -n "${initrd}" ; then
echo "Found initrd image: ${dirname}/${initrd}" >&2
else
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
@@ -30,6 +30,12 @@ fi
export TEXTDOMAIN=grub
export TEXTDOMAINDIR=${prefix}/share/locale
+if [ ! -e /proc/xen/xsd_port -a -e /proc/xen ]; then
+# we're running on xen domU guest
+# prevent setting up nested virt on HVM or PV domU guest
+ exit 0
+fi
+
CLASS="--class gnu-linux --class gnu --class os --class xen"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
@@ -147,9 +153,17 @@ linux_list=`for i in /boot/vmlinu[xz]-*
if [ "x${linux_list}" = "x" ] ; then
exit 0
fi
-xen_list=`for i in /boot/xen*; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done`
+# bnc#877040 - Duplicate entries for boot menu created
+# only create /boot/xen.gz symlink boot entry
+if test -L /boot/xen.gz; then
+ xen_list=`readlink -f /boot/xen.gz`
+else
+ # bnc#757895 - Grub2 menu items incorrect when "Xen Virtual Machines Host Server" selected
+ # wildcard expasion with correct suffix (.gz) for not generating many duplicated menu entries
+ xen_list=`for i in /boot/xen*.gz; do
+ if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi
+ done`
+fi
tboot_list=`for i in /boot/tboot*.gz; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done`
++++++ tboot-grub2-fix-xen-submenu-name.patch ++++++
From: Michael Chang
Subject: fix xen submenu name to show tboot version
References: bnc#865815
Patch-Mainline: no
Index: tboot-1.8.1/tboot/20_linux_xen_tboot
===================================================================
--- tboot-1.8.1.orig/tboot/20_linux_xen_tboot
+++ tboot-1.8.1/tboot/20_linux_xen_tboot
@@ -187,7 +187,7 @@ while [ "x${xen_list}" != "x" ] ; do
rel_tboot_dirname=`make_system_path_relative_to_its_root $tboot_dirname`
tboot_version="1.8.1"
list="${linux_list}"
- echo "submenu \"Xen ${xen_version}\" \"Tboot ${tboot_version}\"{"
+ echo "submenu \"Xen ${xen_version} with Tboot ${tboot_version}\"{"
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
echo "Found linux image: $linux" >&2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org