Accepting request 455366 from home:kenljohnson:branches:Virtualization:VMware

OBS-URL: https://build.opensuse.org/request/show/455366
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=340

Report-SLES12-SAP-guest-OS-as-SLES12.patch

@@ -0,0 +1,37 @@
+From: Sebastian Parschauer <sparschauer@suse.de>
+Date: Wed, 14 Dec 2016 14:28:42 +0100
+Subject: Report SLES12-SAP guest OS as SLES12
+References: bsc#1013496
+Patch-mainline: Submitted, 2016-12-14 16:29 UTC+1 as GitHub PR 123
+Git-commit: 35668574ecd785834b3de85d9b5f1c5999fbdba9
+Git-repo: https://github.com/sriemer/open-vm-tools
+
+On SLES12-SP1-SAP the "lsb_release -sd" command returns the string
+"SUSE Linux Enterprise Server for SAP Applications 12 SP1".
+Parsing in HostinfoGetOSShortName() detects the sub-strings "suse"
+and "enterprise" but not "server 12". STR_OS_SLES is returned
+resulting in displaying of "SUSE Linux Enterprise 8/9" in the
+summary screen of the vSphere client. This is wrong.
+
+So search for the sub-string "server for sap applications 12" and
+return STR_OS_SLES_12 there. SLES11-SAP is not affected.
+
+Signed-off-by: Sebastian Parschauer <sparschauer@suse.de>
+---
+ open-vm-tools/lib/misc/hostinfoPosix.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+index 0f55070..59f40f7 100644
+--- a/open-vm-tools/lib/misc/hostinfoPosix.c
++++ b/open-vm-tools/lib/misc/hostinfoPosix.c
+@@ -534,6 +534,7 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
+    } else if (strstr(distroLower, "suse")) {
+       if (strstr(distroLower, "enterprise")) {
+          if (strstr(distroLower, "server 12") ||
++             strstr(distroLower, "server for sap applications 12") ||
+              strstr(distroLower, "desktop 12")) {
+             Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
+          } else if (strstr(distroLower, "server 11") ||
+
+

open-vm-tools.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb  7 21:40:39 UTC 2017 - ken@suse.com
+
+- Sumbitting update for SLE11SP4, SLE12SP1, SLE12SP2
+  see fate#322214 & fate#322218
+
+-------------------------------------------------------------------
+Wed Dec 14 14:57:52 CET 2016 - sparschauer@suse.de
+
+- Report SLES12-SAP guest OS as SLES12 (bsc#1013496)
+  + Report-SLES12-SAP-guest-OS-as-SLES12.patch
+
 -------------------------------------------------------------------
 Thu Dec  1 22:50:34 UTC 2016 - ken@suse.com
 
@@ -17,7 +29,8 @@ Sat Nov 12 02:42:20 UTC 2016 - ken@suse.com
   + sub-command to push updated network information to the host on demand
   + udev rules for configuring SCSI timeouts in the guest
   + fixes for Ubuntu 16.10
-  + Fix for quiesced snapshot failure leaving guest file system quiesced
+  + Fix for quiesced snapshot failure leaving guest file system
+    quiesced (bsc#1006796)
   + Fix for CVE-2015-5191 (bsc#1007600)
 - Dropped upstream patches included (or not necessary) in 10.1.0:
   + vmw-bitmask-gcc6.patch

open-vm-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package open-vm-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@@ -139,6 +139,7 @@ Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
 ExclusiveArch:  %ix86 x86_64
+Patch0:         Report-SLES12-SAP-guest-OS-as-SLES12.patch
 
 %if %{with systemd}
 %systemd_requires
@@ -206,6 +207,7 @@ if you intend to create own plugins for vmtoolsd.
 %setup -q -n %{tarname}-%{version}/%{subname}
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
+%patch0 -p2
 
 %build
 # disable warning unused-but-set-variable which will raise error because of -Werror