PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

open-vm-tools: update to 12.2.0

Browse Source
This commit is contained in:
Marcin Puc 2023-06-05 15:36:55 +02:00 committed by classabbyamp
parent 5a07c6004c
commit f25f694c40
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
View File

@ -22,18 +22,11 @@ The features we test for are:
This is needed for musl libc. 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 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 --- a/open-vm-tools/configure.ac
+++ b/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([ecvt])
AC_CHECK_FUNCS([fcvt]) AC_CHECK_FUNCS([fcvt])
@ -41,7 +34,7 @@ index 9aa95abb..941195c1 100644
AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
@@ -1088,9 +1089,12 @@ fi @@ -1388,9 +1389,12 @@ fi
### ###
AC_CHECK_HEADERS([crypt.h]) AC_CHECK_HEADERS([crypt.h])
@ -55,7 +48,7 @@ index 9aa95abb..941195c1 100644
AC_CHECK_HEADERS([sys/inttypes.h]) AC_CHECK_HEADERS([sys/inttypes.h])
AC_CHECK_HEADERS([sys/io.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 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 --- a/open-vm-tools/lib/misc/idLinux.c
+++ b/open-vm-tools/lib/misc/idLinux.c +++ b/open-vm-tools/lib/misc/idLinux.c
@@ -27,12 +27,9 @@ @@ -27,12 +27,9 @@
@ -72,7 +65,7 @@ index 1bb86f48..2116f2aa 100644
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/socket.h> #include <sys/socket.h>
#include <TargetConditionals.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 static Bool
IdIsSetUGid(void) IdIsSetUGid(void)
{ {
@ -106,10 +99,11 @@ index 1bb86f48..2116f2aa 100644
+#elif HAVE___SECURE_GETENV +#elif HAVE___SECURE_GETENV
static const char envName[] = "VMW_SETUGID_TEST"; 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 -#endif
+#else +#else
+ /* Android does not have a secure_getenv, so be conservative. */ + /* Android does not have a secure_getenv, so be conservative. */
@ -118,7 +112,7 @@ index 1bb86f48..2116f2aa 100644
} }
#endif #endif
diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c 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 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
@@ -35,9 +35,13 @@ @@ -35,9 +35,13 @@
@ -136,7 +130,7 @@ index 3363f3ac..b343196b 100644
# include <net/if.h> # include <net/if.h>
#endif #endif
#ifndef NO_DNET #ifndef NO_DNET
@@ -494,10 +498,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes, @@ -499,10 +503,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
* *
****************************************************************************** ******************************************************************************
*/ */

6
srcpkgs/open-vm-tools/template
View File

@ -1,6 +1,6 @@
# Template file for 'open-vm-tools' # Template file for 'open-vm-tools'
pkgname=open-vm-tools pkgname=open-vm-tools
version=12.1.5 version=12.2.0
revision=1 revision=1
archs="x86_64* i686* aarch64*" archs="x86_64* i686* aarch64*"
build_wrksrc="open-vm-tools" build_wrksrc="open-vm-tools"
@ -17,8 +17,8 @@ maintainer="Piraty <mail@piraty.dev>"
license="GPL-2.0-only, LGPL-2.1-only" license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/vmware/open-vm-tools" homepage="https://github.com/vmware/open-vm-tools"
changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/ReleaseNotes.md" 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" distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz"
checksum=678d08b46fba15f2b4c39245b5bc4deec30284d6f13ee279c233bc3d3627ec8a checksum=5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
build_options="pam x11" build_options="pam x11"
build_options_default="pam x11" build_options_default="pam x11"