Hello community,
here is the log from the commit of package open-vm-tools for openSUSE:Factory
checked in at Fri Apr 29 12:44:44 CEST 2011.
--------
--- open-vm-tools/open-vm-tools.changes 2010-12-22 10:27:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes
2011-04-27 10:59:20.000000000 +0200
@@ -1,0 +2,43 @@
+Wed Apr 27 08:58:46 UTC 2011 - dims...@opensuse.org
+
+- Extend the init script to detect the name of the balloon driver,
+ which changed several times in the kernel.
+
+-------------------------------------------------------------------
+Thu Apr 14 19:35:44 UTC 2011 - dims...@opensuse.org
+
+- Update to 2011.03.28:
+ + HGFS mounter and vmusr's suid wrapper were changed to avoid
+ issues with symlink attacks. A new mount utility for vmblock on
+ Solaris and FreeBSD was added.
+ + The VMCI driver was thoroughly reworked so that it can serve as
+ both the host and guest VMCI driver. This is mostly targeted at
+ supporting nested VMs.
+ + vmusr got better integration with X's session manager,
+ including proper cleanup during session teardown.
+ + Unity has been enhanced to better handle some desktop
+ environments.
+ + Many small bug fixes in other areas, including updates for
+ newer Linux kernels.
+- Changes from 2011.02.23:
+ + Some copy & paste issues with KDE were fixed.
+ + Mostly cleanups and bug fixes, with a few build enhancements.
+- Changes from 2011.01.24:
+ + Mostly cleanups and bug fixes.
+ + Install code fixed to handle translation catalogs correctly.
+- No longer care for missing modules on openSUSE 11.2. It is EOL in
+ a few weeks. As a consequence, remove the sources (they are in
+ current kernels):
+ + pvscsi.tar.bz2
+ + vmxnet3.tar.bz2
+ + vmemctl.tar.bz2
+- Fix some lint warnings: obsolete only <, not <=, Add PreReq:
+ permissions to the -gui package.
+
+-------------------------------------------------------------------
+Thu Apr 14 16:30:29 UTC 2011 - dims...@opensuse.org
+
+- Fix build with Factory: verify the list of modules that are not
+ yet merged into the main kernel.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
open-vm-tools-2010.12.19-339835.tar.bz2
pvscsi.tar.bz2
vmmemctl.tar.bz2
vmxnet3.tar.bz2
New:
----
open-vm-tools-2011.03.28-387002.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-vm-tools.spec ++++++
--- /var/tmp/diff_new_pack.XQFOrz/_old 2011-04-29 12:40:50.000000000 +0200
+++ /var/tmp/diff_new_pack.XQFOrz/_new 2011-04-29 12:40:50.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package open-vm-tools (Version 2010.12.19)
+# spec file for package open-vm-tools
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
#
# All modifications and additions to the file contributed by third parties
@@ -21,24 +21,20 @@
# 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
+# Modules that have to be build up to version 12.1 (Last checked on 2011-04-14
with kernel 2.6.38)
+%if 0%{suse_version} <= 1210
+%define mod1210 vmblock vmhgfs vmsync vmxnet vmci vsock
%endif
-# X modules are failing all the time the build currently. We need an easy way
to enable/disable them.
+# 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
Group: System/Emulators/PC
Summary: Open Virtual Machine Tools
-Version: 2010.12.19
+Version: 2011.03.28
Release: 1
-%define svn_rev 339835
+%define svn_rev 387002
Url: http://open-vm-tools.sourceforge.net/
License: BSD3c ; GPLv2 ; LGPLv2.1
Source: %{name}-%{version}-%{svn_rev}.tar.bz2
@@ -48,14 +44,6 @@
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
-# pvscsi, extracted from open-vm-tools 2010.03.18
-Source9: pvscsi.tar.bz2
Source98: preamble
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
@@ -81,7 +69,7 @@
Requires: vmware-guest-kmp
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
-%define vm_modules %{?mod1140} %{?mod1130} %{?mod1120}
+%define vm_modules %{?mod1210} %{?mod1120}
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
@@ -146,6 +134,7 @@
Group: System/Emulators/PC
Requires: open-vm-tools
Supplements: packageand(open-vm-tools:xorg-x11)
+PreReq: permissions
%description gui
GUI Toolbox for Open Virtual Machine Tools
@@ -172,19 +161,11 @@
%prep
%setup -q -n %{name}-%{version}-%{svn_rev}
-pushd modules/linux
-tar xvf %{S:7}
-tar xvf %{S:8}
-tar xvf %{S:9}
-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 \
@@ -348,7 +329,6 @@
%if 0%{?suse_version} >= 1140
%{_libdir}/%{name}/plugins/vmusr/libunity.so
%endif
-%{_libdir}/%{name}/plugins/vmusr/libvixUser.so
%{_bindir}/vmware-user-autostart-wrapper
%endif
++++++ open-vm-tools-2010.12.19-339835.tar.bz2 ->
open-vm-tools-2011.03.28-387002.tar.bz2 ++++++
++++ 60187 lines of diff (skipped)
++++++ preamble ++++++
--- /var/tmp/diff_new_pack.XQFOrz/_old 2011-04-29 12:40:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XQFOrz/_new 2011-04-29 12:40:51.000000000 +0200
@@ -1,7 +1,7 @@
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 - _)
+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 - _)
++++++ vmtoolsd ++++++
--- /var/tmp/diff_new_pack.XQFOrz/_old 2011-04-29 12:40:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XQFOrz/_new 2011-04-29 12:40:51.000000000 +0200
@@ -40,6 +40,21 @@
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
+# The kernel module for the balloon driver changes its name in different
kernel versions
+KERNEL_MICRO=$(uname -r | awk -F- '{print $1}' | sed 's,2.6.,,')
+case $KERNEL_MICRO in
+ 36)
+ VMBALLOON=vmmemctl
+ ;;
+ 37)
+ VMBALLOON=vmware_balloon
+ ;;
+ *)
+ VMBALLOON=vmw_balloon
+ ;;
+esac
+
+
. /etc/rc.status
# Reset status of this service
@@ -69,7 +84,7 @@
fi
modprobe vmblock
mount -t vmblock none /proc/fs/vmblock/mountPoint
- modprobe vmmemctl
+ modprobe $VMBALLOON
modprobe vmsync
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
@@ -91,7 +106,7 @@
umount /proc/fs/vmblock/mountPoint || :
modprobe -r vmblock || :
modprobe -r vmsync || :
- modprobe -r vmmemctl || :
+ modprobe -r $VMBALLOON || :
# Remember status and be verbose
rc_status -v
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
