main/open-vm-tools: upgrade 10.3.5

Rebased the patches and skiped the ones that was fixed by upstream

Added check()

1 files changed, 0 insertions, 47 deletions

diff --git a/main/open-vm-tools/0002-lib-misc-Recognize-Alpine-Linux.patch b/main/open-vm-tools/0002-lib-misc-Recognize-Alpine-Linux.patch
deleted file mode 100644
index 4376858fb7..0000000000
--- a/main/open-vm-tools/0002-lib-misc-Recognize-Alpine-Linux.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 43576d1ca60cd89a8f65eb92e60d3c4db54c703e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 5 Nov 2015 13:09:34 +0000
-Subject: [PATCH 02/14] lib/misc: Recognize Alpine Linux
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- open-vm-tools/lib/include/guest_os.h   | 1 +
- open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
-index ef202e3c..da27ce8f 100644
---- a/open-vm-tools/lib/include/guest_os.h
-+++ b/open-vm-tools/lib/include/guest_os.h
-@@ -203,6 +203,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
- #define STR_OS_ESX_65              "VMware ESXi 6.5"
- 
- /* Linux */
-+#define STR_OS_ALPINE              "Alpine"
- #define STR_OS_ANNVIX              "Annvix"
- #define STR_OS_ARCH                "Arch"
- #define STR_OS_ARKLINUX            "Arklinux"
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 0f550706..68206789 100644
---- a/open-vm-tools/lib/misc/hostinfoPosix.c
-+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -176,6 +176,7 @@ typedef struct distro_info {
- 
- /* KEEP SORTED! (sort -d) */
- static const DistroInfo distroArray[] = {
-+   {"Alpine",             "/etc/alpine-release"},
-    {"Annvix",             "/etc/annvix-release"},
-    {"Arch",               "/etc/arch-release"},
-    {"Arklinux",           "/etc/arklinux-release"},
-@@ -558,6 +559,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
-       Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize);
-    } else if (strstr(distroLower, "sun")) {
-       Str_Strcpy(distroShort, STR_OS_SUN_DESK, distroShortSize);
-+   } else if (strstr(distroLower, "alpine")) {
-+      Str_Strcpy(distroShort, STR_OS_ALPINE, distroShortSize);
-    } else if (strstr(distroLower, "annvix")) {
-       Str_Strcpy(distroShort, STR_OS_ANNVIX, distroShortSize);
-    } else if (strstr(distroLower, "arch")) {
--- 
-2.11.0
-