Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Jan 2026 12:29:47 +0000
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ab03bce0a568 - main - emulators/open-vm-tools: Fix build after 1600010
Message-ID:  <6978afbb.aa61.278a336d@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ab03bce0a568792890df28bee8c6cd3708fdf78d

commit ab03bce0a568792890df28bee8c6cd3708fdf78d
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2026-01-27 12:26:11 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2026-01-27 12:29:30 +0000

    emulators/open-vm-tools: Fix build after 1600010
    
    After ac5a19ec6989675c8ec6c3ca245dba243d1a6416, xdrproc_t was changed to
    always take 2 parameters.  Removing 3rd parameter keeps it working on
    older versions.
    
    PR:             292755
    MFH:            2026Q1
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 emulators/open-vm-tools/Makefile                     |  1 +
 .../open-vm-tools/files/patch-lib_dynxdr_xdrutil.c   | 11 +++++++++++
 .../files/patch-lib_rpcChannel_rpcChannel.c          | 20 ++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 0170a949bc17..47aa4058a7dd 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	open-vm-tools
 PORTVERSION=	13.0.5
 DISTVERSIONPREFIX=	stable-
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	emulators
 
diff --git a/emulators/open-vm-tools/files/patch-lib_dynxdr_xdrutil.c b/emulators/open-vm-tools/files/patch-lib_dynxdr_xdrutil.c
new file mode 100644
index 000000000000..48ebe4231ba1
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_dynxdr_xdrutil.c
@@ -0,0 +1,11 @@
+--- lib/dynxdr/xdrutil.c.orig	2026-01-27 11:15:15 UTC
++++ lib/dynxdr/xdrutil.c
+@@ -102,7 +102,7 @@ XdrUtil_Deserialize(const void *data,  // IN
+    ASSERT(dest != NULL);
+ 
+    xdrmem_create(&xdrs, (char *) data, dataLen, XDR_DECODE);
+-   ret = (Bool) proc(&xdrs, dest, 0);
++   ret = (Bool) proc(&xdrs, dest);
+    xdr_destroy(&xdrs);
+ 
+    if (!ret) {
diff --git a/emulators/open-vm-tools/files/patch-lib_rpcChannel_rpcChannel.c b/emulators/open-vm-tools/files/patch-lib_rpcChannel_rpcChannel.c
new file mode 100644
index 000000000000..d93f2b9fbfd3
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_rpcChannel_rpcChannel.c
@@ -0,0 +1,20 @@
+--- lib/rpcChannel/rpcChannel.c.orig	2026-01-27 11:15:50 UTC
++++ lib/rpcChannel/rpcChannel.c
+@@ -308,7 +308,7 @@ RpcChannelXdrWrapper(RpcInData *data,
+          goto exit;
+       }
+ 
+-      if (!xdrProc(&xdrs, copy.result, 0)) {
++      if (!xdrProc(&xdrs, copy.result)) {
+          ret = RPCIN_SETRETVALS(data, "XDR serialization failed.", FALSE);
+ 
+          /*
+@@ -378,7 +378,7 @@ RpcChannel_BuildXdrCommand(const char *cmd,
+       goto exit;
+    }
+ 
+-   if (!proc(&xdrs, xdrData, 0)) {
++   if (!proc(&xdrs, xdrData)) {
+       goto exit;
+    }
+ 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6978afbb.aa61.278a336d>