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

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct 27 20:33:09 UTC 2026

Modified Files:
        pkgsrc/sysutils/open-vm-tools: distinfo
        pkgsrc/sysutils/open-vm-tools/patches: patch-as patch-az
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-lib_lock_ul.c

Log Message:
open-vm-tools: match prototype

to fix build on NetBSD-current

regen patches while here.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-as \
    pkgsrc/sysutils/open-vm-tools/patches/patch-az
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_lock_ul.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/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.45 pkgsrc/sysutils/open-vm-tools/distinfo:1.46
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.45 Mon Nov 17 17:38:39 2025
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Tue Oct 27 20:33:08 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2025/11/17 17:38:39 adam Exp $
+$NetBSD: distinfo,v 1.46 2026/10/27 20:33:08 wiz Exp $
 
 BLAKE2s (open-vm-tools-12.5.4-24964629.tar.gz) = 2bea849240363a2b4f256054dff95876bd8ed622e8f71d0e29e2881995c5cd15
 SHA512 (open-vm-tools-12.5.4-24964629.tar.gz) = 328265a8de09d0bf4922c24cd8165e671b331ae29613fce81948450b20588261faa7cc28357966e5ff27ebc266f001373ed9a94956c65a0febc9ae220a5fb9f3
@@ -10,11 +10,11 @@ SHA1 (patch-ai) = 3e8c67a33f6072319f1741
 SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75
 SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e
 SHA1 (patch-ar) = 0ff0f865aa0b0d38f0b68cdc00c4679ee205aacc
-SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
+SHA1 (patch-as) = ff82d4f4b1d319796c1839964cbf27959829e87e
 SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136
 SHA1 (patch-au) = bcacf757f1badbb1ef31dd6f7b438e974ac0d62c
 SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
-SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
+SHA1 (patch-az) = 10088cb94594ac250b2a7fb12ce7e3d80dfc9838
 SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
 SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
@@ -34,6 +34,7 @@ SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) 
 SHA1 (patch-lib_include_sigPosixRegs.h) = 2d43d080d2dc33b7bb701d799760ab5d64fb3133
 SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
 SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
+SHA1 (patch-lib_lock_ul.c) = 2618785ed79bd8254912ac47a9c558c142dfc598
 SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
 SHA1 (patch-lib_misc_codesetOld.c) = 925f5f3abdd475969f4cbcee31b0e0fd4856e620
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 91f0540de32172c3d4049828f34f66c143dae857

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-as
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-as:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-as:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-as:1.3  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-as      Tue Oct 27 20:33:08 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-as,v 1.4 2026/10/27 20:33:08 wiz Exp $
 
---- lib/include/mntinfo.h.orig 2016-02-16 20:06:46.000000000 +0000
+--- lib/include/mntinfo.h.orig 2025-09-18 01:06:38.000000000 +0000
 +++ lib/include/mntinfo.h
-@@ -34,8 +34,11 @@
+@@ -34,9 +34,12 @@
  # include <limits.h>
  #elif defined(__linux__)
  # include <mntent.h>
@@ -11,10 +11,11 @@ $NetBSD: patch-as,v 1.3 2016/10/09 03:41
  # include <sys/mount.h>
 +#if defined(__NetBSD__)
 +# include <fstab.h>
-+#endif
  #endif
++#endif
  #include "posix.h"
  
+ /*
 @@ -106,17 +109,27 @@
  # define MNTINFO_FSTYPE(mnt)            mnt->mnt_type
  # define MNTINFO_MNTPT(mnt)             mnt->mnt_dir
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-az
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-az:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-az:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-az:1.3  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-az      Tue Oct 27 20:33:09 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-az,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-az,v 1.4 2026/10/27 20:33:09 wiz Exp $
 
---- lib/include/vmblock.h.orig 2016-02-16 20:06:46.000000000 +0000
+--- lib/include/vmblock.h.orig 2025-09-18 01:06:36.000000000 +0000
 +++ lib/include/vmblock.h
 @@ -83,11 +83,11 @@
  #ifndef _VMBLOCK_H_
@@ -16,7 +16,7 @@ $NetBSD: patch-az,v 1.3 2016/10/09 03:41
  # include <sys/param.h>
  #endif
  
-@@ -164,7 +164,7 @@
+@@ -169,7 +169,7 @@ extern "C" {
                                         "/" VMBLOCK_CONTROL_DEVNAME
  # define VMBLOCK_DEVICE_MODE            O_WRONLY
  
@@ -25,10 +25,11 @@ $NetBSD: patch-az,v 1.3 2016/10/09 03:41
  # define VMBLOCK_FS_NAME                "vmblock"
  # define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME
  # define VMBLOCK_FS_ROOT                VMBLOCK_MOUNT_POINT
-@@ -196,6 +196,20 @@
+@@ -200,6 +200,20 @@ extern "C" {
+ #  ifdef VMX86_DEVEL
  #   define VMBLOCK_LIST_FILEBLOCKS       _IO('Z', 3)
  #   define VMBLOCK_PURGE_FILEBLOCKS      _IO('Z', 4)
- #  endif
++#  endif
 +# elif defined(__NetBSD__)               /* } else if (NetBSD) { */
 +   /*
 +    * Similar to Solaris, construct ioctl(2) commands for block operations.
@@ -42,7 +43,6 @@ $NetBSD: patch-az,v 1.3 2016/10/09 03:41
 +#  ifdef VMX86_DEVEL
 +#   define VMBLOCK_LIST_FILEBLOCKS       _IO('z', 3)
 +#   define VMBLOCK_PURGE_FILEBLOCKS      _IO('z', 4)
-+#  endif
+ #  endif
  
  # endif                                 /* } */
- #else

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_lock_ul.c
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-lib_lock_ul.c:1.1
--- /dev/null   Tue Oct 27 20:33:09 2026
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_lock_ul.c   Tue Oct 27 20:33:09 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_lock_ul.c,v 1.1 2026/10/27 20:33:09 wiz Exp $
+
+Match function prototype.
+
+--- lib/lock/ul.c.orig 2026-10-27 20:29:48.978847772 +0000
++++ lib/lock/ul.c
+@@ -29,7 +29,7 @@ static Bool mxUserCollectLockingTree = FALSE;
+ static Bool mxInPanic = FALSE;  // track when involved in a panic
+ static Bool mxUserCollectLockingTree = FALSE;
+ 
+-Bool (*MXUserTryAcquireForceFail)() = NULL;
++Bool (*MXUserTryAcquireForceFail)(const char *name) = NULL;
+ 
+ static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
+ static void (*MXUserMxLockLister)(void) = NULL;