2 files changed, 30 insertions, 3 deletions

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
new file mode 100644
index 0000000000..aad1b10b52
--- /dev/null
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
@@ -0,0 +1,26 @@
+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.4.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
index 217829193f..fa26a759dc 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.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.4.x \
+SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \
            file://tools.conf \
            file://vmtoolsd.service \
            file://vmtoolsd.init \
@@ -43,6 +43,7 @@ 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+)+)"
@@ -50,9 +51,9 @@ 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 = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3"
+SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134"
 
-S = "${WORKDIR}/git/open-vm-tools"
+S = "${UNPACKDIR}/${BP}/open-vm-tools"
 
 DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc"