diff mbox series

[meta-networking,1/1] open-vm-tools: upgrade 12.5.0 -> 13.0.5

Message ID 20251008175021.2755554-1-rajeshkumar.ramasamy@windriver.com
State Under Review
Headers show
Series [meta-networking,1/1] open-vm-tools: upgrade 12.5.0 -> 13.0.5 | expand

Commit Message

Rajeshkumar Ramasamy Oct. 8, 2025, 5:50 p.m. UTC 
this release addressed below CVE:
CVE-2025-41244

Drop 0001-Fix-build-when-compiling-with-std-c23.patch which have been
merged upstream.

Changelog:
https://github.com/vmware/open-vm-tools/releases

Signed-off-by: Rajeshkumar Ramasamy <rajeshkumar.ramasamy@windriver.com>
---
 ...ix-build-when-compiling-with-std-c23.patch | 26 -------------------
 ...ools_12.5.0.bb => open-vm-tools_13.0.5.bb} |  5 ++--
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
 rename meta-networking/recipes-support/open-vm-tools/{open-vm-tools_12.5.0.bb => open-vm-tools_13.0.5.bb} (97%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
deleted file mode 100644
index aad1b10b52..0000000000
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Wed, 20 Nov 2024 10:40:03 +1100
-Subject: [PATCH] Fix build when compiling with -std=c23
-
-Fixes the build when using gcc 15
-
-Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
- open-vm-tools/lib/lock/ul.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
-index d376a98af..fc9fdb714 100644
---- a/open-vm-tools/lib/lock/ul.c
-+++ b/open-vm-tools/lib/lock/ul.c
-@@ -29,7 +29,7 @@
- static Bool mxInPanic = FALSE;  // track when involved in a panic
- static Bool mxUserCollectLockingTree = FALSE;
- 
--Bool (*MXUserTryAcquireForceFail)() = NULL;
-+Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
- 
- static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
- static void (*MXUserMxLockLister)(void) = NULL;
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb
similarity index 97%
rename from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
rename to meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb
index fa26a759dc..304d910940 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_13.0.5.bb
@@ -25,7 +25,7 @@  LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
 LICENSE:modules/linux = "GPL-2.0-only"
 LICENSE:modules/solaris = "CDDL-1.0"
 
-SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \
+SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-13.0.x \
            file://tools.conf \
            file://vmtoolsd.service \
            file://vmtoolsd.init \
@@ -43,7 +43,6 @@  SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
            file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
            file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
            file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
-           file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \
            "
 
 UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -51,7 +50,7 @@  UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
 SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
 "
 
-SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134"
+SRCREV = "fbc80ffbd226b4a61bb8ea1c9a682b5c7614e3fd"
 
 S = "${UNPACKDIR}/${BP}/open-vm-tools"