From b4638782b99b59caf0927c0227b9bf08ff98420d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 5 Jun 2023 15:36:55 +0200
Subject: [PATCH] open-vm-tools: update to 12.2.0

---
 ...-test-for-feature-instead-of-platfor.patch | 28 ++++++++-----------
 srcpkgs/open-vm-tools/template                |  6 ++--
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
index f6c0c084d5412c..4dea9a6b417313 100644
--- a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
+++ b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
@@ -22,18 +22,11 @@ The features we test for are:
 
 This is needed for musl libc.
 
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- open-vm-tools/configure.ac               |  4 ++++
- open-vm-tools/lib/misc/idLinux.c         | 30 +++++++++++-------------
- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 11 +++++----
- 3 files changed, 24 insertions(+), 21 deletions(-)
-
 diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
-index 9aa95abb..941195c1 100644
+index 5f9a193..a846dff 100644
 --- a/open-vm-tools/configure.ac
 +++ b/open-vm-tools/configure.ac
-@@ -879,6 +879,7 @@ AC_CHECK_FUNCS(
+@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS(
  
  AC_CHECK_FUNCS([ecvt])
  AC_CHECK_FUNCS([fcvt])
@@ -41,7 +34,7 @@ index 9aa95abb..941195c1 100644
  
  AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
  
-@@ -1088,9 +1089,12 @@ fi
+@@ -1388,9 +1389,12 @@ fi
  ###
  
  AC_CHECK_HEADERS([crypt.h])
@@ -55,7 +48,7 @@ index 9aa95abb..941195c1 100644
  AC_CHECK_HEADERS([sys/inttypes.h])
  AC_CHECK_HEADERS([sys/io.h])
 diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
-index 1bb86f48..2116f2aa 100644
+index 3d7d1e3..0e12ac5 100644
 --- a/open-vm-tools/lib/misc/idLinux.c
 +++ b/open-vm-tools/lib/misc/idLinux.c
 @@ -27,12 +27,9 @@
@@ -72,7 +65,7 @@ index 1bb86f48..2116f2aa 100644
  #ifdef __APPLE__
  #include <sys/socket.h>
  #include <TargetConditionals.h>
-@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid)  // IN:
+@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid)  // IN:
  static Bool
  IdIsSetUGid(void)
  {
@@ -106,10 +99,11 @@ index 1bb86f48..2116f2aa 100644
 +#elif HAVE___SECURE_GETENV
     static const char envName[] = "VMW_SETUGID_TEST";
  
-    if (setenv(envName, "1", TRUE) == -1) {
-       return TRUE; /* Conservative */
+    /*
+@@ -1062,7 +1058,9 @@ IdIsSetUGid(void)
+       return secure_getenv(envName) == NULL;
     }
-    return __secure_getenv(envName) == NULL;
+    return TRUE;
 -#endif
 +#else
 +   /* Android does not have a secure_getenv, so be conservative. */
@@ -118,7 +112,7 @@ index 1bb86f48..2116f2aa 100644
  }
  #endif
 diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
-index 3363f3ac..b343196b 100644
+index de57a4a..7a132ee 100644
 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
 @@ -35,9 +35,13 @@
@@ -136,7 +130,7 @@ index 3363f3ac..b343196b 100644
  # include <net/if.h>
  #endif
  #ifndef NO_DNET
-@@ -494,10 +498,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
+@@ -499,10 +503,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
   *
   ******************************************************************************
   */
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 6e4e19bfdd5ef6..67ee6db8275ddf 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
-version=12.1.5
+version=12.2.0
 revision=1
 archs="x86_64* i686* aarch64*"
 build_wrksrc="open-vm-tools"
@@ -17,8 +17,8 @@ maintainer="Piraty <mail@piraty.dev>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/vmware/open-vm-tools"
 changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md"
-distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
-checksum=678d08b46fba15f2b4c39245b5bc4deec30284d6f13ee279c233bc3d3627ec8a
+distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
+checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
 
 build_options="pam x11"
 build_options_default="pam x11"