diff --git a/_service b/_service
index 7ea108b..a49d96f 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
http
sourceforge.net
- /projects/open-vm-tools/files/open-vm-tools/2011.04.25/open-vm-tools-2011.04.25-402641.tar.gz
+ /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
diff --git a/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2 b/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2
deleted file mode 100644
index dfa4204..0000000
--- a/_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6724632168332df1816f0d7e1b1c1d1523e4a4ddbe4b75173dc6c71ea90a98b9
-size 2577538
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
new file mode 100644
index 0000000..025d9d1
--- /dev/null
+++ b/_service:recompress:download_url:open-vm-tools-2011.05.27-420096.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6193066db69ca58fae7910d335910d248b06f5be1e09c511ecd591b304e85765
+size 2562768
diff --git a/open-vm-tools-modprobe.conf b/open-vm-tools-modprobe.conf
index a924f6f..7f75b62 100644
--- a/open-vm-tools-modprobe.conf
+++ b/open-vm-tools-modprobe.conf
@@ -1,2 +1 @@
install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS; /bin/true;
-
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 401e43c..5d57943 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Jun 2 13:13:04 UTC 2011 - prusnak@opensuse.org
+
+- updated to 2011.05.27:
+ + Mostly cleanups and a few bug fixes.
+- fixes [bnc#673267] [bnc#690491]
+
+-------------------------------------------------------------------
+Tue May 31 09:56:55 UTC 2011 - prusnak@opensuse.org
+
+- use -Wno-unused-but-set in optflags so it will not fail build
+ while using -Werror
+
+-------------------------------------------------------------------
+Wed May 25 14:30:41 UTC 2011 - prusnak@opensuse.org
+
+- added check in initscript whether VMTOOLSUSER_BIN exists
+
-------------------------------------------------------------------
Fri Apr 29 16:08:33 UTC 2011 - dimstar@opensuse.org
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 75f6155..215bea1 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -16,27 +16,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
# 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)
-%if 0%{suse_version} <= 1210
-%define mod1210 vmblock vmhgfs vmsync vmxnet vmci vsock
-%endif
+%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
-Group: System/Emulators/PC
-Summary: Open Virtual Machine Tools
-Version: 2011.04.25
+Version: 2011.05.27
+%define svn_rev 420096
Release: 1
-%define svn_rev 402641
-Url: http://open-vm-tools.sourceforge.net/
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
Source1: vmtoolsd
Source2: vmware-user-autostart.desktop
@@ -44,31 +40,31 @@ Source4: open-vm-tools.permissions
Source5: vmware-user-autostart-wrapper
Source6: open-vm-tools-modprobe.conf
Source98: preamble
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
+# don't use pkgconfig(gtk+-2.0) so we can build on SLE
+BuildRequires: gtk2-devel
+BuildRequires: gtkmm2-devel
BuildRequires: kernel-source
BuildRequires: kernel-syms
-BuildRequires: module-init-tools
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
+BuildRequires: module-init-tools
BuildRequires: pcre-devel
BuildRequires: procps
-BuildRequires: gtk2-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
-BuildRequires: gtkmm2-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# liburiparser was not present before 11.0
%if 0%{?suse_version} >= 1100
BuildRequires: liburiparser-devel
%endif
BuildRequires: pam-devel
-PreReq: %insserv_prereq %fillup_prereq
-PreReq: permissions
-ExclusiveArch: %ix86 x86_64
Requires: vmware-guest-kmp
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
-
-%define vm_modules %{?mod1210} %{?mod1120}
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+Requires(pre): permissions
+ExclusiveArch: %ix86 x86_64
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
@@ -125,7 +121,7 @@ useful functions like:
* General mechanisms and protocols for communication between host and
guests and from guest to guest
-%if %with_X
+%if %{with_X}
%package gui
License: BSD3c ; GPLv2 ; LGPLv2.1
@@ -133,7 +129,7 @@ Summary: Open Virtual Machine Tools - GUI
Group: System/Emulators/PC
Requires: open-vm-tools
Supplements: packageand(open-vm-tools:xorg-x11)
-PreReq: permissions
+Requires(pre): permissions
%description gui
GUI Toolbox for Open Virtual Machine Tools
@@ -145,7 +141,7 @@ Summary: Open Virtual Machine Tools - shared library
Group: System/Libraries
%description -n libvmtools0
-This is a shared library used by several Open VM Tools components,
+This is a shared library used by several Open VM Tools components,
such as vmware-toolbox-cmd and vmtoolsd (and its plugins).
%package -n libvmtools-devel
@@ -165,6 +161,8 @@ chmod -x AUTHORS COPYING ChangeLog NEWS README
sed -i -e "s/\r//" README
%build
+# disable warning unused-but-set-variable which will raise error because of -Werror
+export CFLAGS="%{optflags} -Wno-unused-but-set-variable"
# comments in a continued line seem not to work... shame
# --disable-unity : liburiparser was not present before 11.0
%configure \
@@ -174,7 +172,7 @@ sed -i -e "s/\r//" README
--without-kernel-modules \
--without-root-privileges \
--without-procps \
-%if %with_X
+%if %{with_X}
--with-x \
%else
--without-x \
@@ -200,7 +198,7 @@ done
%install
# let's use the kernel's own modules_install routine
-export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
pushd ..
for flavor in %{flavors_to_build}; do
@@ -213,33 +211,33 @@ done
popd
# fix some rights on the kernel modules, to have a complete -debuginfo package
-chmod u+x $RPM_BUILD_ROOT/lib/modules/*/updates/*
+chmod u+x %{buildroot}/lib/modules/*/updates/*
-%makeinstall
+%make_install
# Clean up the *.la files make install put all around
find %{buildroot} -name '*.la' -delete -print
# 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
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd
+ln -sf ../../etc/init.d/vmtoolsd %{buildroot}%{_sbindir}/rcvmtoolsd
-%if %with_X
+%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 0755 %{SOURCE5} %{buildroot}%{_bindir}/vmware-user-autostart-wrapper
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
# 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
+rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop
# 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
+install -D -m 0644 %{SOURCE6} %{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 )
@@ -253,7 +251,7 @@ rm -r %{buildroot}%{_datadir}/%{name}
/sbin/ldconfig
%{fillup_and_insserv -Y vmtoolsd}
-%if %with_X
+%if %{with_X}
%verifyscript gui
%verify_permissions
@@ -292,7 +290,7 @@ rm -rf %{buildroot}
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/plugins/common
%dir %{_libdir}/%{name}/plugins/vmsvc
-%if %with_X
+%if %{with_X}
%dir %{_libdir}/%{name}/plugins/vmusr
%endif
%{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
@@ -315,7 +313,7 @@ rm -rf %{buildroot}
%{_sbindir}/rcvmtoolsd
%exclude %{_libdir}/*.so
-%if %with_X
+%if %{with_X}
%files gui
%defattr(-, root, root)
diff --git a/vmtoolsd b/vmtoolsd
index a8d759e..00c6fc1 100644
--- a/vmtoolsd
+++ b/vmtoolsd
@@ -23,9 +23,9 @@
### BEGIN INIT INFO
# Provides: vmtoolsd
# Required-Start: $syslog $remote_fs
-# Should-Start:
+# Should-Start:
# Required-Stop: $syslog $remote_fs
-# Should-Stop:
+# Should-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: VMWare Tools Daemon
@@ -36,7 +36,7 @@
# 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";
+test -x $VMTOOLSD_BIN || { echo "$VMTOOLSD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
@@ -61,7 +61,7 @@ esac
rc_reset
# Return values acc. to LSB for all commands but status:
-# 0 - success
+# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
@@ -70,7 +70,7 @@ rc_reset
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-#
+#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
@@ -99,9 +99,11 @@ case "$1" in
## 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
+ # Otherwise it keeps references on /proc/fs/vmblock/* and
# causes issues when reloading vmblock module.
- /sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
+ if [ -f "$VMTOOLSUSER_BIN" ]; then
+ /sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
+ fi
/sbin/killproc -TERM $VMTOOLSD_BIN
umount /proc/fs/vmblock/mountPoint || :
modprobe -r vmblock || :
@@ -156,7 +158,7 @@ case "$1" in
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-
+
# NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc $VMTOOLSD_BIN
# NOTE: rc_status knows that we called this init script with
diff --git a/vmware-user-autostart-wrapper b/vmware-user-autostart-wrapper
index 17500c5..800ee0d 100644
--- a/vmware-user-autostart-wrapper
+++ b/vmware-user-autostart-wrapper
@@ -15,4 +15,3 @@ else
SLEEP=$[ $SLEEP * 2 ]
fi
done
-