Tue Apr 9 01:12:36 2024 UTC (47d)
sysutils/open-vm-tools: Update to 12.4.0

open-vm-tools now supports NetBSD/aarch64. At least vmhgfs-fuse has been
confirmed to be working on this platform. vmware-user is still useless
though, because it requires either Wayland running on top of recent DRM/KMS
supporting SVGA v3 (which hasn't been ported to NetBSD as of writing) or
xf86-video-vmware, which only supports SVGA v1 and v2. VMware only provides
SVGA v3 interface on AArch64 platforms so nothing can interact with VMware
graphics aside from the standard framebuffer (via xf86-video-wsfb) at the
moment.

Release notes:
* https://github.com/vmware/open-vm-tools/blob/stable-12.4.0/ReleaseNotes.md
* https://github.com/vmware/open-vm-tools/blob/stable-12.3.5/ReleaseNotes.md
* https://github.com/vmware/open-vm-tools/blob/stable-12.3.0/ReleaseNotes.md
* https://github.com/vmware/open-vm-tools/blob/stable-12.2.5/ReleaseNotes.md


(pho)
diff -r1.126 -r1.127 pkgsrc/sysutils/open-vm-tools/Makefile
diff -r1.40 -r1.41 pkgsrc/sysutils/open-vm-tools/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am
diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h
diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am
diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ar
diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-au
diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am
diff -r1.1 -r1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_hostinfoPosix.c
diff -r1.1 -r1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c
cvs diff -r1.126 -r1.127 pkgsrc/sysutils/open-vm-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/Makefile 2024/04/07 07:35:02 1.126
+++ pkgsrc/sysutils/open-vm-tools/Makefile 2024/04/09 01:12:36 1.127
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.126 2024/04/07 07:35:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.127 2024/04/09 01:12:36 pho Exp $
2 2
3OVTVER= 12.1.5 3OVTVER= 12.4.0
4DISTNAME= open-vm-tools-${OVTVER}-20735119 4DISTNAME= open-vm-tools-${OVTVER}-23259341
5PKGNAME= open-vm-tools-${OVTVER} 5PKGNAME= open-vm-tools-${OVTVER}
6PKGREVISION= 9 
7CATEGORIES= sysutils 6CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/}
9GITHUB_RELEASE= stable-${OVTVER} 8GITHUB_RELEASE= stable-${OVTVER}
10 9
11MAINTAINER= agc@NetBSD.org 10MAINTAINER= agc@NetBSD.org
12HOMEPAGE= https://github.com/vmware/open-vm-tools 11HOMEPAGE= https://github.com/vmware/open-vm-tools
13COMMENT= Open source VMware tools 12COMMENT= Open source VMware tools
14LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
15 14
16ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 15BROKEN_EXCEPT_ON_PLATFORM= *-*-aarch64 *-*-i386 *-*-x86_64
17 16
18# Workaround for glib2-2.68.0 c++ fallout. 17# Workaround for glib2-2.68.0 c++ fallout.
19CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 18CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
20 19
21BUILDLINK_TRANSFORM+= rm:-Werror 20BUILDLINK_TRANSFORM+= rm:-Werror
22 21
23USE_LANGUAGES= c gnu++11 22USE_LANGUAGES= c gnu++11
24USE_CXX_FEATURES+= c++11 23USE_CXX_FEATURES+= c++11
25USE_LIBTOOL= yes 24USE_LIBTOOL= yes
26USE_TOOLS+= autoconf automake pkg-config 25USE_TOOLS+= autoconf automake pkg-config
27GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
28CONFIGURE_ARGS+= --disable-docs # Requires doxygen 27CONFIGURE_ARGS+= --disable-docs # Requires doxygen
29CONFIGURE_ARGS+= --disable-vgauth 28CONFIGURE_ARGS+= --disable-vgauth
cvs diff -r1.40 -r1.41 pkgsrc/sysutils/open-vm-tools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/distinfo 2024/03/02 13:52:42 1.40
+++ pkgsrc/sysutils/open-vm-tools/distinfo 2024/04/09 01:12:36 1.41
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1$NetBSD: distinfo,v 1.40 2024/03/02 13:52:42 wiz Exp $ 1$NetBSD: distinfo,v 1.41 2024/04/09 01:12:36 pho Exp $
2 2
3BLAKE2s (open-vm-tools-12.1.5-20735119.tar.gz) = 409c366cc3dfb610fd00bf2b5d1037919ed37203862c8a810c64144b2dc660af 3BLAKE2s (open-vm-tools-12.4.0-23259341.tar.gz) = 6de55ae64ccf2a603b9c48e28fde548ed426255f0bbe69a8d916e9b1f0798233
4SHA512 (open-vm-tools-12.1.5-20735119.tar.gz) = d85fec73a58cb1c9b2956aff886825b9d47d00dc6d0d8a3d2ecdfac3fa982c27463b9cc2f42bf3dd18fe542b30f751850e8051e270c547e897f06a4e1c12d639 4SHA512 (open-vm-tools-12.4.0-23259341.tar.gz) = 11ea43c64ec534922145f83e2b7ef9254437f80656ad03b596340a78c3698adcc7d84adade9c5d8e1c83b5ebc3bd086601b1d104e0f070274dc2b6bc1f64fb17
5Size (open-vm-tools-12.1.5-20735119.tar.gz) = 4357637 bytes 5Size (open-vm-tools-12.4.0-23259341.tar.gz) = 4353211 bytes
6SHA1 (patch-Makefile.am) = 48a4a30df301b591d0755c9f2ea6b08f937f3fc9 6SHA1 (patch-Makefile.am) = 0f0345ea4d092c34a2b99beec43b64035c658433
7SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da 7SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
8SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa 8SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
9SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06 9SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
10SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75 10SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75
11SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e 11SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e
12SHA1 (patch-ar) = b06873f37ac826912e647f2349dc88053bf2cb67 12SHA1 (patch-ar) = 0ff0f865aa0b0d38f0b68cdc00c4679ee205aacc
13SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f 13SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
14SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136 14SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136
15SHA1 (patch-au) = 518ca50f944fad718a5e8deb66e83a405ce88159 15SHA1 (patch-au) = bcacf757f1badbb1ef31dd6f7b438e974ac0d62c
16SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d 16SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
17SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7 17SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
18SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732 18SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732
19SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa 19SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
20SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f 20SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
21SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb 21SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
22SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd 22SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd
23SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad 23SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
24SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892 24SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
25SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba 25SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba
26SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d 26SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
27SHA1 (patch-configure.ac) = 15b2b93a71caa4fd21dcdb9f07c7798ed4a797ed 27SHA1 (patch-configure.ac) = 15b2b93a71caa4fd21dcdb9f07c7798ed4a797ed
28SHA1 (patch-libDeployPkg_linuxDeployment.c) = 00371f8f986af252e91ebbe4524f8df93e0d2a42 28SHA1 (patch-libDeployPkg_linuxDeployment.c) = 00371f8f986af252e91ebbe4524f8df93e0d2a42
29SHA1 (patch-libDeployPkg_processPosix.c) = 4714cd769331c3454313c6409a4e39f936f08529 29SHA1 (patch-libDeployPkg_processPosix.c) = 4714cd769331c3454313c6409a4e39f936f08529
30SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531 30SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
31SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab 31SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab
32SHA1 (patch-lib_guestApp_guestApp.c) = b798b977b4e0c6dde71dec00fb84021c92256f84 32SHA1 (patch-lib_guestApp_guestApp.c) = b798b977b4e0c6dde71dec00fb84021c92256f84
33SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863 33SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
34SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4 34SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
35SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9 35SHA1 (patch-lib_include_sigPosixRegs.h) = 2d43d080d2dc33b7bb701d799760ab5d64fb3133
36SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a 36SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
37SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968 37SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
38SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624 38SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
39SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7 39SHA1 (patch-lib_misc_hostinfoPosix.c) = 91f0540de32172c3d4049828f34f66c143dae857
40SHA1 (patch-lib_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf 40SHA1 (patch-lib_misc_vthreadBase.c) = 341ffe3d7d484cf952dace1daa127e2e0a82e35a
41SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7 41SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
42SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 2fe2da8d6fbf8f8c44c110b2ed37d2decd91b6a7 42SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 2fe2da8d6fbf8f8c44c110b2ed37d2decd91b6a7
43SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 4133707d70844eb12c25c48d6bb0b26a370987b3 43SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 4133707d70844eb12c25c48d6bb0b26a370987b3
44SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b 44SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
45SHA1 (patch-libguestlib_Makefile.am) = fff8e8df30c91ffb4fd2c14017633be1b3cb47ec 45SHA1 (patch-libguestlib_Makefile.am) = 0e938c958628afd079e40a9bbc3c99e3b767a048
46SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e 46SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
47SHA1 (patch-scripts_Makefile.am) = 30ca9cef3fb39018cdee2e0b5847945abc98c160 47SHA1 (patch-scripts_Makefile.am) = 30ca9cef3fb39018cdee2e0b5847945abc98c160
48SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf 48SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
49SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3 49SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
50SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = be7912f53989d298b5965cb566085cd0a0e5cc90 50SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = be7912f53989d298b5965cb566085cd0a0e5cc90
51SHA1 (patch-services_plugins_timeSync_Makefile.am) = c92d64573e7c5718e955d32991c8951ea2408d43 51SHA1 (patch-services_plugins_timeSync_Makefile.am) = ae246998326e5c7f6adb6d7eebc318ba8c8af786
52SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d 52SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d
53SHA1 (patch-services_vmtoolsd_Makefile.am) = 558ed58e8fc6d933f0a9698c865b33f88a91c51c 53SHA1 (patch-services_vmtoolsd_Makefile.am) = 558ed58e8fc6d933f0a9698c865b33f88a91c51c
54SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9 54SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9
55SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532 55SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
56SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768 56SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768
57SHA1 (patch-vmblockmounter_Makefile.am) = 62ea5f1ca322e26c0d347320c3068afc924c0e20 57SHA1 (patch-vmblockmounter_Makefile.am) = 62ea5f1ca322e26c0d347320c3068afc924c0e20
58SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07 58SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07
59SHA1 (patch-vmhgfs-fuse_config.c) = d3accedb57eeb8a2994cce689d27ee2aa42d63cf 59SHA1 (patch-vmhgfs-fuse_config.c) = d3accedb57eeb8a2994cce689d27ee2aa42d63cf
60SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21 60SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21
61SHA1 (patch-vmhgfs-fuse_main.c) = 471d892312cc5680f5265599048f1b8bde251b1b 61SHA1 (patch-vmhgfs-fuse_main.c) = 471d892312cc5680f5265599048f1b8bde251b1b
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am 2023/02/10 01:22:08 1.2
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am 2024/04/09 01:12:36 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Makefile.am,v 1.2 2023/02/10 01:22:08 khorben Exp $ 1$NetBSD: patch-Makefile.am,v 1.3 2024/04/09 01:12:36 pho Exp $
2 2
3Fix the installation path for tools.conf 3Fix the installation path for tools.conf
4 4
5--- Makefile.am.orig 2022-02-11 15:32:23.000000000 +0000 5--- Makefile.am.orig 2024-02-06 15:07:33.000000000 +0000
6+++ Makefile.am 6+++ Makefile.am
7@@ -72,6 +72,6 @@ if HAVE_UDEV 7@@ -73,6 +73,6 @@ endif
8 endif 8
9  9
10 install-data-local: 10 install-data-local:
11- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools/ 11- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools/
12- $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)/etc/vmware-tools/tools.conf.example 12- $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)/etc/vmware-tools/tools.conf.example
13+ $(INSTALL) -d $(DESTDIR)$(sysconfdir) 13+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)
14+ $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)$(sysconfdir)/tools.conf.example 14+ $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)$(sysconfdir)/tools.conf.example
15  15
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h 2018/01/01 06:56:01 1.2
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h 2024/04/09 01:12:36 1.3
@@ -1,40 +1,44 @@ @@ -1,40 +1,44 @@
1$NetBSD: patch-lib_include_sigPosixRegs.h,v 1.2 2018/01/01 06:56:01 ryoon Exp $ 1$NetBSD: patch-lib_include_sigPosixRegs.h,v 1.3 2024/04/09 01:12:36 pho Exp $
2 2
3--- lib/include/sigPosixRegs.h.orig 2017-12-15 19:09:51.000000000 +0000 3Support NetBSD/i386, NetBSD/amd64, and NetBSD/aarch64.
 4
 5--- lib/include/sigPosixRegs.h.orig 2024-02-06 15:08:43.000000000 +0000
4+++ lib/include/sigPosixRegs.h 6+++ lib/include/sigPosixRegs.h
5@@ -230,6 +230,36 @@ extern "C" { 7@@ -233,6 +233,38 @@ extern "C" {
6 #define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP]) 8 #define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[ESP])
7 #define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP]) 9 #define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.gregs[EIP])
8 #endif 10 #endif
9+#elif defined (__NetBSD__) 11+#elif defined (__NetBSD__)
10+#ifdef __x86_64__ 12+#if defined(__x86_64__)
11+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RAX]) 13+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RAX])
12+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RBX]) 14+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RBX])
13+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RCX]) 15+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RCX])
14+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RDX]) 16+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RDX])
15+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RDI]) 17+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RDI])
16+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RSI]) 18+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RSI])
17+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RBP]) 19+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RBP])
18+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RSP]) 20+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RSP])
19+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RIP]) 21+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_RIP])
20+#define SC_R8(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R8]) 22+#define SC_R8(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R8])
21+#define SC_R9(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R9]) 23+#define SC_R9(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R9])
22+#define SC_R10(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R10]) 24+#define SC_R10(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R10])
23+#define SC_R11(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R11]) 25+#define SC_R11(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R11])
24+#define SC_R12(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R12]) 26+#define SC_R12(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R12])
25+#define SC_R13(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R13]) 27+#define SC_R13(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R13])
26+#define SC_R14(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R14]) 28+#define SC_R14(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R14])
27+#define SC_R15(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R15]) 29+#define SC_R15(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_R15])
 30+#elif defined(__aarch64__)
 31+#define SC_X(uc,n) ((unsigned long) (uc)->uc_mcontext.__gregs[n])
28+#else 32+#else
29+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EAX]) 33+#define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EAX])
30+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EBX]) 34+#define SC_EBX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EBX])
31+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ECX]) 35+#define SC_ECX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ECX])
32+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EDX]) 36+#define SC_EDX(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EDX])
33+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EDI]) 37+#define SC_EDI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EDI])
34+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ESI]) 38+#define SC_ESI(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ESI])
35+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EBP]) 39+#define SC_EBP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EBP])
36+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ESP]) 40+#define SC_ESP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_ESP])
37+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EIP]) 41+#define SC_EIP(uc) ((unsigned long) (uc)->uc_mcontext.__gregs[_REG_EIP])
38+#endif 42+#endif
39 #elif defined(ANDROID_X86) 43 #elif defined(ANDROID_X86)
40 #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EAX]) 44 #define SC_EAX(uc) ((unsigned long) (uc)->uc_mcontext.gregs[REG_EAX])
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am 2016/12/23 04:11:03 1.2
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am 2024/04/09 01:12:36 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-services_plugins_timeSync_Makefile.am,v 1.2 2016/12/23 04:11:03 ryoon Exp $ 1$NetBSD: patch-services_plugins_timeSync_Makefile.am,v 1.3 2024/04/09 01:12:36 pho Exp $
2 2
3--- services/plugins/timeSync/Makefile.am.orig 2016-09-29 10:07:01.000000000 +0000 3Fix build on NetBSD.
 4
 5--- services/plugins/timeSync/Makefile.am.orig 2024-02-06 15:07:33.000000000 +0000
4+++ services/plugins/timeSync/Makefile.am 6+++ services/plugins/timeSync/Makefile.am
5@@ -43,4 +43,8 @@ if LINUX 7@@ -45,4 +45,7 @@ libtimeSync_la_SOURCES += slewLinux.c
6 libtimeSync_la_SOURCES += slewLinux.c 
7 libtimeSync_la_SOURCES += pllLinux.c 8 libtimeSync_la_SOURCES += pllLinux.c
 9 libtimeSync_la_SOURCES += timeInfo.c
8 endif 10 endif
 11-
9+if NETBSD 12+if NETBSD
10+libtimeSync_la_SOURCES += slewAdjtime.c 13+libtimeSync_la_SOURCES += slewAdjtime.c
11+libtimeSync_la_SOURCES += pllNone.c 14+libtimeSync_la_SOURCES += pllNone.c
12+endif 15+endif
13  
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ar (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-ar 2016/10/09 03:41:56 1.3
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-ar 2024/04/09 01:12:36 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ar,v 1.3 2016/10/09 03:41:56 ryoon Exp $ 1$NetBSD: patch-ar,v 1.4 2024/04/09 01:12:36 pho Exp $
2 2
3--- lib/include/iovector.h.orig 2016-02-16 20:06:46.000000000 +0000 3Fix build on NetBSD: struct iovec resides in <sys/uio.h>
 4
 5--- lib/include/iovector.h.orig 2024-02-06 15:08:41.000000000 +0000
4+++ lib/include/iovector.h 6+++ lib/include/iovector.h
5@@ -32,7 +32,7 @@ 7@@ -37,7 +37,7 @@ extern "C" {
6 /* 
7 * Ugly definition of struct iovec. 8 * Ugly definition of struct iovec.
8 */ 9 */
9-#if defined(__linux__) || defined(sun) || defined(__APPLE__) || defined(__FreeBSD__) 10 #if defined(__linux__) || defined(sun) || defined(__APPLE__) || \
10+#if defined(__linux__) || defined(sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) 11- defined(__FreeBSD__) || defined(__EMSCRIPTEN__)
 12+ defined(__FreeBSD__) || defined(__NetBSD__) || defined(__EMSCRIPTEN__)
11 #include <sys/uio.h> // for struct iovec 13 #include <sys/uio.h> // for struct iovec
12 #else 14 #else
13  15
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-au (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-au 2016/10/09 03:41:56 1.3
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-au 2024/04/09 01:12:36 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-au,v 1.3 2016/10/09 03:41:56 ryoon Exp $ 1$NetBSD: patch-au,v 1.4 2024/04/09 01:12:36 pho Exp $
2 2
3--- lib/include/su.h.orig 2016-02-16 20:06:46.000000000 +0000 3Fix build on NetBSD.
 4
 5--- lib/include/su.h.orig 2024-02-06 15:08:43.000000000 +0000
4+++ lib/include/su.h 6+++ lib/include/su.h
5@@ -50,7 +50,7 @@ Bool Id_AuthCheck(char const *right, 7@@ -56,7 +56,7 @@ Bool Id_AuthCheck(char const *right,
6 char const *localizedDescription, 
7 Bool showDialogIfNeeded); 8 Bool showDialogIfNeeded);
8  9
9-#elif (defined(__linux__) || defined(sun) || defined(__FreeBSD__)) 10 #elif defined(__linux__) || defined(sun) || defined(__FreeBSD__) || \
10+#elif (defined(__linux__) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__)) 11- defined(__EMSCRIPTEN__)
 12+ defined(__NetBSD__) || defined(__EMSCRIPTEN__)
11  13
12 #include <sys/types.h> 14 #include <sys/types.h>
13 #include <unistd.h> 15 #include <unistd.h>
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am 2021/12/07 18:25:46 1.3
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am 2024/04/09 01:12:36 1.4
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-libguestlib_Makefile.am,v 1.3 2021/12/07 18:25:46 adam Exp $ 1$NetBSD: patch-libguestlib_Makefile.am,v 1.4 2024/04/09 01:12:36 pho Exp $
2 2
3Do not link against dl. 3Do not link against dl. It is already handled by ./configure, and doing it
 4explicitly here causes a linkage failure on platforms where libdl doesn't
 5exist (such as NetBSD).
4 6
5--- libguestlib/Makefile.am.orig 2021-12-07 13:10:18.901007820 +0000 7--- libguestlib/Makefile.am.orig 2024-02-06 15:07:33.000000000 +0000
6+++ libguestlib/Makefile.am 8+++ libguestlib/Makefile.am
7@@ -51,7 +51,6 @@ libguestlib_la_SOURCES += $(libguestlib_ 9@@ -50,7 +50,7 @@ libguestlib_la_SOURCES += $(libguestlib_
 10 libguestlib_la_SOURCES += $(libguestlib_rpcchanneldir)/simpleSocket.c
8 endif 11 endif
9  12
10 libguestlib_la_LDFLAGS = 13-libguestlib_la_LIBADD += -ldl -lrt
11-libguestlib_la_LDFLAGS += -Wl,-ldl 14+libguestlib_la_LIBADD += -lrt
12 libguestlib_la_LDFLAGS += -Wl,-lrt 
13 # We require GCC, so we're fine passing compiler-specific flags. 15 # We require GCC, so we're fine passing compiler-specific flags.
14 # Needed for OS's that don't link shared libraries against libc by default, e.g. FreeBSD 16 # Needed for OS's that don't link shared libraries against libc by default, e.g. FreeBSD
 17 libguestlib_la_LIBADD += -lc
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_hostinfoPosix.c (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_hostinfoPosix.c 2016/10/09 03:41:56 1.1
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_hostinfoPosix.c 2024/04/09 01:12:36 1.2
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-lib_misc_hostinfoPosix.c,v 1.1 2016/10/09 03:41:56 ryoon Exp $ 1$NetBSD: patch-lib_misc_hostinfoPosix.c,v 1.2 2024/04/09 01:12:36 pho Exp $
2 2
3--- lib/misc/hostinfoPosix.c.orig 2016-02-16 20:06:46.000000000 +0000 3Fix build on NetBSD.
 4
 5--- lib/misc/hostinfoPosix.c.orig 2024-02-06 15:08:41.000000000 +0000
4+++ lib/misc/hostinfoPosix.c 6+++ lib/misc/hostinfoPosix.c
5@@ -3289,7 +3289,7 @@ HostinfoSysinfo(uint64 *totalRam, // OU 7@@ -93,7 +93,7 @@
 8 #include <paths.h>
 9 #endif
 10
 11-#if defined(__linux__) || defined(__APPLE__)
 12+#if defined(__linux__) || defined(__APPLE__) || defined(__NetBSD__)
 13 #include <dlfcn.h>
 14 #endif
 15
 16@@ -4184,7 +4184,7 @@ HostinfoSysinfo(uint64 *totalRam, // OU
6 #endif // ifndef __APPLE__ 17 #endif // ifndef __APPLE__
7  18
8  19
9-#if defined(__linux__) || defined(__FreeBSD__) || defined(sun) 20-#if defined(__linux__) || defined(__FreeBSD__) || defined(sun)
10+#if defined(__linux__) || defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__) 21+#if defined(__linux__) || defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
11 /* 22 /*
12 *----------------------------------------------------------------------------- 23 *-----------------------------------------------------------------------------
13 * 24 *
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c 2018/01/01 06:56:01 1.1
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c 2024/04/09 01:12:36 1.2
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-lib_misc_vthreadBase.c,v 1.1 2018/01/01 06:56:01 ryoon Exp $ 1$NetBSD: patch-lib_misc_vthreadBase.c,v 1.2 2024/04/09 01:12:36 pho Exp $
2 2
3--- lib/misc/vthreadBase.c.orig 2017-12-15 19:09:51.000000000 +0000 3NetBSD implementation for VThreadBase_GetKernelID(). Use pthread_self() and
 4cast the resulting pthread_t into uint64.
 5
 6--- lib/misc/vthreadBase.c.orig 2024-02-06 15:08:41.000000000 +0000
4+++ lib/misc/vthreadBase.c 7+++ lib/misc/vthreadBase.c
5@@ -352,6 +352,8 @@ VThreadBase_GetKernelID(void) 8@@ -352,6 +352,8 @@ VThreadBase_GetKernelID(void)
6 # endif 9 # endif
7 // Best effort until FreeBSD header update 10 // Best effort until FreeBSD header update
8 return (uint64)(uintptr_t)(void *)pthread_self(); 11 return (uint64)(uintptr_t)(void *)pthread_self();
9+#elif defined(__NetBSD__) 12+#elif defined __NetBSD__
10+ return (uint64)(uintptr_t)(void *)pthread_self(); 13+ return (uint64)(uintptr_t)(void *)pthread_self();
 14 #elif defined __EMSCRIPTEN__
 15 return (uint64)(uintptr_t)(void *)pthread_self();
11 #else 16 #else
12 # error "Unknown platform" 
13 #endif