Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2012-02-14 19:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2011-09-26 10:09:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2012-02-14 19:04:36.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Feb 5 15:07:36 UTC 2012 - [email protected] + +- Add vmhgfs-2011.12.20.patch: Fix build of vmhgfs module with + kernel 3.2. +- Update FSF address part in vmtoolsd header. + +------------------------------------------------------------------- +Tue Jan 24 15:53:36 UTC 2012 - [email protected] + +- Update to version 8.8.1 (Stable series): + * Updated code for compatibility with newer Linux kernel releases + and with newer NetworkManager releases. +- dropped vmxnet+kernel-3.0 (not needed anymore) +- build with PIE [bnc#743130] + +------------------------------------------------------------------- Old: ---- open-vm-tools-8.8.0-471268.tar.gz open-vm-tools-vmxnet+kernel-3.0.patch New: ---- open-vm-tools-8.8.1-528969.tar.gz vmhgfs-2011.12.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.df8lVA/_old 2012-02-14 19:04:37.000000000 +0100 +++ /var/tmp/diff_new_pack.df8lVA/_new 2012-02-14 19:04:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -20,20 +20,25 @@ # 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-09-21 with kernel 3.1-rc6) -%define vm_modules vmblock vmhgfs vmsync vmxnet vmci vsock +%if 0%{?suse_version} <= 1210 +# Modules to be built up to openSUSE 12.1, possibly not building on newer versions. +%define vm_modules1210 vmxnet +%endif + +# Modules that have to be build up to version 12.2 (Last checked on 2012-02-05 with kernel 3.2.0) +%define vm_modules vmblock vmhgfs vmsync vmci vsock %{?vm_modules1210} # 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: 8.8.0 -Release: 1 -%define svn_rev 471268 -License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 +Version: 8.8.1 +Release: 0 +%define svn_rev 528969 Summary: Open Virtual Machine Tools -Url: http://open-vm-tools.sourceforge.net/ +License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 Group: System/Emulators/PC +Url: http://open-vm-tools.sourceforge.net/ 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 @@ -41,8 +46,7 @@ Source5: vmware-user-autostart-wrapper Source6: open-vm-tools-modprobe.conf Source98: preamble -# PATCH-FIX-UPSTREAM open-vm-tools-vmxnet+kernel-3.0.patch [email protected] -- Fix compilation with kernel 3.0 -Patch0: open-vm-tools-vmxnet+kernel-3.0.patch +Patch0: vmhgfs-2011.12.20.patch BuildRequires: gcc-c++ # don't use pkgconfig(gtk+-2.0) so we can build on SLE BuildRequires: gtk2-devel @@ -96,7 +100,6 @@ guests and from guest to guest %package -n vmware-guest-KMP -License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 Summary: Open Virtual Machine Tools - for VM GUESTS Group: System/Emulators/PC @@ -127,7 +130,6 @@ %if %{with_X} %package gui -License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 Summary: Open Virtual Machine Tools - GUI Group: System/Emulators/PC Requires: open-vm-tools @@ -139,7 +141,6 @@ %endif %package -n libvmtools0 -License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 Summary: Open Virtual Machine Tools - shared library Group: System/Libraries @@ -148,7 +149,6 @@ such as vmware-toolbox-cmd and vmtoolsd (and its plugins). %package -n libvmtools-devel -License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1 Summary: Open Virtual Machine Tools - Development headers Group: Development Requires: libvmtools0 = %{version} @@ -159,14 +159,23 @@ %prep %setup -q -n %{name}-%{version}-%{svn_rev} -%patch0 -p0 +%patch0 -p1 chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds 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" +# disable warning deprecated-declarations which will raise error because of -Werror +# (this is because of 'g_static_mutex_init' usage which is now deprecated) +%if 0%{?suse_version} > 1110 +export CFLAGS="%{optflags} -Wno-unused-but-set-variable -Wno-deprecated-declarations -fPIE" +export CPPFLAGS="%{optflags} -Wno-unused-but-set-variable -Wno-deprecated-declarations -fPIE" +%else +export CFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE" +export CPPFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE" +%endif +export LDFLAGS="-pie" # comments in a continued line seem not to work... shame # --disable-unity : liburiparser was not present before 11.0 %configure \ @@ -217,7 +226,11 @@ # fix some rights on the kernel modules, to have a complete -debuginfo package chmod u+x %{buildroot}/lib/modules/*/updates/* +%if 0%{?suse_version} > 1110 %make_install +%else +%makeinstall +%endif # Clean up the *.la files make install put all around find %{buildroot} -name '*.la' -delete -print @@ -234,7 +247,7 @@ 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 +#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 @@ -337,7 +350,7 @@ %defattr(-, root, root) %{_bindir}/vmware-toolbox %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop -#%{_sysconfdir}/permissions.d/open-vm-tools +#%%{_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 ++++++ open-vm-tools-8.8.0-471268.tar.gz -> open-vm-tools-8.8.1-528969.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/ChangeLog new/open-vm-tools-8.8.1-528969/ChangeLog --- old/open-vm-tools-8.8.0-471268/ChangeLog 2011-09-15 04:03:27.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/ChangeLog 2011-11-21 23:27:53.000000000 +0100 @@ -1,3 +1,7 @@ +8.8.1 Marcelo Vanzin <[email protected]> + Release matching the Workstation 8.0.1 release. + + 8.8.0 Marcelo Vanzin <[email protected]> Release matching the Workstation 8.0 / Fusion 4.0 releases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/NEWS new/open-vm-tools-8.8.1-528969/NEWS --- old/open-vm-tools-8.8.0-471268/NEWS 2011-09-15 04:03:27.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/NEWS 2011-11-21 23:27:53.000000000 +0100 @@ -1,3 +1,7 @@ +open-vm-tools 8.8.1 changes: + * Updated code for compatibility with newer Linux kernel releases + and with newer NetworkManager releases. + open-vm-tools 8.8.0 changes: * Release of open-vm-tools matching the Workstation 8.0 / Fusion 4.0 releases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/autom4te.cache/output.0 new/open-vm-tools-8.8.1-528969/autom4te.cache/output.0 --- old/open-vm-tools-8.8.0-471268/autom4te.cache/output.0 2011-09-15 04:03:39.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/autom4te.cache/output.0 2011-11-21 23:28:01.000000000 +0100 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.0. +@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.1. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='open-vm-tools' PACKAGE_TARNAME='open-vm-tools' -PACKAGE_VERSION='8.8.0' -PACKAGE_STRING='open-vm-tools 8.8.0' +PACKAGE_VERSION='8.8.1' +PACKAGE_STRING='open-vm-tools 8.8.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1559,7 +1559,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures open-vm-tools 8.8.0 to adapt to many kinds of systems. +\`configure' configures open-vm-tools 8.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1633,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of open-vm-tools 8.8.0:";; + short | recursive ) echo "Configuration of open-vm-tools 8.8.1:";; esac cat <<\_ACEOF @@ -1760,7 +1760,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -open-vm-tools configure 8.8.0 +open-vm-tools configure 8.8.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2452,7 +2452,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by open-vm-tools $as_me 8.8.0, which was +It was created by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3523,7 +3523,7 @@ # Define the identity of the package. PACKAGE='open-vm-tools' - VERSION='8.8.0' + VERSION='8.8.1' cat >>confdefs.h <<_ACEOF @@ -23788,7 +23788,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by open-vm-tools $as_me 8.8.0, which was +This file was extended by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23845,7 +23845,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -open-vm-tools config.status 8.8.0 +open-vm-tools config.status 8.8.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/autom4te.cache/output.1 new/open-vm-tools-8.8.1-528969/autom4te.cache/output.1 --- old/open-vm-tools-8.8.0-471268/autom4te.cache/output.1 2011-09-15 04:03:43.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/autom4te.cache/output.1 2011-11-21 23:28:05.000000000 +0100 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.0. +@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.1. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='open-vm-tools' PACKAGE_TARNAME='open-vm-tools' -PACKAGE_VERSION='8.8.0' -PACKAGE_STRING='open-vm-tools 8.8.0' +PACKAGE_VERSION='8.8.1' +PACKAGE_STRING='open-vm-tools 8.8.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1559,7 +1559,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures open-vm-tools 8.8.0 to adapt to many kinds of systems. +\`configure' configures open-vm-tools 8.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1633,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of open-vm-tools 8.8.0:";; + short | recursive ) echo "Configuration of open-vm-tools 8.8.1:";; esac cat <<\_ACEOF @@ -1760,7 +1760,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -open-vm-tools configure 8.8.0 +open-vm-tools configure 8.8.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2452,7 +2452,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by open-vm-tools $as_me 8.8.0, which was +It was created by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3523,7 +3523,7 @@ # Define the identity of the package. PACKAGE='open-vm-tools' - VERSION='8.8.0' + VERSION='8.8.1' cat >>confdefs.h <<_ACEOF @@ -23788,7 +23788,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by open-vm-tools $as_me 8.8.0, which was +This file was extended by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23845,7 +23845,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -open-vm-tools config.status 8.8.0 +open-vm-tools config.status 8.8.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/autom4te.cache/output.2 new/open-vm-tools-8.8.1-528969/autom4te.cache/output.2 --- old/open-vm-tools-8.8.0-471268/autom4te.cache/output.2 2011-09-15 04:03:42.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/autom4te.cache/output.2 2011-11-21 23:28:04.000000000 +0100 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.0. +@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.1. @%:@ @%:@ Report bugs to <[email protected]>. @%:@ @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='open-vm-tools' PACKAGE_TARNAME='open-vm-tools' -PACKAGE_VERSION='8.8.0' -PACKAGE_STRING='open-vm-tools 8.8.0' +PACKAGE_VERSION='8.8.1' +PACKAGE_STRING='open-vm-tools 8.8.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1559,7 +1559,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures open-vm-tools 8.8.0 to adapt to many kinds of systems. +\`configure' configures open-vm-tools 8.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1633,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of open-vm-tools 8.8.0:";; + short | recursive ) echo "Configuration of open-vm-tools 8.8.1:";; esac cat <<\_ACEOF @@ -1760,7 +1760,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -open-vm-tools configure 8.8.0 +open-vm-tools configure 8.8.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2452,7 +2452,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by open-vm-tools $as_me 8.8.0, which was +It was created by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3523,7 +3523,7 @@ # Define the identity of the package. PACKAGE='open-vm-tools' - VERSION='8.8.0' + VERSION='8.8.1' cat >>confdefs.h <<_ACEOF @@ -23788,7 +23788,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by open-vm-tools $as_me 8.8.0, which was +This file was extended by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23845,7 +23845,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -open-vm-tools config.status 8.8.0 +open-vm-tools config.status 8.8.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/autom4te.cache/traces.1 new/open-vm-tools-8.8.1-528969/autom4te.cache/traces.1 --- old/open-vm-tools-8.8.0-471268/autom4te.cache/traces.1 2011-09-15 04:03:43.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/autom4te.cache/traces.1 2011-11-21 23:28:05.000000000 +0100 @@ -4,7 +4,7 @@ m4trace:aclocal.m4:990: -1- m4_include([m4/ltversion.m4]) m4trace:aclocal.m4:991: -1- m4_include([m4/lt~obsolete.m4]) m4trace:aclocal.m4:992: -1- m4_include([m4/vmtools.m4]) -m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [8.8.0], [[email protected]]) +m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [8.8.1], [[email protected]]) m4trace:configure.ac:43: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:43: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:43: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/configure new/open-vm-tools-8.8.1-528969/configure --- old/open-vm-tools-8.8.0-471268/configure 2011-09-15 04:03:44.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/configure 2011-11-21 23:28:05.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.0. +# Generated by GNU Autoconf 2.67 for open-vm-tools 8.8.1. # # Report bugs to <[email protected]>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='open-vm-tools' PACKAGE_TARNAME='open-vm-tools' -PACKAGE_VERSION='8.8.0' -PACKAGE_STRING='open-vm-tools 8.8.0' +PACKAGE_VERSION='8.8.1' +PACKAGE_STRING='open-vm-tools 8.8.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1559,7 +1559,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures open-vm-tools 8.8.0 to adapt to many kinds of systems. +\`configure' configures open-vm-tools 8.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1633,7 +1633,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of open-vm-tools 8.8.0:";; + short | recursive ) echo "Configuration of open-vm-tools 8.8.1:";; esac cat <<\_ACEOF @@ -1760,7 +1760,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -open-vm-tools configure 8.8.0 +open-vm-tools configure 8.8.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2452,7 +2452,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by open-vm-tools $as_me 8.8.0, which was +It was created by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3523,7 +3523,7 @@ # Define the identity of the package. PACKAGE='open-vm-tools' - VERSION='8.8.0' + VERSION='8.8.1' cat >>confdefs.h <<_ACEOF @@ -23788,7 +23788,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by open-vm-tools $as_me 8.8.0, which was +This file was extended by open-vm-tools $as_me 8.8.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23845,7 +23845,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -open-vm-tools config.status 8.8.0 +open-vm-tools config.status 8.8.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/configure.ac new/open-vm-tools-8.8.1-528969/configure.ac --- old/open-vm-tools-8.8.0-471268/configure.ac 2011-09-15 04:03:27.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/configure.ac 2011-11-21 23:27:53.000000000 +0100 @@ -39,10 +39,10 @@ ### Initialization ### -TOOLS_VERSION="8.8.0" +TOOLS_VERSION="8.8.1" AC_INIT( [open-vm-tools], - [8.8.0], + [8.8.1], [[email protected]]) # In order to make this configure script auto-detect situations where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/backdoor_def.h new/open-vm-tools-8.8.1-528969/lib/include/backdoor_def.h --- old/open-vm-tools-8.8.0-471268/lib/include/backdoor_def.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/backdoor_def.h 2011-11-21 23:27:53.000000000 +0100 @@ -153,7 +153,8 @@ #define BDOOR_CMD_FIRMWARE_ERROR 71 /* CPL 0 only. */ # define BDOOR_CMD_FE_INSUFFICIENT_MEM 0 # define BDOOR_CMD_FE_EXCEPTION 1 -#define BDOOR_CMD_MAX 72 +#define BDOOR_CMD_GET_HW_MODEL 74 /* CPL 0 only. */ +#define BDOOR_CMD_MAX 75 /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/buildNumber.h new/open-vm-tools-8.8.1-528969/lib/include/buildNumber.h --- old/open-vm-tools-8.8.0-471268/lib/include/buildNumber.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/buildNumber.h 2011-11-21 23:27:53.000000000 +0100 @@ -1,12 +1,12 @@ #define BUILD_NUMBER \ - "build-471268" + "build-528969" #define BUILD_NUMBER_NUMERIC \ - 471268 + 528969 #define BUILD_NUMBER_NUMERIC_STRING \ - "471268" + "528969" #define PRODUCT_BUILD_NUMBER \ - "product-build-7539" + "product-build-9139" #define PRODUCT_BUILD_NUMBER_NUMERIC \ - 7539 + 9139 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \ - "7539" + "9139" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/hostinfo.h new/open-vm-tools-8.8.1-528969/lib/include/hostinfo.h --- old/open-vm-tools-8.8.0-471268/lib/include/hostinfo.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/hostinfo.h 2011-11-21 23:27:53.000000000 +0100 @@ -213,4 +213,8 @@ } #endif +#ifdef __APPLE__ +char *Hostinfo_GetHardwareModel(void); +#endif + #endif /* ifndef _HOSTINFO_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/iovector.h new/open-vm-tools-8.8.1-528969/lib/include/iovector.h --- old/open-vm-tools-8.8.0-471268/lib/include/iovector.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/iovector.h 2011-11-21 23:27:53.000000000 +0100 @@ -89,7 +89,7 @@ uint8* bufOut, size_t bufSize); -EXTERN void IOV_WriteBufToIov(uint8* bufIn, +EXTERN void IOV_WriteBufToIov(const uint8* bufIn, size_t bufSize, struct iovec* entries, int numEntries); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/vm_tools_version.h new/open-vm-tools-8.8.1-528969/lib/include/vm_tools_version.h --- old/open-vm-tools-8.8.0-471268/lib/include/vm_tools_version.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/vm_tools_version.h 2011-11-21 23:27:53.000000000 +0100 @@ -1060,9 +1060,17 @@ #define TOOLS_VERSION_HOSTED11_RELEASE_V_BASE 0 -#define TOOLS_VERSION_CURRENT TOOLS_VERSION_HOSTED11_RELEASE -#define TOOLS_VERSION_CURRENT_STR TOOLS_VERSION_TO_STR(TOOLS_VERSION_HOSTED11_RELEASE) -#define TOOLS_VERSION_CURRENT_CSV TOOLS_VERSION_TO_CSV(TOOLS_VERSION_HOSTED11_RELEASE) +#ifndef RC_INVOKED +#define TOOLS_VERSION_HOSTED11_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_HOSTED11_UPDATE1_V) +#endif /* RC_INVOKED */ +#define TOOLS_VERSION_HOSTED11_UPDATE1_V_MJR 8 +#define TOOLS_VERSION_HOSTED11_UPDATE1_V_MNR 8 +#define TOOLS_VERSION_HOSTED11_UPDATE1_V_BASE 1 + + +#define TOOLS_VERSION_CURRENT TOOLS_VERSION_HOSTED11_UPDATE1 +#define TOOLS_VERSION_CURRENT_STR TOOLS_VERSION_TO_STR(TOOLS_VERSION_HOSTED11_UPDATE1) +#define TOOLS_VERSION_CURRENT_CSV TOOLS_VERSION_TO_CSV(TOOLS_VERSION_HOSTED11_UPDATE1) /* * The extended Tools version is the current Tools version with the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/include/vm_version.h new/open-vm-tools-8.8.1-528969/lib/include/vm_version.h --- old/open-vm-tools-8.8.0-471268/lib/include/vm_version.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/include/vm_version.h 2011-11-21 23:27:53.000000000 +0100 @@ -83,7 +83,7 @@ * hard-coded value for every other product. */ #if defined(VMX86_DESKTOP) - #define PRODUCT_VERSION 8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* WORKSTATION_VERSION_NUMBER below has to match this */ + #define PRODUCT_VERSION 8,0,1,PRODUCT_BUILD_NUMBER_NUMERIC /* WORKSTATION_VERSION_NUMBER below has to match this */ #elif defined(VMX86_TOOLS) #define PRODUCT_VERSION TOOLS_VERSION_EXT_CURRENT_CSV #elif defined(VMX86_VCB) @@ -94,7 +94,7 @@ /* this should be kept in sync with the corresponding vpx branch. */ #define PRODUCT_VERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC #else - #define PRODUCT_VERSION 4,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */ + #define PRODUCT_VERSION 4,0,1,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */ #endif /* @@ -197,19 +197,19 @@ #define ESX_RELEASE ESX_RELEASE_UPDATE "." ESX_RELEASE_PATCH #define GSX_VERSION "e.x.p" #define VMSERVER_VERSION "e.x.p" -#define WORKSTATION_VERSION_NUMBER "8.0.0" /* this version number should always match real WS version number */ -#define WORKSTATION_VERSION "8.0.0" -#define WORKSTATION_ENTERPRISE_VERSION "8.0.0" +#define WORKSTATION_VERSION_NUMBER "8.0.1" /* this version number should always match real WS version number */ +#define WORKSTATION_VERSION "8.0.1" +#define WORKSTATION_ENTERPRISE_VERSION "8.0.1" #define ACE_MANAGEMENT_SERVER_VERSION "e.x.p" #define MUI_VERSION "4.1.0" #define CONSOLE_VERSION "4.1.0" #define P2V_VERSION "e.x.p" #define P2V_FILE_VERSION 3,0,0,0 -#define PLAYER_VERSION_NUMBER "4.0.0" /* this version number should always match real Player version number */ -#define PLAYER_VERSION "4.0.0" +#define PLAYER_VERSION_NUMBER "4.0.1" /* this version number should always match real Player version number */ +#define PLAYER_VERSION "4.0.1" #define V2V_VERSION "e.x.p" #define V2V_FILE_VERSION 1,0,0,0 -#define FUSION_VERSION "4.0.2" +#define FUSION_VERSION "4.1.0" // These must match VIE_FILEVERSION above #define SYSIMAGE_VERSION "5.0.0" @@ -223,8 +223,8 @@ #define SVA_VERSION "1.0.0" #define WBC_VERSION "5.0.0" #define SDK_VERSION "4.1.0" -#define FOUNDRY_VERSION "1.11.0" -#define FOUNDRY_FILE_VERSION 1,11,0,PRODUCT_BUILD_NUMBER_NUMERIC +#define FOUNDRY_VERSION "1.11.1" +#define FOUNDRY_FILE_VERSION 1,11,1,PRODUCT_BUILD_NUMBER_NUMERIC #define VMLS_VERSION "e.x.p" #define VLICENSE_VERSION "1.1.2" #define DDK_VERSION "e.x.p" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/misc/hostinfoPosix.c new/open-vm-tools-8.8.1-528969/lib/misc/hostinfoPosix.c --- old/open-vm-tools-8.8.0-471268/lib/misc/hostinfoPosix.c 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/misc/hostinfoPosix.c 2011-11-21 23:27:53.000000000 +0100 @@ -2555,7 +2555,7 @@ uint32 hz; size_t hzSize = sizeof hz; - /* 'cpuNumber' is ignored: Intel Macs are always perfectly symetric. */ + /* 'cpuNumber' is ignored: Intel Macs are always perfectly symmetric. */ if (sysctlbyname(CPUMHZ_SYSCTL_NAME, &hz, &hzSize, NULL, 0) == -1) { return FALSE; @@ -2585,12 +2585,13 @@ } +#if defined(__APPLE__) || defined(__FreeBSD__) /* *----------------------------------------------------------------------------- * - * Hostinfo_GetCpuDescription -- + * HostinfoGetSysctlStringAlloc -- * - * Get the descriptive name associated with a given CPU. + * Obtains the value of a string-type host sysctl. * * Results: * On success: Allocated, NUL-terminated string. @@ -2602,22 +2603,13 @@ *----------------------------------------------------------------------------- */ -char * -Hostinfo_GetCpuDescription(uint32 cpuNumber) // IN: +static char * +HostinfoGetSysctlStringAlloc(char const *sysctlName) // IN { -#if defined(__APPLE__) || defined(__FreeBSD__) -# if defined(__APPLE__) -# define CPUDESC_SYSCTL_NAME "machdep.cpu.brand_string" -# else -# define CPUDESC_SYSCTL_NAME "hw.model" -# endif - char *desc; size_t descSize; - /* 'cpuNumber' is ignored: Intel Macs are always perfectly symetric. */ - - if (sysctlbyname(CPUDESC_SYSCTL_NAME, NULL, &descSize, NULL, 0) == -1) { + if (sysctlbyname(sysctlName, NULL, &descSize, NULL, 0) == -1) { return NULL; } @@ -2626,13 +2618,42 @@ return NULL; } - if (sysctlbyname(CPUDESC_SYSCTL_NAME, desc, &descSize, NULL, 0) == -1) { + if (sysctlbyname(sysctlName, desc, &descSize, NULL, 0) == -1) { free(desc); return NULL; } return desc; +} +#endif + + +/* + *----------------------------------------------------------------------------- + * + * Hostinfo_GetCpuDescription -- + * + * Get the descriptive name associated with a given CPU. + * + * Results: + * On success: Allocated, NUL-terminated string. + * On failure: NULL. + * + * Side effects: + * None. + * + *----------------------------------------------------------------------------- + */ + +char * +Hostinfo_GetCpuDescription(uint32 cpuNumber) // IN: +{ +#if defined(__APPLE__) + /* 'cpuNumber' is ignored: Intel Macs are always perfectly symmetric. */ + return HostinfoGetSysctlStringAlloc("machdep.cpu.brand_string"); +#elif defined(__FreeBSD__) + return HostinfoGetSysctlStringAlloc("hw.model"); #else #ifdef VMX86_SERVER if (HostType_OSIsVMK()) { @@ -2642,7 +2663,7 @@ mName[0] = '\0'; if (VMKernel_GetCPUModelName(cpuNumber, mName, sizeof(mName)) == VMK_OK) { - mName[sizeof(mName) - 1] = '\0'; + mName[sizeof(mName) - 1] = '\0'; return strdup(mName); } @@ -2873,6 +2894,30 @@ return retval; } + + +/* + *----------------------------------------------------------------------------- + * + * Hostinfo_GetHardwareModel -- + * + * Obtains the hardware model identifier (i.e. "MacPro5,1") from the host. + * + * Results: + * On success: Allocated, NUL-terminated string. + * On failure: NULL. + * + * Side effects: + * None. + * + *----------------------------------------------------------------------------- + */ + +char * +Hostinfo_GetHardwareModel(void) +{ + return HostinfoGetSysctlStringAlloc("hw.model"); +} #endif /* __APPLE__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/misc/iovector.c new/open-vm-tools-8.8.1-528969/lib/misc/iovector.c --- old/open-vm-tools-8.8.0-471268/lib/misc/iovector.c 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/misc/iovector.c 2011-11-21 23:27:53.000000000 +0100 @@ -581,7 +581,7 @@ */ void -IOV_WriteBufToIov(uint8* bufIn, // IN +IOV_WriteBufToIov(const uint8* bufIn, // IN size_t bufSize, // IN struct iovec* entries, // OUT int numEntries) // IN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/misc/vthreadBase.c new/open-vm-tools-8.8.1-528969/lib/misc/vthreadBase.c --- old/open-vm-tools-8.8.0-471268/lib/misc/vthreadBase.c 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/misc/vthreadBase.c 2011-11-21 23:27:53.000000000 +0100 @@ -394,6 +394,15 @@ #else Bool success = pthread_key_create(&newKey, &VThreadBaseSafeDeleteTLS) == 0; + if (success && newKey == 0) { + /* + * Leak TLS key 0. System libraries have a habit of destroying + * it. See bugs 702818 and 773420. + */ + + success = pthread_key_create(&newKey, + &VThreadBaseSafeDeleteTLS) == 0; + } ASSERT_NOT_IMPLEMENTED(success); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/lib/rpcIn/rpcin.c new/open-vm-tools-8.8.1-528969/lib/rpcIn/rpcin.c --- old/open-vm-tools-8.8.0-471268/lib/rpcIn/rpcin.c 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/lib/rpcIn/rpcin.c 2011-11-21 23:27:53.000000000 +0100 @@ -587,6 +587,15 @@ current = in->delay; /* + * Workaround for bug 780404. Remove if we ever figure out the root cause. + * Note that the ASSERT above catches this on non-release builds. + */ + if (in->channel == NULL) { + errmsg = "RpcIn: Channel is not active"; + goto error; + } + + /* * This is very important: this is the only way to signal the existence of * this guest application to VMware. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/modules/linux/dkms.conf new/open-vm-tools-8.8.1-528969/modules/linux/dkms.conf --- old/open-vm-tools-8.8.0-471268/modules/linux/dkms.conf 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/modules/linux/dkms.conf 2011-11-21 23:27:53.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE_NAME=open-vm-tools -PACKAGE_VERSION=8.8.0 +PACKAGE_VERSION=8.8.1 MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \ MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/modules/linux/dkms.sh new/open-vm-tools-8.8.1-528969/modules/linux/dkms.sh --- old/open-vm-tools-8.8.0-471268/modules/linux/dkms.sh 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/modules/linux/dkms.sh 2011-11-21 23:27:53.000000000 +0100 @@ -28,12 +28,12 @@ echo " src: root of unpacked open-vm-tools package" echo " dst: where to create the dkms tree" echo - echo "The script will create an 'open-vm-tools' module with version 2011.09.14." + echo "The script will create an 'open-vm-tools' module with version 8.8.1." exit 1 fi src=$1 -dst=$2/open-vm-tools-8.8.0 +dst=$2/open-vm-tools-8.8.1 SHARED_HEADERS="backdoor_def.h" SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/modules/linux/shared/compat_netdevice.h new/open-vm-tools-8.8.1-528969/modules/linux/shared/compat_netdevice.h --- old/open-vm-tools-8.8.0-471268/modules/linux/shared/compat_netdevice.h 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/modules/linux/shared/compat_netdevice.h 2011-11-21 23:27:53.000000000 +0100 @@ -179,20 +179,12 @@ #endif /* - * All compat_* business is good but when we can we should just provide - * missing implementation to ease upstreaming task. + * In 3.1 merge window feature maros were removed from mainline, + * so let's add back ones we care about. */ -#ifndef HAVE_ALLOC_NETDEV -#define alloc_netdev(sz, name, setup) compat_alloc_netdev(sz, name, setup) -#define alloc_etherdev(sz) compat_alloc_etherdev(sz) -#endif - -#ifndef HAVE_FREE_NETDEV -#define free_netdev(dev) kfree(dev) -#endif - -#ifndef HAVE_NETDEV_PRIV -#define netdev_priv(dev) ((dev)->priv) +#if !defined(HAVE_NET_DEVICE_OPS) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) +# define HAVE_NET_DEVICE_OPS 1 #endif #if defined(NETDEV_TX_OK) @@ -203,55 +195,6 @@ # define COMPAT_NETDEV_TX_BUSY 1 #endif -#ifndef HAVE_NETIF_QUEUE -static inline void -netif_start_queue(struct device *dev) -{ - clear_bit(0, &dev->tbusy); -} - -static inline void -netif_stop_queue(struct device *dev) -{ - set_bit(0, &dev->tbusy); -} - -static inline int -netif_queue_stopped(struct device *dev) -{ - return test_bit(0, &dev->tbusy); -} - -static inline void -netif_wake_queue(struct device *dev) -{ - clear_bit(0, &dev->tbusy); - mark_bh(NET_BH); -} - -static inline int -netif_running(struct device *dev) -{ - return dev->start == 0; -} - -static inline int -netif_carrier_ok(struct device *dev) -{ - return 1; -} - -static inline void -netif_carrier_on(struct device *dev) -{ -} - -static inline void -netif_carrier_off(struct device *dev) -{ -} -#endif - /* Keep compat_* defines for now */ #define compat_netif_start_queue(dev) netif_start_queue(dev) #define compat_netif_stop_queue(dev) netif_stop_queue(dev) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/scripts/linux/network new/open-vm-tools-8.8.1-528969/scripts/linux/network --- old/open-vm-tools-8.8.0-471268/scripts/linux/network 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/scripts/linux/network 2011-11-21 23:27:53.000000000 +0100 @@ -145,19 +145,38 @@ # None. # -TranquilizeNetworkManager() { +TranquilizeNetworkManager() +{ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` - if [ $? -eq 0 ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.sleep + rc=$? + if [ $rc = 0 ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.Enable boolean:false + rc=$? + if [ $rc = 0 ]; then + return $rc + fi # NetworkManager 0.7.0 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ org.freedesktop.NetworkManager.Sleep boolean:true + rc=$? + if [ $rc = 0 ]; then + return $rc + fi + # NetworkManager 0.6 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.sleep + rc=$? fi + return $rc } @@ -175,19 +194,38 @@ # None. # -WakeNetworkManager() { +WakeNetworkManager() +{ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` - if [ $? -eq 0 ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.wake + rc=$? + if [ $rc = 0 ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.Enable boolean:true + rc=$? + if [ $rc = 0 ]; then + return $rc + fi # NetworkManager 0.7.0 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ org.freedesktop.NetworkManager.Sleep boolean:false + rc=$? + if [ $rc = 0 ]; then + return $rc + fi + # NetworkManager 0.6 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.wake + rc=$? fi + return $rc } @@ -218,30 +256,38 @@ rm -f $activeList ;; suspend-vm) - save_active_NIC_list - "$networkScript" stop TranquilizeNetworkManager - ;; - resume-vm) - # According to hfu, "/etc/init.d/networking restart" on Debian 5.0 - # may bring down ethernet interfaces tagged as "allow-hotplug" without - # bringing them back up. - # - # This is especially a problem when reverting to a live, running - # VM snapshot where an active NIC list hadn't yet been generated, - # resulting in sudden loss of an otherwise operational NIC. - # - # So, if the active list doesn't exist, assume we're coming back to - # a live snapshot and capture the current active list now for - # rescue later. - if [ ! -s $activeList ]; then + exitCode=$? + if [ $exitCode != 0 ]; then save_active_NIC_list + "$networkScript" stop + exitCode=$? fi + ;; + resume-vm) WakeNetworkManager - # XXX Do we really want restart or is start sufficient? Like, would - # using start avoid the problem mentioned above? - "$networkScript" restart - rescue_NIC + exitCode=$? + if [ $exitCode != 0 ]; then + # According to hfu, "/etc/init.d/networking restart" on Debian 5.0 + # may bring down ethernet interfaces tagged as "allow-hotplug" without + # bringing them back up. + # + # This is especially a problem when reverting to a live, running + # VM snapshot where an active NIC list hadn't yet been generated, + # resulting in sudden loss of an otherwise operational NIC. + # + # So, if the active list doesn't exist, assume we're coming back to + # a live snapshot and capture the current active list now for + # rescue later. + if [ ! -s $activeList ]; then + save_active_NIC_list + fi + # XXX Do we really want restart or is start sufficient? Like, would + # using start avoid the problem mentioned above? + "$networkScript" restart + rescue_NIC + exitCode=$? + fi ;; *) ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-vm-tools-8.8.0-471268/toolbox/toolboxcmd-shrink.c new/open-vm-tools-8.8.1-528969/toolbox/toolboxcmd-shrink.c --- old/open-vm-tools-8.8.0-471268/toolbox/toolboxcmd-shrink.c 2011-09-15 04:03:28.000000000 +0200 +++ new/open-vm-tools-8.8.1-528969/toolbox/toolboxcmd-shrink.c 2011-11-21 23:27:53.000000000 +0100 @@ -41,7 +41,6 @@ static Wiper_State *wiper = NULL; - /* *----------------------------------------------------------------------------- * @@ -193,7 +192,9 @@ WiperPartition *part; int rc; -#ifndef _WIN32 +#if defined(_WIN32) + DWORD currPriority = GetPriorityClass(GetCurrentProcess()); +#else signal(SIGINT, ShrinkWiperDestroy); #endif @@ -227,6 +228,16 @@ wiper = Wiper_Start(part, MAX_WIPER_FILE_SIZE); +#if defined(_WIN32) + /* + * On Win32, lower the process priority during wipe, so other applications + * can still run (sort of) normally while we're filling the disk. + */ + if (!SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS)) { + g_debug("Unable to lower process priority: %u.", GetLastError()); + } +#endif + while (progress < 100 && wiper != NULL) { err = Wiper_Next(&wiper, &progress); if (strlen(err) > 0) { @@ -251,6 +262,13 @@ } } +#if defined(_WIN32) + /* Go back to our original priority. */ + if (!SetPriorityClass(GetCurrentProcess(), currPriority)) { + g_debug("Unable to restore process priority: %u.", GetLastError()); + } +#endif + if (progress >= 100) { char *result; size_t resultLen; ++++++ vmhgfs-2011.12.20.patch ++++++ diff -urN open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/file.c open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/file.c --- open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/file.c 2011-11-21 23:27:53.000000000 +0100 +++ open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/file.c 2011-12-22 01:56:24.000000000 +0100 @@ -83,6 +83,9 @@ static int HgfsFsync(struct file *file, #if defined VMW_FSYNC_OLD struct dentry *dentry, +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) + loff_t start, + loff_t end, #endif int datasync); static int HgfsMmap(struct file *file, @@ -989,6 +992,9 @@ HgfsFsync(struct file *file, // IN: File we operate on #if defined VMW_FSYNC_OLD struct dentry *dentry, // IN: Dentry for this file +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) + loff_t start, // IN: start of range to sync + loff_t end, // IN: end of range to sync #endif int datasync) // IN: fdatasync or fsync { diff -urN open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/filesystem.c open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/filesystem.c --- open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/filesystem.c 2011-11-21 23:27:53.000000000 +0100 +++ open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/filesystem.c 2011-12-22 01:56:24.000000000 +0100 @@ -83,6 +83,7 @@ static inline unsigned long HgfsComputeBlockBits(unsigned long blockSize); static compat_kmem_cache_ctor HgfsInodeCacheCtor; static HgfsSuperInfo *HgfsInitSuperInfo(HgfsMountInfo *mountInfo); +static struct dentry *HgfsGetRootDentry(struct super_block *sb); static int HgfsReadSuper(struct super_block *sb, void *rawData, int flags); @@ -326,6 +327,82 @@ /* + *---------------------------------------------------------------------------- + * + * HgfsGetRootDentry -- + * + * Gets the root dentry for a given super block. + * + * Results: + * A valid root dentry on success, NULL otherwise. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------------- + */ + +static struct dentry * +HgfsGetRootDentry(struct super_block *sb) // IN: Super block object +{ + struct dentry *rootDentry = NULL; + struct inode *rootInode; + + ASSERT(sb); + + LOG(6, (KERN_DEBUG "VMware hgfs: %s: entered\n", __func__)); + + rootInode = HgfsGetInode(sb, HGFS_ROOT_INO); + if (rootInode) { + HgfsInodeInfo *iinfo; + static const HgfsAttrInfo attr = { + .type = HGFS_FILE_TYPE_DIRECTORY, + .size = 4192, + .specialPerms = 0, + .ownerPerms = HGFS_PERM_READ | HGFS_PERM_EXEC, + .groupPerms = HGFS_PERM_READ | HGFS_PERM_EXEC, + .otherPerms = HGFS_PERM_READ | HGFS_PERM_EXEC, + .mask = HGFS_ATTR_VALID_TYPE | + HGFS_ATTR_VALID_SIZE | + HGFS_ATTR_VALID_SPECIAL_PERMS | + HGFS_ATTR_VALID_OWNER_PERMS | + HGFS_ATTR_VALID_GROUP_PERMS | + HGFS_ATTR_VALID_OTHER_PERMS, + }; + + /* + * On an allocation failure in read_super, the inode will have been + * marked "bad". If it was, we certainly don't want to start playing with + * the HgfsInodeInfo. So quietly put the inode back and fail. + */ + if (is_bad_inode(rootInode)) { + LOG(6, (KERN_DEBUG "VMware hgfs: %s: encountered bad inode\n", + __func__)); + iput(rootInode); + goto exit; + } + + HgfsChangeFileAttributes(rootInode, &attr); + + iinfo = INODE_GET_II_P(rootInode); + iinfo->isFakeInodeNumber = FALSE; + iinfo->isReferencedInode = TRUE; + } + + rootDentry = d_alloc_root(rootInode); + if (rootDentry == NULL) { + LOG(4, (KERN_WARNING "VMware hgfs: %s: Could not get " + "root dentry\n", __func__)); + goto exit; + } + + LOG(6, (KERN_DEBUG "VMware hgfs: %s: finished\n", __func__)); +exit: + return rootDentry; +} + + +/* *----------------------------------------------------------------------------- * * HgfsReadSuper -- @@ -354,10 +431,10 @@ void *rawData, // IN: Fs-specific mount data int flags) // IN: Mount flags { - int result; + int result = 0; HgfsSuperInfo *si; HgfsMountInfo *mountInfo; - struct dentry *rootDentry; + struct dentry *rootDentry = NULL; ASSERT(sb); @@ -401,26 +478,11 @@ sb->s_blocksize_bits = HgfsComputeBlockBits(HGFS_BLOCKSIZE); sb->s_blocksize = 1 << sb->s_blocksize_bits; - /* - * We can't use d_alloc_root() here directly because it requires a valid - * inode, which only HgfsInstantiate will create. So instead, we'll do the - * work in pieces. First we'll allocate the dentry and setup its parent - * and superblock. Then HgfsInstantiate will do the rest, issuing a getattr, - * getting the inode, and instantiating the dentry with it. - */ - rootDentry = compat_d_alloc_name(NULL, "/"); + rootDentry = HgfsGetRootDentry(sb); if (rootDentry == NULL) { - LOG(4, (KERN_WARNING "VMware hgfs: HgfsReadSuper: Could not allocate " - "root dentry\n")); - result = -ENOMEM; - goto exit; - } - rootDentry->d_parent = rootDentry; - rootDentry->d_sb = sb; - result = HgfsInstantiate(rootDentry, HGFS_ROOT_INO, NULL); - if (result) { LOG(4, (KERN_WARNING "VMware hgfs: HgfsReadSuper: Could not instantiate " "root dentry\n")); + result = -ENOMEM; goto exit; } sb->s_root = rootDentry; diff -urN open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/fsutil.c open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/fsutil.c --- open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/fsutil.c 2011-11-21 23:27:53.000000000 +0100 +++ open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/fsutil.c 2011-12-22 01:56:24.000000000 +0100 @@ -62,6 +62,31 @@ * Private function implementations. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) +/* + *---------------------------------------------------------------------------- + * + * set_nlink -- + * + * Set an inode's link count. + * + * Results: + * None + * + * Side effects: + * None + * + *---------------------------------------------------------------------------- + */ + +static inline void +set_nlink(struct inode *inode, unsigned int nlink) +{ + inode->i_nlink = nlink; +} +#endif + + /* *---------------------------------------------------------------------- * @@ -607,7 +632,7 @@ * account for '.' and ".."), and find printed a hard link error. So until * we have getattr support for nlink, everyone gets 1. */ - inode->i_nlink = 1; + set_nlink(inode, 1); /* * Use the stored uid and gid if we were given them at mount-time, or if diff -urN open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/Makefile open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/Makefile --- open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/Makefile 2011-11-21 23:27:53.000000000 +0100 +++ open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/Makefile 2011-12-22 01:56:24.000000000 +0100 @@ -46,7 +46,11 @@ VM_UNAME = $(shell uname -r) # Header directory for the running kernel +ifdef LINUXINCLUDE +HEADER_DIR = $(LINUXINCLUDE) +else HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include +endif BUILD_DIR = $(HEADER_DIR)/.. @@ -123,9 +127,9 @@ postbuild:: ; $(DRIVER_KO): prebuild - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ MODULEBUILDDIR=$(MODULEBUILDDIR) modules - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild endif diff -urN open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/tcp.c open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/tcp.c --- open-vm-tools-8.8.1-528969/modules/linux/vmhgfs/tcp.c 2011-11-21 23:27:53.000000000 +0100 +++ open-vm-tools-2011.12.20-562307/modules/linux/vmhgfs/tcp.c 2011-12-22 01:56:24.000000000 +0100 @@ -32,6 +32,7 @@ #include <linux/in.h> #include <linux/net.h> #include <linux/inet.h> +#include <linux/moduleparam.h> #include <linux/errno.h> #include <linux/kthread.h> ++++++ vmtoolsd ++++++ --- /var/tmp/diff_new_pack.df8lVA/_old 2012-02-14 19:04:38.000000000 +0100 +++ /var/tmp/diff_new_pack.df8lVA/_new 2012-02-14 19:04:38.000000000 +0100 @@ -13,10 +13,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -# USA. +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # # /etc/init.d/vmtoolsd # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
