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

update to 10.1.0 release and removal of KMP package

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

enable-gcc46+.patch

@@ -1,60 +0,0 @@
-When compiling under gcc4.6+, the following errors can be seen:
-
-[   93s] In file included from /usr/include/sigc++-2.0/sigc++/signal.h:8:0,
-[   93s]                  from /usr/include/sigc++-2.0/sigc++/connection.h:22,
-[   93s]                  from ../../../services/plugins/dndcp/dnd/copyPasteRpc.hh:28,
-[   93s]                  from dndGuest/copyPasteRpcV3.hh:29,
-[   93s]                  from dndGuest/copyPasteRpcV3.cc:26:
-[   93s] /usr/include/sigc++-2.0/sigc++/signal_base.h:46:11: error: 'size_t' does not name a type
-[   93s]    typedef size_t size_type;
-[   93s]            ^
-[   93s] /usr/include/sigc++-2.0/sigc++/signal_base.h:95:3: error: 'size_type' does not name a type
-[   93s]    size_type size() const;
-[   93s]    ^
-[   93s] /usr/include/sigc++-2.0/sigc++/signal_base.h:239:11: error: 'size_t' does not name a type
-[   93s]    typedef size_t size_type;
-[   93s]            ^
-[   93s] /usr/include/sigc++-2.0/sigc++/signal_base.h:261:3: error: 'size_type' does not name a type
-[   93s]    size_type size() const;
-
-As per https://gcc.gnu.org/gcc-4.6/porting_to.html, this is fixed through:
-
- #include <cstddef>
-
-
-Index: open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/copyPasteRpc.hh
-===================================================================
---- open-vm-tools-9.10.0-2476743.orig/services/plugins/dndcp/dnd/copyPasteRpc.hh
-+++ open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/copyPasteRpc.hh
-@@ -25,6 +25,7 @@
- #ifndef COPY_PASTE_RPC_HH
- #define COPY_PASTE_RPC_HH
- 
-+#include <cstddef>
- #include <sigc++/connection.h>
- #include "dndCPLibExport.hh"
- #include "rpcBase.h"
-Index: open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/dndRpc.hh
-===================================================================
---- open-vm-tools-9.10.0-2476743.orig/services/plugins/dndcp/dnd/dndRpc.hh
-+++ open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/dndRpc.hh
-@@ -25,6 +25,7 @@
- #ifndef DND_RPC_HH
- #define DND_RPC_HH
- 
-+#include <cstddef>
- #include <sigc++/connection.h>
- #include "dndCPLibExport.hh"
- #include "rpcBase.h"
-Index: open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/fileTransferRpc.hh
-===================================================================
---- open-vm-tools-9.10.0-2476743.orig/services/plugins/dndcp/dnd/fileTransferRpc.hh
-+++ open-vm-tools-9.10.0-2476743/services/plugins/dndcp/dnd/fileTransferRpc.hh
-@@ -25,6 +25,7 @@
- #ifndef FILE_TRANSFER_RPC_HH
- #define FILE_TRANSFER_RPC_HH
- 
-+#include <cstddef>
- #include <sigc++/connection.h>
- #include "dndCPLibExport.hh"
- #include "rpcBase.h"

no-unused-const.patch

@@ -1,14 +0,0 @@
-Index: open-vm-tools/configure.ac
-===================================================================
---- open-vm-tools.orig/configure.ac
-+++ open-vm-tools/configure.ac
-@@ -988,7 +988,8 @@ CFLAGS="$CFLAGS -Werror"
- # Glib2 keep changing mutex APIs so we also need to disable 'deprecated'
- # warnings for now (-Wno-deprecated-declarations).
- for TEST_CFLAG in -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing \
--    -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations; do
-+    -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations \
-+    -Wno-unused-const-variable; do
-     AC_MSG_CHECKING([for GCC flag $TEST_CFLAG])
-     ORIGINAL_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $TEST_CFLAG"

open-vm-tools-10.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9279f6036e0857f4524e66e5932d4b17549a2eba04fc87649787e55c25c09d37
+size 5022503

open-vm-tools-stable-10.0.7-gtk3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:820c9aa3cc1dc2c4f8ce16f2d641a408e018762c14b27219d384d98b8f3fdb78
-size 2907517

open-vm-tools.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Dec  1 22:50:34 UTC 2016 - ken@suse.com
+
+- Remove building KMP modules. No longer needed or wanted for
+  current releases. User space tool vmhgfs-fuse has replaced the
+  need for vmhgfs kernel module.
+
+-------------------------------------------------------------------
+Sat Nov 12 02:42:20 UTC 2016 - ken@suse.com
+
+- Updated to 10.1.0 stable release (boo#1011057)
+  + vmware-namespace-cmd command line utility.
+  + gtk3 support
+  + Common Agent Framework (CAF)
+  + guest authentication with xmlsec1
+  + FreeBSD support
+  + 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 CVE-2015-5191 (bsc#1007600)
+- Dropped upstream patches included (or not necessary) in 10.1.0:
+  + vmw-bitmask-gcc6.patch
+  + no-unused-const.patch
+  + enable-gcc46+.patch
+
+-------------------------------------------------------------------
+Wed Nov  2 12:52:03 CET 2016 - jcejka@suse.de
+
+- Add udev rule to increase VMware virtual disk timeout values
+  (bsc#994598) 
+  [99-vmware-scsi-udev.rules]
+
 -------------------------------------------------------------------
 Wed Jul 13 18:30:28 UTC 2016 - ken@suse.com
 

open-vm-tools.spec

@@ -17,8 +17,6 @@
 #
 
 
-%define KMP          0
-
 # systemd and deploypkg should be enabled by default on versions >= 13.1
 %if 0%{?suse_version} >= 1310
 %bcond_without systemd
@@ -28,7 +26,7 @@
 %bcond_with deploypkg
 %endif
 
-# vgauth is enabled for openSUSE Factory, Leap 42.1 and SLES12SP1 (which include xml-security-c and xerces-c)
+# vgauth is enabled for openSUSE Factory, Leap 42.1, SLES12SP1 and later releases (which include xml-security-c and xerces-c)
 %if 0%{?is_opensuse} && 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320
 %bcond_without vgauth
 %else
@@ -69,41 +67,19 @@
 # exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
 %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
 
-# Modules to be built up to openSUSE 12.3 (excluding SLES11), possibly not building on newer versions.
-%if 0%{?suse_version} <= 1230 && 0%{?suse_version} != 1110
-%define vm_modules1230 vmci vsock
-%endif
-
-%if 0%{?suse_version} <= 1220 && 0%{?suse_version} != 1110
-# Modules to be built up to openSUSE 12.1 (excluding SLES11), possibly not building on newer versions.
-%define vm_modules1220 vmsync
-%endif
-
-%if 0%{?suse_version} <= 1210 && 0%{?suse_version} != 1110
-# Modules to be built up to openSUSE 12.1 (excluding SLES11), possibly not building on newer versions.
-%define vm_modules1210 vmxnet
-%endif
-
-# Modules are only built for versions <= openSUSE 13.2
-# The vmhgfs module is currently built for all versions <= openSUSE 13.2
-# Beginning with the 4.0.0 kernel, the vmhgfs module is replaced by the user space vmhgfs-fuse client 
-%if 0%{?suse_version} <= 1320
-%define vm_modules vmhgfs %{?vm_modules1230} %{?vm_modules1210} %{?vm_modules1220}
-%endif
-
 # X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them.
 %define with_X 1
 
 Name:           open-vm-tools
 %define subname open-vm-tools
-%define tarname open-vm-tools-stable
+%define tarname open-vm-tools
-Version:        10.0.7
+Version:        10.1.0
 Release:        0
 Summary:        Open Virtual Machine Tools
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
 Group:          System/Emulators/PC
 Url:            https://github.com/vmware/open-vm-tools
-Source:         %{tarname}-%{version}-gtk3.tar.gz
+Source:         %{tarname}-%{version}.tar.gz
 Source1:        vmtoolsd
 Source2:        vmtoolsd.service
 Source3:        vmware-user-autostart.desktop
@@ -112,7 +88,6 @@ Source6:        open-vm-tools-modprobe.conf
 Source7:        tools.conf
 Source8:        vgauthd.service
 Source9:        vmblock-fuse.service
-Source98:       preamble
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 # don't use pkgconfig(gtk+-2.0) so we can build on SLE
@@ -123,12 +98,6 @@ BuildRequires:  gtkmm3-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtkmm2-devel
 %endif
-# Only require kernel packages if kernel modules are being built
-%if %{KMP}
-BuildRequires:  kernel-source
-BuildRequires:  kernel-syms
-BuildRequires:  module-init-tools
-%else
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  doxygen
@@ -152,16 +121,17 @@ BuildRequires:  procps-devel
 %endif
 # vmhgfs is always built so fuse is no longer optional
 BuildRequires:  fuse-devel
+BuildRequires:  udev
+%if 0%( pkg-config --exists 'udev > 190' && echo '1' ) == 01
+%define _udevrulesdir /usr/lib/udev/rules.d
+%else
+%define _udevrulesdir /lib/udev/rules.d
 %endif
 Requires:       net-tools
 Requires:       tar
 %if 0%{?suse_version} >= 1310
 Requires:       which
 %endif
-%if 0%{?suse_version} == 1110
-# the KMP package is currently only built for SLE11 inside the devel prj
-Requires:       vmware-guest-kmp
-%endif
 # To prevent autoinstallation on SLES11, exclude supplements from that version
 %if 0%{?suse_version} != 1110
 Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
@@ -169,13 +139,6 @@ Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
 ExclusiveArch:  %ix86 x86_64
-Patch0:         enable-gcc46+.patch
-Patch1:         vmw-bitmask-gcc6.patch
-Patch2:         no-unused-const.patch
-
-%if %{KMP}
-%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
-%endif
 
 %if %{with systemd}
 %systemd_requires
@@ -205,34 +168,6 @@ useful functions like:
 * General mechanisms and protocols for communication between host and
 guests and from guest to guest
 
-%package -n vmware-guest-KMP
-Summary:        Open Virtual Machine Tools - for VM GUESTS
-Group:          System/Emulators/PC
-
-%description -n vmware-guest-KMP
-Open Virtual Machine Tools (open-vm-tools) are the open source
-implementation of VMware Tools. They are a set of guest operating
-system virtualization components that enhance performance and user
-experience of virtual machines. As virtualization technology rapidly
-becomes mainstream, each virtualization solution provider implements
-their own set of tools and utilities to supplement the guest virtual
-machine. However, most of the implementations are proprietary and are
-tied to a specific virtualization platform.
-
-With the Open Virtual Machine Tools project, we are hoping to solve
-this and other related problems. The tools are currently composed of
-kernel modules for Linux and user-space programs for all VMware
-supported Unix-like guest operating systems. They provide several
-useful functions like:
-
-* File transfer between a host and guest
-
-* Improved memory management and network performance under
-   virtualization
-
-* General mechanisms and protocols for communication between host and
-guests and from guest to guest
-
 %if %{with_X}
 
 %package        desktop
@@ -268,15 +203,11 @@ Those are the development headers for libvmtools. They are needed
 if you intend to create own plugins for vmtoolsd.
 
 %prep
-%setup -q -n %{tarname}-%{version}-gtk3/%{subname}
+%setup -q -n %{tarname}-%{version}/%{subname}
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%if ! %{KMP}
 # disable warning unused-but-set-variable which will raise error because of -Werror
 # disable warning deprecated-declarations which will raise error because of -Werror
 # disable warning sizeof-pointer-memaccess which will raise error because of -Werror
@@ -320,53 +251,11 @@ chmod 755 configure
     --without-xmlsecurity \
     --without-xerces \
 %endif
+    --with-udev-rules-dir=%{_udevrulesdir} \
     --disable-static
 make
-%endif
-
-# If a KMP is not being built, flavors_to_build will be undefined and no modules should be built
-%if "%{?flavors_to_build}"
-TOPDIR=$PWD
-cd ..
-mkdir -p obj
-for flavor in %{flavors_to_build}; do
-  rm -rf obj/$flavor
-  cp -r $TOPDIR obj/$flavor
-  pushd obj/$flavor
-  for module in %{vm_modules}; do
-    pushd modules/linux/$module
-    if [ -f ../vmci/Module.symvers ]; then
-       cp ../vmci/Module.symvers .
-    fi
-    export CC_VER_OPTS="VM_CCVER=$(gcc -dumpversion)"
-    make -C /usr/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD $CC_VER_OPTS HEADER_DIR="/usr/src/linux-obj/$(uname -i)/default/include" SRCROOT=$PWD OVT_SOURCE_DIR=$TOPDIR
-    popd
-  done
-  popd
-done
-%endif
 
 %install
-# If a KMP is not being built, flavors_to_build will be undefined and no modules can be installed
-%if "%{?flavors_to_build}"
-# let's use the kernel's own modules_install routine
-export INSTALL_MOD_PATH=%{buildroot}
-export INSTALL_MOD_DIR=updates
-pushd ..
-for flavor in %{flavors_to_build}; do
-  pushd obj/$flavor
-  for module in %{vm_modules}; do
-    make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/modules/linux/$module
-  done
-  popd
-done
-popd
-
-# fix some rights on the kernel modules, to have a complete -debuginfo package; do not fail if there are no modules left.
-chmod u+x %{buildroot}/lib/modules/*/updates/* || :
-%endif
-
-%if ! %{KMP}
 %if 0%{?suse_version} > 1110
 %make_install
 %else
@@ -436,8 +325,6 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
 # fix a link pointing to the buildroot for mount.vmhgfs
 ( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
 
-%endif
-
 %pre
 %if %{with systemd}
 %service_add_pre vmtoolsd.service
@@ -535,7 +422,6 @@ fi
 %clean
 rm -rf %{buildroot}
 
-%if ! %{KMP}
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -570,6 +456,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/vmware-tools/scripts/vmware/network
 %{_sysconfdir}/vmware-tools/statechange.subr
 %{_sysconfdir}/vmware-tools/suspend-vm-default
+%{_udevrulesdir}/99-vmware-scsi-udev.rules
 %config(noreplace) %{_sysconfdir}/vmware-tools/tools.conf
 %if 0%{?suse_version} < 1315
 %dir %{_sysconfdir}/modprobe.d
@@ -640,6 +527,5 @@ rm -rf %{buildroot}
 %{_includedir}/libDeployPkg
 %{_libdir}/pkgconfig/libDeployPkg.pc
 %endif
-%endif
 
 %changelog

pre_checkin.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-#NAME=open-vm-tools
-#NAMEKMP=open-vm-tools-KMP
-
-#sed "s:%define.*KMP.*0:%define KMP 1:" ${NAME}.spec > ${NAMEKMP}.spec
-#sed -i "s/\(Name:.*\)${NAME}/\1${NAMEKMP}/" ${NAMEKMP}.spec
-
-#cp ${NAME}.changes ${NAMEKMP}.changes

preamble

@@ -1,7 +0,0 @@
-Enhances: kernel-%1
-Requires: kernel-%1
-Recommends: open-vm-tools
-Obsoletes: vmware-kmp < %(echo %{-v*}-%2 | tr - _)
-Obsoletes: vmware-kmp-%1 < %(echo %{-v*}-%2 | tr - _)
-Provides: vmware-kmp = %(echo %{-v*}-%2 | tr - _)
-Provides: vmware-kmp-%1 = %(echo %{-v*}-%2 | tr - _)

vmw-bitmask-gcc6.patch

@@ -1,17 +0,0 @@
-Index: open-vm-tools/lib/include/x86cpuid.h
-===================================================================
---- open-vm-tools.orig/lib/include/x86cpuid.h
-+++ open-vm-tools/lib/include/x86cpuid.h
-@@ -905,11 +905,8 @@ FIELD(81E,  0, ECX,  8,  3, NODES_PER_PK
-  *
-  * e.g. - CPUID_VIRT_BITS_MASK  = 0xff00
-  *      - CPUID_VIRT_BITS_SHIFT = 8
-- *
-- * Note: The MASK definitions must use some gymnastics to get
-- * around a warning when shifting left by 32.
-  */
--#define VMW_BIT_MASK(shift)  (((1 << (shift - 1)) << 1) - 1)
-+#define VMW_BIT_MASK(shift)  (0xffffffffu >> (32 - shift))
- 
- #define FIELD(lvl, ecxIn, reg, bitpos, size, name, s, c3)      \
-    CPUID_##name##_SHIFT        = bitpos,                       \