From: VMware, Inc <>
Date: Tue, 26 Apr 2011 21:35:09 +0000 (-0700)
Subject: Updating open-vm-tools version for release 2011.04.25-402641.
X-Git-Tag: 2011.04.25-402641
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cfaa309750635bcfafefbb4fa07edca20038dcf;p=thirdparty%2Fopen-vm-tools.git

Updating open-vm-tools version for release 2011.04.25-402641.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/ChangeLog b/open-vm-tools/ChangeLog
index 7a97fcc7a..18cf1851a 100644
--- a/open-vm-tools/ChangeLog
+++ b/open-vm-tools/ChangeLog
@@ -1,3 +1,8 @@
+2011.04.25  Marcelo Vanzin  <mvanzin@vmware.com>
+	This release tag contains commits up to the following id:
+	3112c27981074deb53e86e30e1c168d55e42220c
+
+
 2011.03.28  Marcelo Vanzin  <mvanzin@vmware.com>
 	This release tag contains commits up to the following id:
 	ec43520f5f3a50f5a980a73d22ae231380f97555
diff --git a/open-vm-tools/NEWS b/open-vm-tools/NEWS
index 6feb23bd9..1480535d8 100644
--- a/open-vm-tools/NEWS
+++ b/open-vm-tools/NEWS
@@ -1,3 +1,12 @@
+open-vm-tools 2011.04.25 changes:
+	* 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.
+
 open-vm-tools 2011.03.28 changes:
 	* HGFS mounter and vmusr's suid wrapper were changed to avoid
 	  issues with symlink attacks. A new mount utility for vmblock on
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index e866fa8a0..673f4aaf9 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -39,10 +39,10 @@
 ### Initialization
 ###
 
-TOOLS_VERSION="2011.03.28"
+TOOLS_VERSION="2011.04.25"
 AC_INIT(
    [open-vm-tools],
-   [2011.03.28],
+   [2011.04.25],
    [open-vm-tools-devel@lists.sourceforge.net])
 
 # In order to make this configure script auto-detect situations where
diff --git a/open-vm-tools/lib/include/buildNumber.h b/open-vm-tools/lib/include/buildNumber.h
index d521f5a0a..637cb6ffd 100644
--- a/open-vm-tools/lib/include/buildNumber.h
+++ b/open-vm-tools/lib/include/buildNumber.h
@@ -1,12 +1,12 @@
 #define BUILD_NUMBER \
-	"build-387002"
+	"build-402641"
 #define BUILD_NUMBER_NUMERIC \
-	387002
+	402641
 #define BUILD_NUMBER_NUMERIC_STRING \
-	"387002"
+	"402641"
 #define PRODUCT_BUILD_NUMBER \
-	"product-build-5114"
+	"product-build-5529"
 #define PRODUCT_BUILD_NUMBER_NUMERIC \
-	5114
+	5529
 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
-	"5114"
+	"5529"
diff --git a/open-vm-tools/modules/linux/dkms.conf b/open-vm-tools/modules/linux/dkms.conf
index 7a0e0f1c6..c8b6f8d4b 100644
--- a/open-vm-tools/modules/linux/dkms.conf
+++ b/open-vm-tools/modules/linux/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME=open-vm-tools
-PACKAGE_VERSION=2011.03.28
+PACKAGE_VERSION=2011.04.25
 MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \
                MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"
 
diff --git a/open-vm-tools/modules/linux/dkms.sh b/open-vm-tools/modules/linux/dkms.sh
index c0daeaf89..8ffa14e22 100644
--- a/open-vm-tools/modules/linux/dkms.sh
+++ b/open-vm-tools/modules/linux/dkms.sh
@@ -28,12 +28,12 @@ then
    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.03.28."
+   echo "The script will create an 'open-vm-tools' module with version 2011.04.25."
    exit 1
 fi
 
 src=$1
-dst=$2/open-vm-tools-2011.03.28
+dst=$2/open-vm-tools-2011.04.25
 
 SHARED_HEADERS="backdoor_def.h"
 SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h"