diff --git a/_service b/_service deleted file mode 100644 index a49d96f..0000000 --- a/_service +++ /dev/null @@ -1,11 +0,0 @@ - - - http - sourceforge.net - /projects/open-vm-tools/files/open-vm-tools/2011.05.27/open-vm-tools-2011.05.27-420096.tar.gz - - - _service:download_url:*.tar.gz - bz2 - - diff --git a/_service:recompress:download_url:open-vm-tools-2011.05.27-420096.tar.bz2 b/_service:recompress:download_url:open-vm-tools-2011.05.27-420096.tar.bz2 deleted file mode 100644 index 025d9d1..0000000 --- a/_service:recompress:download_url:open-vm-tools-2011.05.27-420096.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6193066db69ca58fae7910d335910d248b06f5be1e09c511ecd591b304e85765 -size 2562768 diff --git a/open-vm-tools-8.8.0-471268.tar.gz b/open-vm-tools-8.8.0-471268.tar.gz new file mode 100644 index 0000000..a0f43ff --- /dev/null +++ b/open-vm-tools-8.8.0-471268.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:642cf860c9910cd64424a588f8ac4ad500af358e5ca992862bfbd667224ff79c +size 3760851 diff --git a/open-vm-tools-vmxnet+kernel-3.0.patch b/open-vm-tools-vmxnet+kernel-3.0.patch new file mode 100644 index 0000000..94f50e8 --- /dev/null +++ b/open-vm-tools-vmxnet+kernel-3.0.patch @@ -0,0 +1,46 @@ +Index: modules/linux/shared/compat_netdevice.h +=================================================================== +--- modules/linux/shared/compat_netdevice.h.orig ++++ modules/linux/shared/compat_netdevice.h +@@ -182,7 +182,7 @@ compat_alloc_netdev(int priv_size, + * All compat_* business is good but when we can we should just provide + * missing implementation to ease upstreaming task. + */ +-#ifndef HAVE_ALLOC_NETDEV ++#if !defined(HAVE_ALLOC_NETDEV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + #define alloc_netdev(sz, name, setup) compat_alloc_netdev(sz, name, setup) + #define alloc_etherdev(sz) compat_alloc_etherdev(sz) + #endif +@@ -191,7 +191,7 @@ compat_alloc_netdev(int priv_size, + #define free_netdev(dev) kfree(dev) + #endif + +-#ifndef HAVE_NETDEV_PRIV ++#if !defined(HAVE_NETDEV_PRIV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + #define netdev_priv(dev) ((dev)->priv) + #endif + +@@ -203,7 +203,7 @@ compat_alloc_netdev(int priv_size, + # define COMPAT_NETDEV_TX_BUSY 1 + #endif + +-#ifndef HAVE_NETIF_QUEUE ++#if !defined(HAVE_NETIF_QUEUE) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + static inline void + netif_start_queue(struct device *dev) + { +Index: modules/linux/vmxnet/vmxnet.c +=================================================================== +--- modules/linux/vmxnet/vmxnet.c.orig ++++ modules/linux/vmxnet/vmxnet.c +@@ -64,6 +64,10 @@ static int vmxnet_debug = 1; + #define VMW_HAVE_POLL_CONTROLLER + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) ++#define HAVE_NET_DEVICE_OPS ++#endif ++ + static int vmxnet_open(struct net_device *dev); + static int vmxnet_start_tx(struct sk_buff *skb, struct net_device *dev); + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 5d57943..f417c46 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Sep 21 20:34:59 UTC 2011 - dimstar@opensuse.org + +- Update to version 8.8.0 (Stable series): + + This release of open-vm-tools matches the VMware Tools package + released with Workstation 8.0 and Fusion 4.0. + It's targeted at desktop users who want the latest features in + (VMware's) Unity, HGFS and drag & drop support. +- Add open-vm-tools-vmxnet+kernel-3.0.patch: HAVE_NETDEV_PRIV is + gone in kernel 3.0 and netdev_priv is in kernel since 2.6.6. +- use set_permissions instead of run_permissions on 11.4+ + +------------------------------------------------------------------- +Thu Jul 21 00:36:27 UTC 2011 - dimstar@opensuse.org + +- Update to version 2011.07.19: + + Fix an issue in the HGFS driver that could lead to a kernel + panic. + + Update some code to support new compiler and kernel versions. + + Minor bug fixes and code cleanup. +- Changes from version 2011.06.27: + + A few enhancements to Unity: XFCE support, better interaction + with "the other" (Ubuntu's) Unity and compositing window + managers, better X error handling, and a few bug fixes. + + few bug fixes in HGFS, and minor bug fixes in other components. + + Otherwise, mostly code cleanup. + ------------------------------------------------------------------- Thu Jun 2 13:13:04 UTC 2011 - prusnak@opensuse.org diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 8ae086a..b6c0e02 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -2,7 +2,7 @@ # spec file for package open-vm-tools # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands. +# 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,27 +20,29 @@ # 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 12.1 (Last checked on 2011-04-14 with kernel 2.6.38) +# Modules that have to be build up to version 12.1 (Last checked on 2011-09-21 with kernel 3.1-rc6) %define vm_modules vmblock vmhgfs vmsync vmxnet vmci vsock # 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 -Version: 2011.05.27 +Version: 8.8.0 Release: 1 -%define svn_rev 420096 +%define svn_rev 471268 License: BSD3c ; GPLv2 ; LGPLv2.1 Summary: Open Virtual Machine Tools Url: http://open-vm-tools.sourceforge.net/ Group: System/Emulators/PC -Source: %{name}-%{version}-%{svn_rev}.tar.bz2 +Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-8.8.x/%{name}-%{version}-%{svn_rev}.tar.gz Source1: vmtoolsd Source2: vmware-user-autostart.desktop Source4: open-vm-tools.permissions Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf Source98: preamble +# PATCH-FIX-UPSTREAM open-vm-tools-vmxnet+kernel-3.0.patch idoenmez@suse.de -- Fix compilation with kernel 3.0 +Patch0: open-vm-tools-vmxnet+kernel-3.0.patch BuildRequires: gcc-c++ # don't use pkgconfig(gtk+-2.0) so we can build on SLE BuildRequires: gtk2-devel @@ -157,6 +159,7 @@ if you intend to create own plugins for vmtoolsd. %prep %setup -q -n %{name}-%{version}-%{svn_rev} +%patch0 -p0 chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README @@ -229,6 +232,10 @@ ln -sf ../../etc/init.d/vmtoolsd %{buildroot}%{_sbindir}/rcvmtoolsd # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper install -D -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop + +# In case we install vmware-user-suid-wrapper, we need to give it 4755 permissions. +#install -D -m 0644 %{S:4} %{buildroot}%{_sysconfdir}/permissions.d/open-vm-tools + # We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode... # Thus we drop the 'original' autostartup rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop @@ -248,16 +255,26 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co rm -r %{buildroot}%{_datadir}/%{name} %post +%if 0%{?suse_version} <= 1130 %run_permissions +%else +%set_permissions /usr/bin/vmware-user-suid-wrapper +%endif /sbin/ldconfig %{fillup_and_insserv -Y vmtoolsd} %if %{with_X} + %verifyscript gui -%verify_permissions +%verify_permissions -e /usr/bin/vmware-user-suid-wrapper %post gui +%if 0%{?suse_version} <= 1130 %run_permissions +%else +%set_permissions /usr/bin/vmware-user-suid-wrapper +%endif + %endif %preun @@ -318,7 +335,9 @@ rm -rf %{buildroot} %files gui %defattr(-, root, root) +%{_bindir}/vmware-toolbox %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop +#%{_sysconfdir}/permissions.d/open-vm-tools %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so %{_libdir}/%{name}/plugins/vmusr/libdndcp.so @@ -326,6 +345,7 @@ rm -rf %{buildroot} %if 0%{?suse_version} >= 1140 %{_libdir}/%{name}/plugins/vmusr/libunity.so %endif +%{_libdir}/%{name}/plugins/vmusr/libvixUser.so %{_bindir}/vmware-user-autostart-wrapper %endif