Merge pull request #3052 from flatcar/vmware-13.0.0-main

Upgrade open-vm-tools in main from 12.5.2 to 13.0.0
This commit is contained in:
Mathieu Tortuyaux 2025-06-25 19:54:48 +02:00 committed by GitHub
commit 718793e121
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3 additions and 60 deletions

View File

@ -0,0 +1 @@
- open-vm-tools ([13.0.0](https://github.com/vmware/open-vm-tools/releases/tag/stable-13.0.0))

View File

@ -1 +1 @@
DIST open-vm-tools-12.5.2-24697584.tar.gz 4363141 BLAKE2B 87252f42368ffdb10c23861bea702c2cfd9a248289f3b5f1ba1cd891c76fdc5b9075a3c60c60b958244df3f4abe5b8738c386a9e6df20163bd6d27d853cc9ccd SHA512 19825e02f988b39134538dcb4f0365f8ccf3fae18e245bf61785ea885578881b5f6511aa544ca2b4b24f300a8a099f899a63178885b85ef4c808de18da331d54
DIST open-vm-tools-13.0.0-24696409.tar.gz 4341653 BLAKE2B e3c936f90f1e82b5548a1ecfb5a29edbff51b12f5d5b77f06ab1a6de59b0a6fd3701aa3dbd5883920a07417683e92108b33ef3e2d03c40592ec548e19674468a SHA512 eacb304f3c00d901ea2afffb09bb26be25b6b10df1de4f1818e7ce07a8c05b5e243c8fbe00a5fbf2680ad5b42727315f5c3fb9af818658ffc2b9425d3f34c37e

View File

@ -1,57 +0,0 @@
https://github.com/vmware/open-vm-tools/pull/732
From 9403500c9aac5be8c38b528e9cc0c711ba2f0151 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 4 Aug 2024 14:53:16 +0100
Subject: [PATCH 1/2] Also try using pkg-config to detect xmlsec
The xmlsec1-config script does not help when cross-compiling. pkg-config is
subsequently used for a version detection anyway.
---
open-vm-tools/configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 26b2e950..d46a51e2 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -879,7 +879,7 @@ if test "$enable_vgauth" = "yes" ; then
AC_VMW_DEFAULT_FLAGS([XMLSEC1])
AC_VMW_CHECK_LIB([xmlsec1],
[XMLSEC1],
- [],
+ [xmlsec1],
[xmlsec1-config],
[],
[xmlsec/xmlsec.h],
--
2.45.2
From b9f0bb3205039d2fa4e8d1f6d2e4d622f3ef97b1 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 4 Aug 2024 14:54:34 +0100
Subject: [PATCH 2/2] Respect the $PKG_CONFIG variable when checking the xmlsec
version
This particularly helps when cross-compiling.
---
open-vm-tools/configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index d46a51e2..39b9fa9c 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -884,7 +884,7 @@ if test "$enable_vgauth" = "yes" ; then
[],
[xmlsec/xmlsec.h],
[xmlSecCheckVersionExt],
- [XMLSEC1_VER=`pkg-config --modversion xmlsec1`
+ [XMLSEC1_VER=`$PKG_CONFIG --modversion xmlsec1`
xmlsec1_major_version="`echo $XMLSEC1_VER | cut -f1 -d. | cut -f1 -d-`"
xmlsec1_minor_version="`echo $XMLSEC1_VER | cut -f2 -d. | cut -f1 -d-`"
xmlsec1_micro_version="`echo $XMLSEC1_VER | cut -f3 -d. | cut -f1 -d-`"
--
2.45.2

View File

@ -5,7 +5,7 @@ EAPI=8
inherit autotools linux-info pam systemd udev
MY_P="${P}-24697584"
MY_P="${P}-24696409"
DESCRIPTION="Tools for VMware guests"
HOMEPAGE="https://github.com/vmware/open-vm-tools"
@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/10.1.0-Werror.patch
"${FILESDIR}"/11.3.5-icu.patch
"${FILESDIR}"/12.4.5-xmlsec1-pc.patch
)
pkg_setup() {