main/open-vm-tools: upgrade to 10.0.0_p3000743

1 files changed, 22 insertions, 21 deletions

diff --git a/main/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch b/main/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
index b713137126..3674fd4456 100644
--- a/main/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
+++ b/main/open-vm-tools/0001-lib-misc-Recognize-Alpine-Linux.patch
@@ -1,38 +1,39 @@
-From 70438337a96f53019bfb3b5b928d9a9ab8067d64 Mon Sep 17 00:00:00 2001
+From 00a3692ad782758d95994798e038d6d6c3104d93 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 2 Jul 2012 15:48:35 +0200
-Subject: [PATCH] lib/misc: Recognize Alpine Linux
+Date: Thu, 5 Nov 2015 13:09:34 +0000
+Subject: [PATCH 01/11] lib/misc: Recognize Alpine Linux
 
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
 ---
- lib/include/guest_os.h   | 1 +
- lib/misc/hostinfoPosix.c | 3 +++
+ 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/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
-index ffced6d..49f30eb 100644
---- a/lib/include/guest_os.h
-+++ b/lib/include/guest_os.h
-@@ -152,6 +152,7 @@ typedef enum GuestOSFamilyType {
- #define STR_OS_ESX_5               "VMware ESX 5"
+diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
+index d5d190a..c788991 100644
+--- a/open-vm-tools/lib/include/guest_os.h
++++ b/open-vm-tools/lib/include/guest_os.h
+@@ -192,6 +192,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
+ #define STR_OS_ESX_6               "VMware ESX 6"
  
  /* Linux */
 +#define STR_OS_ALPINE              "Alpine"
  #define STR_OS_ANNVIX              "Annvix"
  #define STR_OS_ARCH                "Arch"
  #define STR_OS_ARKLINUX            "Arklinux"
-diff --git a/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 8fa18cc..9874c2a 100644
---- a/lib/misc/hostinfoPosix.c
-+++ b/lib/misc/hostinfoPosix.c
-@@ -185,6 +185,7 @@ static const DistroInfo distroArray[] = {
-    {"Gentoo",             "/etc/gentoo-release"},
-    {"Novell",             "/etc/nld-release"},
-    {"Ubuntu",             "/etc/lsb-release"},
+diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+index a9e7d6c..c5336c4 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"},
-@@ -545,6 +546,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
+@@ -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);
@@ -42,5 +43,5 @@ index 8fa18cc..9874c2a 100644
        Str_Strcpy(distroShort, STR_OS_ANNVIX, distroShortSize);
     } else if (strstr(distroLower, "arch")) {
 -- 
-1.7.11.1
+2.6.3