From: Dyno Hongjun Fu Date: Tue, 24 Nov 2015 06:33:40 +0000 (-0800) Subject: version bump to 10.0.5 X-Git-Tag: stable-10.0.5~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75dbce79523a0145345f97afcdc06bed11dc46f;p=thirdparty%2Fopen-vm-tools.git version bump to 10.0.5 --- diff --git a/open-vm-tools/configure b/open-vm-tools/configure index f27247836..62cf44796 100755 --- a/open-vm-tools/configure +++ b/open-vm-tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for open-vm-tools 10.0.0. +# Generated by GNU Autoconf 2.61 for open-vm-tools 10.0.5. # # Report bugs to . # @@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='open-vm-tools' PACKAGE_TARNAME='open-vm-tools' -PACKAGE_VERSION='10.0.0' -PACKAGE_STRING='open-vm-tools 10.0.0' +PACKAGE_VERSION='10.0.5' +PACKAGE_STRING='open-vm-tools 10.0.5' PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net' ac_unique_file="checkvm/checkvm.c" @@ -1517,7 +1517,7 @@ if test "$ac_init_help" = "long"; then # 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 10.0.0 to adapt to many kinds of systems. +\`configure' configures open-vm-tools 10.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1591,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of open-vm-tools 10.0.0:";; + short | recursive ) echo "Configuration of open-vm-tools 10.0.5:";; esac cat <<\_ACEOF @@ -1723,7 +1723,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -open-vm-tools configure 10.0.0 +open-vm-tools configure 10.0.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1737,7 +1737,7 @@ cat >config.log <<_ACEOF 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 10.0.0, which was +It was created by open-vm-tools $as_me 10.0.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2744,7 +2744,7 @@ fi # Define the identity of the package. PACKAGE='open-vm-tools' - VERSION='10.0.0' + VERSION='10.0.5' cat >>confdefs.h <<_ACEOF @@ -31992,7 +31992,7 @@ exec 6>&1 # 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 10.0.0, which was +This file was extended by open-vm-tools $as_me 10.0.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32039,7 +32039,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -open-vm-tools config.status 10.0.0 +open-vm-tools config.status 10.0.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac index ebdf17ce2..04e3bac2e 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -39,10 +39,10 @@ ### Initialization ### -TOOLS_VERSION="10.0.0" +TOOLS_VERSION="10.0.5" AC_INIT( [open-vm-tools], - [10.0.0], + [10.0.5], [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/bsdfmt.h b/open-vm-tools/lib/include/bsdfmt.h index c341248e0..108edb385 100644 --- a/open-vm-tools/lib/include/bsdfmt.h +++ b/open-vm-tools/lib/include/bsdfmt.h @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright 2008-2014 VMware, Inc. All rights reserved. + * Copyright 2008-2014 VMware, Inc. All rights reserved. -- VMware Confidential * **********************************************************/ /* diff --git a/open-vm-tools/lib/include/buildNumber.h b/open-vm-tools/lib/include/buildNumber.h index 9862eae2d..8febfc28d 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-3000743" + "build-3227872" #define BUILD_NUMBER_NUMERIC \ - 3000743 + 3227872 #define BUILD_NUMBER_NUMERIC_STRING \ - "3000743" + "3227872" #define PRODUCT_BUILD_NUMBER \ - "product-build-50046" + "product-build-52125" #define PRODUCT_BUILD_NUMBER_NUMERIC \ - 50046 + 52125 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \ - "50046" + "52125" diff --git a/open-vm-tools/lib/include/vmGuestLib.h b/open-vm-tools/lib/include/vmGuestLib.h index 59339019b..825cd1752 100644 --- a/open-vm-tools/lib/include/vmGuestLib.h +++ b/open-vm-tools/lib/include/vmGuestLib.h @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2003-2015 VMware, Inc. All rights reserved. + * Copyright (C) 2003-2008 VMware, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h index b952c5b24..d1781df2b 100644 --- a/open-vm-tools/lib/include/vm_tools_version.h +++ b/open-vm-tools/lib/include/vm_tools_version.h @@ -1339,9 +1339,16 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion, // IN #define TOOLS_VERSION_TORQUE_WRENCH_RELEASE_V_MNR 0 #define TOOLS_VERSION_TORQUE_WRENCH_RELEASE_V_BASE 0 -#define TOOLS_VERSION_CURRENT TOOLS_VERSION_TORQUE_WRENCH_RELEASE -#define TOOLS_VERSION_CURRENT_STR TOOLS_VERSION_TO_STR(TOOLS_VERSION_TORQUE_WRENCH_RELEASE) -#define TOOLS_VERSION_CURRENT_CSV TOOLS_VERSION_TO_CSV(TOOLS_VERSION_TORQUE_WRENCH_RELEASE) +#ifndef RC_INVOKED +#define TOOLS_VERSION_TORQUE_WRENCH_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_TORQUE_WRENCH_UPDATE1_V) +#endif /* RC_INVOKED */ +#define TOOLS_VERSION_TORQUE_WRENCH_UPDATE1_V_MJR 10 +#define TOOLS_VERSION_TORQUE_WRENCH_UPDATE1_V_MNR 0 +#define TOOLS_VERSION_TORQUE_WRENCH_UPDATE1_V_BASE 5 + +#define TOOLS_VERSION_CURRENT TOOLS_VERSION_TORQUE_WRENCH_UPDATE1 +#define TOOLS_VERSION_CURRENT_STR TOOLS_VERSION_TO_STR(TOOLS_VERSION_TORQUE_WRENCH_UPDATE1) +#define TOOLS_VERSION_CURRENT_CSV TOOLS_VERSION_TO_CSV(TOOLS_VERSION_TORQUE_WRENCH_UPDATE1) /* * The extended Tools version is the current Tools version with the diff --git a/open-vm-tools/lib/unicode/unicodeSimpleCaseFolding.c b/open-vm-tools/lib/unicode/unicodeSimpleCaseFolding.c index 9ca294c7d..6e533320a 100644 --- a/open-vm-tools/lib/unicode/unicodeSimpleCaseFolding.c +++ b/open-vm-tools/lib/unicode/unicodeSimpleCaseFolding.c @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright 2007-2014 VMware, Inc. All rights reserved. + * Copyright 2007-2014 VMware, Inc. All rights reserved. -- VMware Confidential * **********************************************************/ /* diff --git a/open-vm-tools/modules/freebsd/vmblock/subr.c b/open-vm-tools/modules/freebsd/vmblock/subr.c index 3c2acf841..d36c0996f 100644 --- a/open-vm-tools/modules/freebsd/vmblock/subr.c +++ b/open-vm-tools/modules/freebsd/vmblock/subr.c @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright 2007-2014 VMware, Inc. All rights reserved. + * Copyright 2007-2014 VMware, Inc. All rights reserved. -- VMware Confidential * **********************************************************/ /* diff --git a/open-vm-tools/modules/freebsd/vmblock/vfsops.c b/open-vm-tools/modules/freebsd/vmblock/vfsops.c index c9f080c91..1bc6f49cb 100644 --- a/open-vm-tools/modules/freebsd/vmblock/vfsops.c +++ b/open-vm-tools/modules/freebsd/vmblock/vfsops.c @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright 2007-2014 VMware, Inc. All rights reserved. + * Copyright 2007-2014 VMware, Inc. All rights reserved. -- VMware Confidential * **********************************************************/ /* diff --git a/open-vm-tools/modules/freebsd/vmblock/vnops.c b/open-vm-tools/modules/freebsd/vmblock/vnops.c index 84c95f053..b49925c8e 100644 --- a/open-vm-tools/modules/freebsd/vmblock/vnops.c +++ b/open-vm-tools/modules/freebsd/vmblock/vnops.c @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright 2007-2014 VMware, Inc. All rights reserved. + * Copyright 2007-2014 VMware, Inc. All rights reserved. -- VMware Confidential * **********************************************************/ /* diff --git a/open-vm-tools/modules/linux/dkms.conf b/open-vm-tools/modules/linux/dkms.conf index 4c75c0f6b..b7144fb84 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=10.0.0 +PACKAGE_VERSION=10.0.5 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 ae9e748c0..7696edb2a 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 10.0.0." + echo "The script will create an 'open-vm-tools' module with version 10.0.5." exit 1 fi src=$1 -dst=$2/open-vm-tools-10.0.0 +dst=$2/open-vm-tools-10.0.5 SHARED_HEADERS="backdoor_def.h" SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h"