mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 13:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/open-vm-tools: upgrade to 12.2.0

Browse Source
This commit is contained in:
psykose 2023-03-10 02:49:21 +00:00
parent d5510f1585
commit a139e712c8
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
community/open-vm-tools/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
View File

@ -26,10 +26,10 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
3 files changed, 24 insertions(+), 21 deletions(-) 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 5dc0be2b..3b439e8d 100644 index 5f9a193..b3a8ed2 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
@@ -897,6 +897,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])
@ -37,7 +37,7 @@ index 5dc0be2b..3b439e8d 100644
AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
@@ -1145,10 +1146,13 @@ fi @@ -1388,10 +1389,13 @@ fi
### ###
AC_CHECK_HEADERS([crypt.h]) AC_CHECK_HEADERS([crypt.h])
@ -52,7 +52,7 @@ index 5dc0be2b..3b439e8d 100644
AC_CHECK_HEADERS([sys/io.h]) AC_CHECK_HEADERS([sys/io.h])
AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD
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 b950cf84..1dcfb508 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 @@
@ -69,7 +69,7 @@ index b950cf84..1dcfb508 100644
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/socket.h> #include <sys/socket.h>
#include <TargetConditionals.h> #include <TargetConditionals.h>
@@ -997,31 +994,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)
{ {
@ -103,10 +103,11 @@ index b950cf84..1dcfb508 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. */
@ -115,7 +116,7 @@ index b950cf84..1dcfb508 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 a22981d5..ddc37e09 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 @@
@ -133,7 +134,7 @@ index a22981d5..ddc37e09 100644
# include <net/if.h> # include <net/if.h>
#endif #endif
#ifndef NO_DNET #ifndef NO_DNET
@@ -494,10 +498,7 @@ @@ -499,10 +503,7 @@ GuestInfoGetNicInfo(unsigned int maxIPv4Routes,
* *
****************************************************************************** ******************************************************************************
*/ */

8
community/open-vm-tools/APKBUILD
View File

@ -1,10 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=open-vm-tools pkgname=open-vm-tools
pkgver=12.1.5 pkgver=12.2.0
_pkgsubver=${pkgver#*_p} _pkgsubver=${pkgver#*_p}
_ver=${pkgver/_p/-} _ver=${pkgver/_p/-}
pkgrel=1 pkgrel=0
pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
url="https://github.com/vmware/open-vm-tools/" url="https://github.com/vmware/open-vm-tools/"
arch="aarch64 x86 x86_64" arch="aarch64 x86 x86_64"
@ -266,13 +266,13 @@ _all() {
} }
sha512sums=" sha512sums="
539181a02c3534a35da53c9b01c2234021612f3cb83d5ddca78c7124a7e191d05e96654c35c802c86daf707e1bfe641615fe49a6b8c31af636ca1addea095655 open-vm-tools-12.1.5.tar.gz e751efbba931755ec314bc98e52da8bfae3d6692115e8884b2f810e12c6c727388bb68052e7641d24bbb7b6e549b84e7275a5d05ac85c4371f500dec503c286a open-vm-tools-12.2.0.tar.gz
c2ebf6e59cef79d9e981bd571a6991ed9eae26d1934f4fecc73136c29291383c0d4bd2e38c68183a5e56900def709227e7f09b4352bbf8d2c12f879bdb1866dd 0001-lib-misc-Recognize-Alpine-Linux.patch c2ebf6e59cef79d9e981bd571a6991ed9eae26d1934f4fecc73136c29291383c0d4bd2e38c68183a5e56900def709227e7f09b4352bbf8d2c12f879bdb1866dd 0001-lib-misc-Recognize-Alpine-Linux.patch
9188161f9bbd6572ee20855e727257b2140b39f1ba19b96879eb9878fb08cbdb7c3a5c9f5f8a4f389090acea6f71ee88fb36c7d4a74c1b8b94c9124db696a7f2 0002-open-vm-tools-Add-disable-werror-configure-option.patch 9188161f9bbd6572ee20855e727257b2140b39f1ba19b96879eb9878fb08cbdb7c3a5c9f5f8a4f389090acea6f71ee88fb36c7d4a74c1b8b94c9124db696a7f2 0002-open-vm-tools-Add-disable-werror-configure-option.patch
1dd0cde6ee19aec77ddf803e95b0404e803569a38c7b3d001832b4bbeae95ea15ed32c59f27bffb315130bad0c7a788a7a522df13a5f265f66c4c7c302a1966d 0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch 1dd0cde6ee19aec77ddf803e95b0404e803569a38c7b3d001832b4bbeae95ea15ed32c59f27bffb315130bad0c7a788a7a522df13a5f265f66c4c7c302a1966d 0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch
c647561c72b3ad919502ec4dd0a1ab736e2d479d8437b882791adce5417d8c26163ecffe9e212dab633c513bce6447cdbcb610eecf7dbb0eeeb792db16301de5 0004-Use-configure-test-for-struct-timespec.patch c647561c72b3ad919502ec4dd0a1ab736e2d479d8437b882791adce5417d8c26163ecffe9e212dab633c513bce6447cdbcb610eecf7dbb0eeeb792db16301de5 0004-Use-configure-test-for-struct-timespec.patch
6b0b9cc4a7b9837649a01aacb957b4465ec901250e48dbb273514abedf8eb3a9c16b3ad09be413a8ab897e37dff0d065a3144a2418cd7ae5aa3020bd1ed14203 0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch 6b0b9cc4a7b9837649a01aacb957b4465ec901250e48dbb273514abedf8eb3a9c16b3ad09be413a8ab897e37dff0d065a3144a2418cd7ae5aa3020bd1ed14203 0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
4d6ce73d7e3fa554e31d7956b26e1d0341b57ff477d3e1386f30d7e1acb38cf3f6d8a3f918a484f64acf3e5c0f2ef898027963b8b87949669d3308eb9c185d82 0006-Use-configure-to-test-for-feature-instead-of-platfor.patch 10a684b7c558f40bd5f22e0e369b9bbc84ade258acc13d82793529f1788a991adccdb9b9c36ad6cdcb15dc1ff8f620d7813bf910b45a460019f74ad4977af0b8 0006-Use-configure-to-test-for-feature-instead-of-platfor.patch
9d28eab3e1a40138efa05e78956a2615b171703f9689252d0960145e39b0ba5bbf0e2007479cbbca3dced89ccb45758908a57a2f5b361e4813ad67a0732e4539 0007-Use-configure-test-for-sys-stat.h-include.patch 9d28eab3e1a40138efa05e78956a2615b171703f9689252d0960145e39b0ba5bbf0e2007479cbbca3dced89ccb45758908a57a2f5b361e4813ad67a0732e4539 0007-Use-configure-test-for-sys-stat.h-include.patch
03579b28ecc446c6a16256be8b53dcb9b5f90d05ea52aad77997f2a7957d63af546182872b2ad2ed2f99904a22be23fc64ced4ecac91a53646d9946bd6d13625 0008-Rename-poll.h-to-vm_poll.h.patch 03579b28ecc446c6a16256be8b53dcb9b5f90d05ea52aad77997f2a7957d63af546182872b2ad2ed2f99904a22be23fc64ced4ecac91a53646d9946bd6d13625 0008-Rename-poll.h-to-vm_poll.h.patch
6c8b99f51bc0fd114ce66a3311f151efbe56ec308d079afec837b9d0b60eae3fb42e1b5219246c1015a23fb63616398b958e1388830b80d5efdb27cce7bd6552 0010-use-posix-strerror_r-unless-gnu.patch 6c8b99f51bc0fd114ce66a3311f151efbe56ec308d079afec837b9d0b60eae3fb42e1b5219246c1015a23fb63616398b958e1388830b80d5efdb27cce7bd6552 0010-use-posix-strerror_r-unless-gnu.patch