From: John Wolfe <jwolfe@vmware.com>
Date: Sat, 19 Jun 2021 06:11:16 +0000 (-0700)
Subject: Resolve merge branch 'stable-11.3.x' conflict in 9 files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=677ddf97a85f8b96b95ac60f54b59df264d5c4d5;p=thirdparty%2Fopen-vm-tools.git

Resolve merge branch 'stable-11.3.x' conflict in 9 files.
---

diff --git a/open-vm-tools/lib/include/vm_legal.h b/open-vm-tools/lib/include/vm_legal.h
index b4d1c601d..a0130e736 100644
--- a/open-vm-tools/lib/include/vm_legal.h
+++ b/open-vm-tools/lib/include/vm_legal.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2020 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 efdbd61e8..25ba15dee 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1680,16 +1680,9 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_NEXT_V_MNR  3
 #define   TOOLS_VERSION_NEXT_V_BASE 0
 
-#ifndef RC_INVOKED
-#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V)
-#endif /* RC_INVOKED */
-#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_MJR  11
-#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_MNR  2
-#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_BASE 5
-
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1)
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
 
 /*
  * The extended Tools version is the current Tools version with the
diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index fd515ac63..119f974d6 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -145,9 +145,6 @@ ToolsCoreCleanup(ToolsServiceState *state)
    if (state->mainService && GuestStoreClient_DeInit()) {
       g_info("%s: De-initialized GuestStore client.\n", __FUNCTION__);
    }
-   if (state->mainService && ToolsNotify_End()) {
-      g_info("%s: End Tools notifications.\n", __FUNCTION__);
-   }
 #endif
 
 #if defined(_WIN32)
diff --git a/open-vm-tools/toolbox/l10n/zh_TW.vmsg b/open-vm-tools/toolbox/l10n/zh_TW.vmsg
index acf78c2c3..8bf78f6da 100644
--- a/open-vm-tools/toolbox/l10n/zh_TW.vmsg
+++ b/open-vm-tools/toolbox/l10n/zh_TW.vmsg
@@ -102,10 +102,6 @@ help.globalconf = "%1$s: 從 GuestStore 管理全域組態下載\n用法: %2$s %
 
 help.gueststore = "%1$s: 從 GuestStore 取得資源內容\n用法: %2$s %3$s <子命令>\n\n僅 ESX 客體的子命令:\n   getcontent < 資源路徑 > < 輸出檔案 >: 從 GuestStore 取得資源內容並儲存至輸出檔案。\n\n<資源路徑> 開頭為 /，代表 GuestStore 中的唯一資源。如果結尾為 /，則預設為擷取基礎的「metadata json」資源。\n\n<輸出檔案> 是要儲存資源內容的目標檔案路徑。\n"
 
-help.globalconf = "%1$s: 從 GuestStore 管理全域組態下載\n使用量: %2$s %3$s <子命令>\n\n僅 ESX 客體的子命令:\n   enable: 啟用全域組態模組。(工具服務已重新啟動)\n   disable: 停用全域組態模組 (工具服務已重新啟動)\n   refresh: 從 GuestStore 觸發全域組態的新下載\n   status: 列印全域組態模組的狀態\n"
-
-help.gueststore = "%1$s: 從 GuestStore 取得資源內容\n使用量: %2$s %3$s <子命令>\n\n僅 ESX 客體的子命令:\n   getcontent < 資源路徑 > < 輸出檔案 >: 從 GuestStore 取得資源內容並儲存至輸出檔案。\n\n<資源路徑> 開頭為 /，代表 GuestStore 中的唯一資源。如果結尾為 /，則預設為擷取基礎的「metadata json」資源。\n\n<輸出檔案> 是要儲存資源內容的目標檔案路徑。\n"
-
 help.hint = "如需詳細資訊，請嘗試「%1$s%2$s%3$s%4$s」。\n"
 
 help.info = "%1$s: 更新主機上的客體資訊\n使用方式: %2$s %3$s update <資訊類別>\n\n子命令:\n   update <資訊類別>: 更新依 <資訊類別> 識別之資訊\n<資訊類別> 可為「network」\n"
@@ -138,22 +134,6 @@ gueststore.error.client_lib = "「%1$s」失敗，GuestStore 用戶端程式庫
 
 gueststore.progress = "\r進度: %1$d%%"
 
-globalconf.refresh.failed  = "「%1$s」失敗，因為 globalconf 模組已停用。\n"
-
-globalconf.start_vmtools = "%1$s: 正在啟動 %2$s 服務。\n"
-
-globalconf.status = "globalconf 模組的狀態為「%1$s」\n"
-
-globalconf.stop_vmtools = "%1$s: 正在停止 %2$s 服務。\n"
-
-globalconf.update_config = "%1$s: 正在更新組態。\n"
-
-gueststore.content_size = "內容大小 (位元組): "
-
-gueststore.error.client_lib = "「%1$s」失敗，GuestStore 用戶端程式庫錯誤: %2$s。\n"
-
-gueststore.progress = "\r進度: %1$d%%"
-
 option.disabled = "已停用"
 
 option.enabled = "已啟用"
diff --git a/open-vm-tools/toolbox/toolbox-cmd.c b/open-vm-tools/toolbox/toolbox-cmd.c
index a32948e9b..6bde3747d 100644
--- a/open-vm-tools/toolbox/toolbox-cmd.c
+++ b/open-vm-tools/toolbox/toolbox-cmd.c
@@ -112,10 +112,6 @@ static CmdTable commands[] = {
 #if defined(_WIN32) || \
    (defined(__linux__) && !defined(OPEN_VM_TOOLS) && !defined(USERWORLD))
    { "upgrade",    Upgrade_Command,    TRUE,  TRUE,  Upgrade_Help},
-   { "gueststore", GuestStore_Command, TRUE,  FALSE, GuestStore_Help},
-#endif
-#if defined(_WIN32)
-   { "globalconf", GlobalConf_Command, TRUE,  TRUE,  GlobalConf_Help},
 #endif
 #if defined(_WIN32) || \
    (defined(__linux__) && !defined(USERWORLD))
diff --git a/open-vm-tools/toolbox/toolboxCmdInt.h b/open-vm-tools/toolbox/toolboxCmdInt.h
index 38407ea62..9dc4dab2d 100644
--- a/open-vm-tools/toolbox/toolboxCmdInt.h
+++ b/open-vm-tools/toolbox/toolboxCmdInt.h
@@ -153,11 +153,6 @@ DECLARE_COMMAND(Config);
 #if defined(_WIN32) || \
    (defined(__linux__) && !defined(OPEN_VM_TOOLS) && !defined(USERWORLD))
 DECLARE_COMMAND(Upgrade);
-DECLARE_COMMAND(GuestStore);
-#endif
-
-#if defined(_WIN32)
-DECLARE_COMMAND(GlobalConf)
 #endif
 
 #if defined(_WIN32) || \
diff --git a/open-vm-tools/toolbox/toolboxcmd-config.c b/open-vm-tools/toolbox/toolboxcmd-config.c
index c512170eb..a5c040adb 100644
--- a/open-vm-tools/toolbox/toolboxcmd-config.c
+++ b/open-vm-tools/toolbox/toolboxcmd-config.c
@@ -29,9 +29,6 @@
 
 #include "conf.h"
 #include "toolboxCmdInt.h"
-#if defined(_WIN32)
-#include "globalConfig.h"
-#endif
 #include "vmware/tools/i18n.h"
 #include "vmware/tools/utils.h"
 #include "vmware/tools/log.h"
diff --git a/open-vm-tools/toolbox/toolboxcmd-logging.c b/open-vm-tools/toolbox/toolboxcmd-logging.c
index 7295e8c5a..1c23bb7b0 100644
--- a/open-vm-tools/toolbox/toolboxcmd-logging.c
+++ b/open-vm-tools/toolbox/toolboxcmd-logging.c
@@ -38,9 +38,6 @@
 
 #include "conf.h"
 #include "toolboxCmdInt.h"
-#if defined(_WIN32)
-#include "globalConfig.h"
-#endif
 #include "vmware/tools/i18n.h"
 #include "vmware/tools/utils.h"
 #include "vmware/tools/log.h"
diff --git a/open-vm-tools/toolbox/toolboxcmd-scripts.c b/open-vm-tools/toolbox/toolboxcmd-scripts.c
index 8c488aa65..cc6b8c83b 100644
--- a/open-vm-tools/toolbox/toolboxcmd-scripts.c
+++ b/open-vm-tools/toolbox/toolboxcmd-scripts.c
@@ -33,9 +33,6 @@
 #include "guestApp.h"
 #include "system.h"
 #include "toolboxCmdInt.h"
-#if defined(_WIN32)
-#include "globalConfig.h"
-#endif
 #include "vmware/tools/i18n.h"
 #include "vmware/tools/utils.h"