CVS commit: pkgsrc/sysutils/open-vm-tools

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov 17 17:38:39 UTC 2025

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile distinfo
        pkgsrc/sysutils/open-vm-tools/patches:
            patch-services_plugins_guestInfo_perfMonLinux.c
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-lib_misc_codesetOld.c
Removed Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-ba

Log Message:
open-vm-tools: updated to 12.5.4

12.5.4

This release resolves CVE-2025-41244. For more information on this vulnerability and its impact on Broadcom products, see VMSA-2025-0015.

A patch to address CVE-2025-41244 on earlier open-vm-tools releases is provided to the Linux community at CVE-2025-41244.patch.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/open-vm-tools/patches/patch-ba
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_codesetOld.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.143 pkgsrc/sysutils/open-vm-tools/Makefile:1.144
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.143        Thu Oct 23 20:39:25 2025
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Mon Nov 17 17:38:39 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.143 2025/10/23 20:39:25 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2025/11/17 17:38:39 adam Exp $
 
-OVTVER=                12.5.2
-DISTNAME=      open-vm-tools-${OVTVER}-24697584
+OVTVER=                12.5.4
+DISTNAME=      open-vm-tools-${OVTVER}-24964629
 PKGNAME=       open-vm-tools-${OVTVER}
-PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 GITHUB_RELEASE=        stable-${OVTVER}
@@ -20,8 +19,8 @@ CXXFLAGS+=    -DGLIB_VERSION_MIN_REQUIRED=G
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-USE_LANGUAGES=         c gnu++11
-USE_CXX_FEATURES+=     c++11
+USE_CXX_FEATURES=      gnu++11
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            autoconf automake pkg-config
 GNU_CONFIGURE=         yes
@@ -54,10 +53,11 @@ pre-configure:
        cd ${WRKSRC} && autoreconf -f -i
 
 post-install:
-       mv ${DESTDIR}${PKG_SYSCONFDIR}/tools.conf.example \
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/tools.conf.example \
                ${DESTDIR}${EGDIR}/tools.conf
 
 .include "options.mk"
+
 .include "../../archivers/libmspack/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.44 pkgsrc/sysutils/open-vm-tools/distinfo:1.45
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.44 Tue May 13 03:50:40 2025
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Mon Nov 17 17:38:39 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2025/05/13 03:50:40 adam Exp $
+$NetBSD: distinfo,v 1.45 2025/11/17 17:38:39 adam Exp $
 
-BLAKE2s (open-vm-tools-12.5.2-24697584.tar.gz) = 23114b60d349eef9c7159f93b4a97d42e75cc73f38d1458aa5f4d6fc0c11aadf
-SHA512 (open-vm-tools-12.5.2-24697584.tar.gz) = 19825e02f988b39134538dcb4f0365f8ccf3fae18e245bf61785ea885578881b5f6511aa544ca2b4b24f300a8a099f899a63178885b85ef4c808de18da331d54
-Size (open-vm-tools-12.5.2-24697584.tar.gz) = 4363141 bytes
+BLAKE2s (open-vm-tools-12.5.4-24964629.tar.gz) = 2bea849240363a2b4f256054dff95876bd8ed622e8f71d0e29e2881995c5cd15
+SHA512 (open-vm-tools-12.5.4-24964629.tar.gz) = 328265a8de09d0bf4922c24cd8165e671b331ae29613fce81948450b20588261faa7cc28357966e5ff27ebc266f001373ed9a94956c65a0febc9ae220a5fb9f3
+Size (open-vm-tools-12.5.4-24964629.tar.gz) = 4364808 bytes
 SHA1 (patch-Makefile.am) = 0f0345ea4d092c34a2b99beec43b64035c658433
 SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
 SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
@@ -15,7 +15,6 @@ SHA1 (patch-at) = 6dbe029926e18075eedf9e
 SHA1 (patch-au) = bcacf757f1badbb1ef31dd6f7b438e974ac0d62c
 SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
 SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
-SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732
 SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
 SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
@@ -36,6 +35,7 @@ SHA1 (patch-lib_include_sigPosixRegs.h) 
 SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
 SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
 SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
+SHA1 (patch-lib_misc_codesetOld.c) = 925f5f3abdd475969f4cbcee31b0e0fd4856e620
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 91f0540de32172c3d4049828f34f66c143dae857
 SHA1 (patch-lib_misc_vthreadBase.c) = 341ffe3d7d484cf952dace1daa127e2e0a82e35a
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
@@ -47,7 +47,7 @@ SHA1 (patch-network) = 21a9196b4ce610145
 SHA1 (patch-scripts_Makefile.am) = 30ca9cef3fb39018cdee2e0b5847945abc98c160
 SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
 SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
-SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = be7912f53989d298b5965cb566085cd0a0e5cc90
+SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = 05ad0a1a290e104e6355b20d1f285594019e09b4
 SHA1 (patch-services_plugins_timeSync_Makefile.am) = ae246998326e5c7f6adb6d7eebc318ba8c8af786
 SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d
 SHA1 (patch-services_vmtoolsd_Makefile.am) = 558ed58e8fc6d933f0a9698c865b33f88a91c51c

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c:1.1   Tue Dec  7 18:25:46 2021
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c       Mon Nov 17 17:38:39 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-services_plugins_guestInfo_perfMonLinux.c,v 1.1 2021/12/07 18:25:46 adam Exp $
+$NetBSD: patch-services_plugins_guestInfo_perfMonLinux.c,v 1.2 2025/11/17 17:38:39 adam Exp $
 
 uselocale() is not available in NetBSD.
 
---- services/plugins/guestInfo/perfMonLinux.c.orig     2021-12-07 13:15:52.237512911 +0000
+--- services/plugins/guestInfo/perfMonLinux.c.orig     2025-09-18 01:06:27.000000000 +0000
 +++ services/plugins/guestInfo/perfMonLinux.c
 @@ -1587,7 +1587,7 @@ GuestInfoTakeSample(DynBuf *statBuf)  //
      */
     newLoc = newlocale(LC_ALL_MASK, "C", (locale_t)0);
     if (newLoc != (locale_t)0) {
 -      prevLoc = uselocale(newLoc);
-+      prevLoc = setlocale(LC_ALL, newLoc);
++      prevLoc = (locale_t)setlocale(LC_ALL, (const char *)newLoc);
     } else {
        g_warning("%s: newlocale failed, error=%d.\n", __FUNCTION__, errno);
     }
@@ -18,7 +18,7 @@ uselocale() is not available in NetBSD.
     if (newLoc != (locale_t)0) {
        /* Restore thread previous locale */
 -      uselocale(prevLoc);
-+      setlocale(LC_ALL, prevLoc);
++      setlocale(LC_ALL, (const char *)prevLoc);
        freelocale(newLoc);
     }
  

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_codesetOld.c
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_codesetOld.c:1.1
--- /dev/null   Mon Nov 17 17:38:39 2025
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_codesetOld.c   Mon Nov 17 17:38:39 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_misc_codesetOld.c,v 1.1 2025/11/17 17:38:39 adam Exp $
+
+--- lib/misc/codesetOld.c.orig 2025-09-18 01:06:36.000000000 +0000
++++ lib/misc/codesetOld.c
+@@ -662,7 +662,7 @@ CodeSetOldGetCodeSetFromLocale(void)
+    codeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new));
+    freelocale(new);
+ 
+-#elif defined(sun)
++#elif defined(sun) || defined(__NetBSD__)
+ 
+    char *locale = setlocale(LC_CTYPE, NULL);
+ 
+@@ -928,7 +928,7 @@ CodeSetOld_GenericToGenericDb(char const
+        * change bufIn so a simple cast is safe. --plangdale
+        */
+ 
+-#if defined(__linux__) || defined(__EMSCRIPTEN__)
++#if defined(__linux__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
+       status = iconv(cd, (char **)&bufIn, &sizeIn, &out, &outLeft);
+ #else
+       status = iconv(cd, &bufIn, &sizeIn, &out, &outLeft);