Accepting request 53968 from home:dimstar:branches:Virtualization:VMware

Forwarding to openSUSE:Factory

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

open-vm-tools-2010.03.20-243334.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ba955114612cc25a8e9a5abf570e598368275c1477b364468eb9fa6f913b3d4
-size 2412383

open-vm-tools-2010.11.17-327185.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78f4b12e7943ac2be4cbca2bf99d6b2f8c69337e8a74eeccf36a2ee36e7d63e3
+size 2502230

open-vm-tools-libpng14.patch

@@ -1,22 +0,0 @@
-Index: open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c
-===================================================================
---- open-vm-tools-2010.03.20-243334.orig/lib/image/imageUtilPng.c
-+++ open-vm-tools-2010.03.20-243334/lib/image/imageUtilPng.c
-@@ -136,7 +136,7 @@ ImageUtil_ReadPNGBuffer(ImageInfo *image
-       goto exit;
-    }
- 
--   if (setjmp(png_ptr->jmpbuf)) {
-+   if (setjmp(png_jmpbuf(png_ptr))) {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       goto exit;
-    }
-@@ -350,7 +350,7 @@ ImageUtil_ConstructPNGBuffer(const Image
-       goto error;
-    }
- 
--   if (setjmp(png_ptr->jmpbuf)) {
-+   if (setjmp(png_jmpbuf(png_ptr))) {
-       png_destroy_write_struct(&png_ptr, &info_ptr);
-       goto error;
-    }

open-vm-tools.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Mon Nov 22 11:51:35 UTC 2010 - dimstar@opensuse.org
+
+- Update to version 2010-11-17:
+  + Mostly cleanups and bug fixes.
+  + vmxnet3 on Solaris now supports jumbo frames.
+- For all older updates, please see NEWS.
+- Add an easy way to enable/disable X tools. Those currently fail
+  to build.
+
+-------------------------------------------------------------------
+Mon Jun  7 08:48:19 UTC 2010 - dimstar@opensuse.org
+
+- Add vmmemctl.tar.bz2, extracted from open-vm-tools 2010.02.23.
+
+-------------------------------------------------------------------
+Mon May 31 08:37:32 UTC 2010 - dimstar@opensuse.org
+
+- Better logic to easily disable modules that got inlcluded in the
+  Linux Kernel, for bnc#605085.
+
+-------------------------------------------------------------------
+Thu Apr 22 11:25:39 CEST 2010 - dimstar@opensuse.org
+
+- Re-introduce vmxnet3 on openSUSE <= 11.2. Up to then we have
+  kernel 2.26.31, which does not bring the vmxnet3 driver yet.
+  The driver itself is the last one shipped with open-vm-tools,
+  version 2009.12.16.
+
+-------------------------------------------------------------------
+Wed Apr 21 10:36:21 CEST 2010 - dimstar@opensuse.org
+
+- Send SIGUSR1 to vmware-user process when the services are being
+  stopped. This possibly solves bnc#544400.
+
 -------------------------------------------------------------------
 Wed Apr  7 10:44:31 UTC 2010 - dimstar@opensuse.org
 

open-vm-tools.spec

@@ -2,6 +2,7 @@
 # spec file for package open-vm-tools (Version 2010.03.20)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +21,24 @@
 # 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 that have to be build up to version 11.3
+%if 0%{suse_version} <= 1140
+%define mod1140 vmblock vmhgfs vmsync vmxnet vmci vsock
+%endif
+# Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is extended by this.
+%if 0%{suse_version} <= 1120
+%define mod1120 pvscsi vmmemctl vmxnet3
+%endif
+
+# X modules are failing all the time the build currently. We need an easy way to enable/disable them.
+%define with_X 0
+
 Name:           open-vm-tools
 Group:          System/Emulators/PC
 Summary:        Open Virtual Machine Tools
-Version:        2010.03.20
+Version:        2010.11.17
-Release:        2
+Release:        1
-%define         svn_rev 243334
+%define         svn_rev 327185
 Url:            http://open-vm-tools.sourceforge.net/
 License:        BSD3c ; GPLv2 ; LGPLv2.1
 Source:         %{name}-%{version}-%{svn_rev}.tar.bz2
@@ -35,9 +48,13 @@ Source3:        vmware-toolbox.desktop
 Source4:        open-vm-tools.permissions
 Source5:        vmware-user-autostart-wrapper
 Source6:        open-vm-tools-modprobe.conf
+# VMXNET3 driver is extracted from open-vm-tools 2009.12,16 last one that carried it.
+# We keep it in for compatibility of older openSUSE Releases that have a kernel < 2.26.32. From then on, 
+# vmxnet3 is part of the kernel.
+Source7:        vmxnet3.tar.bz2
+# vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23
+Source8:        vmmemctl.tar.bz2
 Source98:       preamble
-# PATCH-FIX-UPSTREAM open-vm-tools-libpng14.patch sf#2983141 dimstar@opensuse.org -- Fix build with libpng 1.4
-Patch0:         open-vm-tools-libpng14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  kernel-source
@@ -61,7 +78,8 @@ PreReq:         permissions
 ExclusiveArch:  %ix86 x86_64
 Requires:       vmware-guest-kmp
 Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
-%define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi
+
+%define vm_modules %{?mod1140} %{?mod1130} %{?mod1120} 
 
 %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
 
@@ -118,6 +136,7 @@ useful functions like:
 * General mechanisms and protocols for communication between host and
 guests and from guest to guest
 
+%if %with_X
 %package gui
 License:        BSD3c ; GPLv2 ; LGPLv2.1
 Summary:        Open Virtual Machine Tools - GUI
@@ -127,6 +146,7 @@ Supplements:    packageand(open-vm-tools:xorg-x11)
 
 %description gui
 GUI Toolbox for Open Virtual Machine Tools
+%endif
 
 %package -n libvmtools0
 License:        BSD3c ; GPLv2 ; LGPLv2.1
@@ -149,12 +169,18 @@ if you intend to create own plugins for vmtoolsd.
 
 %prep
 %setup -q -n %{name}-%{version}-%{svn_rev}
-%patch0 -p1
+pushd modules/linux
+tar xvf %{S:7}
+tar xvf %{S:8}
+popd
 chmod -x AUTHORS COPYING ChangeLog NEWS README
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
 
 %build
+# Bool is not char, but bool...
+#sed -i "s/typedef.*char.*Bool/typedef int Bool/" lib/include/vm_basic_types.h
+
 # comments in a continued line seem not to work... shame
 # --disable-unity : liburiparser was not present before 11.0
 %configure \
@@ -164,6 +190,11 @@ sed -i -e "s/\r//" README
     --without-kernel-modules \
     --without-root-privileges \
     --without-procps \
+%if %with_X
+    --with-x \
+%else
+    --without-x \
+%endif
     --disable-dependency-tracking \
     --disable-static
 make
@@ -203,43 +234,48 @@ chmod u+x $RPM_BUILD_ROOT/lib/modules/*/updates/*
 %makeinstall
 # Clean up the *.la files make install put all around
 find %{buildroot} -name '*.la' -delete -print
-rm %{buildroot}%{_datadir}/applications/vmware-user.desktop
 
 # install the vmtoolsd init script and also it's rcvmtoolsd softlink
 install -D -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vmtoolsd
 ln -sf ../../etc/init.d/vmtoolsd $RPM_BUILD_ROOT%{_sbindir}/rcvmtoolsd
 
+%if %with_X
 # vmware-user is started by vmware-user-suid-wrapper by xdg-autostart
 # unfortunately, vmware-user-suid-wrapper does not wait for it's block device
 # to appear. For this reason we have now a vmware-user-autostart-wrapper
 # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper
 install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper
 install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
-install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf
 
 # handle the .destop files for translations
 %suse_update_desktop_file vmware-user-autostart
+%endif
+
+# modprobe configuration for vmnics.
+install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf
 
 # fix a link pointing to the buildroot for mount.vmhgfs
 ( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
 
 # the script installs some binaries into /usr/share/open-vm-tools which are just some tests.
 # So we drop them for the moment. Upstream has been informed about this.
-rm -rf %{buildroot}%{_datadir}/%{name}
+rm -r %{buildroot}%{_datadir}/%{name}
 
 %post
 %run_permissions
 /sbin/ldconfig
 %{fillup_and_insserv -Y vmtoolsd}
 
+%if %with_X
 %verifyscript gui
 %verify_permissions
 
 %post gui
 %run_permissions
+%endif
 
 %preun
-# stop service with the old name (if exists) on update (something like %stop_on_update)
+# stop service with the old name (if exists) on update (something like %%stop_on_update)
 test -n "$FIRST_ARG" || FIRST_ARG=$1
 if test "$FIRST_ARG" -ge 1 ; then
     test -f /etc/sysconfig/services && . /etc/sysconfig/services
@@ -269,7 +305,9 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/common
 %dir %{_libdir}/%{name}/plugins/vmsvc
+%if %with_X
 %dir %{_libdir}/%{name}/plugins/vmusr
+%endif
 %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
 %{_libdir}/%{name}/plugins/vmsvc/libpowerOps.so
 %{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so
@@ -290,20 +328,23 @@ rm -rf %{buildroot}
 %{_sbindir}/rcvmtoolsd
 %exclude %{_libdir}/*.so
 
+%if %with_X
 %files gui
 %defattr(-, root, root)
 %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
 %{_bindir}/vmware-toolbox
 %{_bindir}/vmware-user
 %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper
-%{_bindir}/vmware-user-autostart-wrapper
 %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so
 %{_libdir}/%{name}/plugins/vmusr/libvixUser.so
+%{_bindir}/vmware-user-autostart-wrapper
+%endif
 
 %files -n libvmtools0
 %defattr(-, root, root)
 %{_libdir}/libvmtools.so.*
 %{_libdir}/libguestlib.so.*
+%{_libdir}/libhgfs.so.*
 
 %files -n libvmtools-devel
 %defattr(-,root,root)

vmmemctl.tar.bz2

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

vmtoolsd

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #     Template SUSE system startup script for vmware-guest service/daemon
-#     Copyright (C) 2008  Dominique Leuenberger for openSUSE
+#     Copyright (C) 2008-2010  Dominique Leuenberger for openSUSE
 #
 #     This library is free software; you can redistribute it and/or modify it
 #     under the terms of the GNU Lesser General Public License as published by
@@ -35,6 +35,7 @@
 # Check for missing binaries (stale symlinks should not happen)
 # Note: Special treatment of stop for LSB conformance
 VMTOOLSD_BIN=/usr/bin/vmtoolsd
+VMTOOLSUSER_BIN=/usr/bin/vmware-user
 test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed"; 
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
@@ -82,6 +83,10 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## killproc sets the return value according to LSB.
 
+	# We need to inform the User process that we're going down.
+	# Otherwise it keeps references on /proc/fs/vmblock/* and 
+	# causes issues when reloading vmblock module.
+	/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
 	/sbin/killproc -TERM $VMTOOLSD_BIN
 	umount /proc/fs/vmblock/mountPoint || :
 	modprobe -r vmblock || :

vmxnet3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8009d53dde71c4f99f4b1c61194682c97069506cf637beb743c670e97d18a979
+size 39147