Hello community, here is the log from the commit of package open-vm-tools for openSUSE:11.4 checked in at Tue Jun 7 11:02:35 CEST 2011.
-------- --- old-versions/11.4/all/open-vm-tools/open-vm-tools.changes 2010-12-22 10:27:25.000000000 +0100 +++ 11.4/open-vm-tools/open-vm-tools.changes 2011-06-03 12:02:12.000000000 +0200 @@ -1,0 +2,71 @@ +Thu Jun 2 13:13:04 UTC 2011 - [email protected] + +- 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 - [email protected] + +- use -Wno-unused-but-set in optflags so it will not fail build + while using -Werror + +------------------------------------------------------------------- +Wed May 25 14:30:41 UTC 2011 - [email protected] + +- added check in initscript whether VMTOOLSUSER_BIN exists + +------------------------------------------------------------------- +Fri Apr 29 16:08:33 UTC 2011 - [email protected] + +- Udpate to version 2011.04.25: + + Mostly cleanups and small bug fixes in this release. + + Logging is enabled by default in vmtoolsd, writing to syslog. + The default log level is not chatty, so few messages should + make it to syslog during normal operation. + + The GUI version of the toolbox was removed. + +------------------------------------------------------------------- +Wed Apr 27 08:58:46 UTC 2011 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- Fix build with Factory: verify the list of modules that are not + yet merged into the main kernel. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/open-vm-tools Destination is old-versions/11.4/UPDATES/all/open-vm-tools calling whatdependson for 11.4-i586 Old: ---- open-vm-tools-2010.12.19-339835.tar.bz2 pvscsi.tar.bz2 vmmemctl.tar.bz2 vmware-toolbox.desktop vmxnet3.tar.bz2 New: ---- _service _service:recompress:download_url:open-vm-tools-2011.05.27-420096.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.lmgvAr/_old 2011-06-07 11:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lmgvAr/_new 2011-06-07 11:02:11.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 @@ -16,72 +16,60 @@ # 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 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 +Version: 2011.05.27 +Release: 0.<RELEASE2> +%define svn_rev 420096 +License: BSD3c ; GPLv2 ; LGPLv2.1 Summary: Open Virtual Machine Tools -Version: 2010.12.19 -Release: 1 -%define svn_rev 339835 Url: http://open-vm-tools.sourceforge.net/ -License: BSD3c ; GPLv2 ; LGPLv2.1 +Group: System/Emulators/PC Source: %{name}-%{version}-%{svn_rev}.tar.bz2 Source1: vmtoolsd Source2: vmware-user-autostart.desktop -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 -# pvscsi, extracted from open-vm-tools 2010.03.18 -Source9: pvscsi.tar.bz2 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*) +Requires(pre): %fillup_prereq +Requires(pre): %insserv_prereq +Requires(pre): permissions +ExclusiveArch: %ix86 x86_64 -%define vm_modules %{?mod1140} %{?mod1130} %{?mod1120} +%define vm_modules %{?mod1210} %{?mod1120} %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -138,7 +126,7 @@ * 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 @@ -146,6 +134,7 @@ Group: System/Emulators/PC Requires: open-vm-tools Supplements: packageand(open-vm-tools:xorg-x11) +Requires(pre): permissions %description gui GUI Toolbox for Open Virtual Machine Tools @@ -172,19 +161,13 @@ %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 - +# 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 \ @@ -194,7 +177,7 @@ --without-kernel-modules \ --without-root-privileges \ --without-procps \ -%if %with_X +%if %{with_X} --with-x \ %else --without-x \ @@ -220,7 +203,7 @@ %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 @@ -233,33 +216,33 @@ 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 ) @@ -273,7 +256,7 @@ /sbin/ldconfig %{fillup_and_insserv -Y vmtoolsd} -%if %with_X +%if %{with_X} %verifyscript gui %verify_permissions @@ -312,7 +295,7 @@ %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 @@ -335,12 +318,11 @@ %{_sbindir}/rcvmtoolsd %exclude %{_libdir}/*.so -%if %with_X +%if %{with_X} %files gui %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop -%{_bindir}/vmware-toolbox %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so %{_libdir}/%{name}/plugins/vmusr/libdndcp.so @@ -348,7 +330,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 ++++++ _service ++++++ <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">sourceforge.net</param> <param name="path">/projects/open-vm-tools/files/open-vm-tools/2011.05.27/open-vm-tools-2011.05.27-420096.tar.gz</param> </service> <service name="recompress"> <param name="file">_service:download_url:*.tar.gz</param> <param name="compression">bz2</param> </service> </services> ++++++ open-vm-tools-modprobe.conf ++++++ --- /var/tmp/diff_new_pack.lmgvAr/_old 2011-06-07 11:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lmgvAr/_new 2011-06-07 11:02:11.000000000 +0200 @@ -1,2 +1 @@ install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS; /bin/true; - ++++++ preamble ++++++ --- /var/tmp/diff_new_pack.lmgvAr/_old 2011-06-07 11:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lmgvAr/_new 2011-06-07 11:02:11.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.lmgvAr/_old 2011-06-07 11:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lmgvAr/_new 2011-06-07 11:02:11.000000000 +0200 @@ -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,17 +36,32 @@ # 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; } +# 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 + 27|28|29|30|31|32|33) + VMBALLOON=vmmemctl + ;; + 34|35) + VMBALLOON=vmware_balloon + ;; + *) + VMBALLOON=vmw_balloon + ;; +esac + + . /etc/rc.status # Reset status of this service 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") @@ -55,7 +70,7 @@ # 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 @@ -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. @@ -84,14 +99,16 @@ ## 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 || : modprobe -r vmsync || : - modprobe -r vmmemctl || : + modprobe -r $VMBALLOON || : # Remember status and be verbose rc_status -v @@ -141,7 +158,7 @@ # 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 ++++++ vmware-user-autostart-wrapper ++++++ --- /var/tmp/diff_new_pack.lmgvAr/_old 2011-06-07 11:02:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lmgvAr/_new 2011-06-07 11:02:11.000000000 +0200 @@ -15,4 +15,3 @@ SLEEP=$[ $SLEEP * 2 ] fi done - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
