Received: by mail.netbsd.org (Postfix, from userid 605) id 6C41B84E75; Fri, 10 Feb 2023 01:22:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9C72084E5F for ; Fri, 10 Feb 2023 01:22:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IxqWrtQBfK1P for ; Fri, 10 Feb 2023 01:22:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3F47884CD8 for ; Fri, 10 Feb 2023 01:22:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 32382FA90; Fri, 10 Feb 2023 01:22:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167599212982670" MIME-Version: 1.0 Date: Fri, 10 Feb 2023 01:22:09 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/sysutils/open-vm-tools To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20230210012209.32382FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167599212982670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Fri Feb 10 01:22:09 UTC 2023 Modified Files: pkgsrc/sysutils/open-vm-tools: Makefile distinfo pkgsrc/sysutils/open-vm-tools/patches: patch-Makefile.am patch-configure.ac patch-lib_guestApp_guestApp.c patch-scripts_Makefile.am patch-vmblockmounter_Makefile.am patch-vmhgfs-fuse_config.c Log Message: open-vm-tools: update to 12.0.0 From the release notes: Two new features are available in open-vm-tools 12.0.0: * Support for managing Salt Minion. * Support for gathering and publishing a list of containers running inside Linux guests. A potential failure to build from source [FTBFS] issue was reported. The fix did not make the code freeze cut-off date, but the fix is available on the development branch. Open-vm-tools can be built with either libfuse2 or libfuse3. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 pkgsrc/sysutils/open-vm-tools/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/open-vm-tools/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am \ pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am cvs rdiff -u -r1.6 -r1.7 \ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167599212982670 Content-Disposition: inline Content-Length: 14038 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/open-vm-tools/Makefile diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.111 pkgsrc/sysutils/open-vm-tools/Makefile:1.112 --- pkgsrc/sysutils/open-vm-tools/Makefile:1.111 Thu Feb 9 19:30:50 2023 +++ pkgsrc/sysutils/open-vm-tools/Makefile Fri Feb 10 01:22:08 2023 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.111 2023/02/09 19:30:50 markd Exp $ +# $NetBSD: Makefile,v 1.112 2023/02/10 01:22:08 khorben Exp $ -OVTVER= 11.3.5 -DISTNAME= open-vm-tools-${OVTVER}-18557794 +OVTVER= 12.0.0 +DISTNAME= open-vm-tools-${OVTVER}-19345655 PKGNAME= open-vm-tools-${OVTVER} -PKGREVISION= 8 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/} GITHUB_RELEASE= stable-${OVTVER} Index: pkgsrc/sysutils/open-vm-tools/distinfo diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.35 pkgsrc/sysutils/open-vm-tools/distinfo:1.36 --- pkgsrc/sysutils/open-vm-tools/distinfo:1.35 Tue Jan 31 07:59:27 2023 +++ pkgsrc/sysutils/open-vm-tools/distinfo Fri Feb 10 01:22:08 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.35 2023/01/31 07:59:27 khorben Exp $ +$NetBSD: distinfo,v 1.36 2023/02/10 01:22:08 khorben Exp $ -BLAKE2s (open-vm-tools-11.3.5-18557794.tar.gz) = 6093fe8c71a826684fdc8eed50c3367450097b0fd94e39a0a23e45f44a97a635 -SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e -Size (open-vm-tools-11.3.5-18557794.tar.gz) = 4218935 bytes -SHA1 (patch-Makefile.am) = 37cf1b4768c68ba7eccac6714071249ec925f071 +BLAKE2s (open-vm-tools-12.0.0-19345655.tar.gz) = 675bbbdb6524a1c3eb0c78cc8b5fa298e5b032afa8b121d033ca42670b663052 +SHA512 (open-vm-tools-12.0.0-19345655.tar.gz) = 5c41ed81eb0e2755ca4a4adf8691f60daf016577d4b98ede36916fb95412f5dfdc086a3a42ef87fcb669ce7026ea1383a2dccc49fe30d192b187b8592a25e935 +Size (open-vm-tools-12.0.0-19345655.tar.gz) = 4346397 bytes +SHA1 (patch-Makefile.am) = 48a4a30df301b591d0755c9f2ea6b08f937f3fc9 SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06 @@ -24,12 +24,12 @@ SHA1 (patch-bh) = 813a390478247b12c0ec0d SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892 SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d -SHA1 (patch-configure.ac) = 6297ac4c79f311ef656231cca810e8d01341fd66 +SHA1 (patch-configure.ac) = 15b2b93a71caa4fd21dcdb9f07c7798ed4a797ed SHA1 (patch-libDeployPkg_linuxDeployment.c) = 00371f8f986af252e91ebbe4524f8df93e0d2a42 SHA1 (patch-libDeployPkg_processPosix.c) = 4714cd769331c3454313c6409a4e39f936f08529 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531 SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab -SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753 +SHA1 (patch-lib_guestApp_guestApp.c) = b798b977b4e0c6dde71dec00fb84021c92256f84 SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863 SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4 SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9 @@ -43,7 +43,7 @@ SHA1 (patch-lib_rpcChannel_rpcChannel.c) SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b SHA1 (patch-libguestlib_Makefile.am) = fff8e8df30c91ffb4fd2c14017633be1b3cb47ec SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e -SHA1 (patch-scripts_Makefile.am) = 499d60ff81d78bd71ee58c90cf77b850f82455db +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 @@ -53,8 +53,8 @@ SHA1 (patch-services_vmtoolsd_Makefile.a SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768 -SHA1 (patch-vmblockmounter_Makefile.am) = 21c7fe9c6f525ca200ff3e6cdb0bbcc44ae0b37c +SHA1 (patch-vmblockmounter_Makefile.am) = 62ea5f1ca322e26c0d347320c3068afc924c0e20 SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07 -SHA1 (patch-vmhgfs-fuse_config.c) = 0518ca08d9b5d268960e1a820899eaefd1d18361 +SHA1 (patch-vmhgfs-fuse_config.c) = d3accedb57eeb8a2994cce689d27ee2aa42d63cf SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21 SHA1 (patch-vmhgfs-fuse_main.c) = 471d892312cc5680f5265599048f1b8bde251b1b Index: pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am:1.2 --- pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am:1.1 Tue Jan 31 07:59:28 2023 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am Fri Feb 10 01:22:08 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile.am,v 1.1 2023/01/31 07:59:28 khorben Exp $ +$NetBSD: patch-Makefile.am,v 1.2 2023/02/10 01:22:08 khorben Exp $ Fix the installation path for tools.conf ---- Makefile.am.orig 2021-08-31 09:02:50.000000000 +0000 +--- Makefile.am.orig 2022-02-11 15:32:23.000000000 +0000 +++ Makefile.am @@ -72,6 +72,6 @@ if HAVE_UDEV endif Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am:1.2 --- pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am:1.1 Tue Jan 31 07:59:28 2023 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am Fri Feb 10 01:22:08 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-vmblockmounter_Makefile.am,v 1.1 2023/01/31 07:59:28 khorben Exp $ +$NetBSD: patch-vmblockmounter_Makefile.am,v 1.2 2023/02/10 01:22:08 khorben Exp $ Do not create symbolic links outside of ${PREFIX} ---- vmblockmounter/Makefile.am.orig 2023-01-31 07:47:44.665808820 +0000 +--- vmblockmounter/Makefile.am.orig 2022-02-11 15:32:23.000000000 +0000 +++ vmblockmounter/Makefile.am @@ -22,21 +22,3 @@ mount_vmblock_LDADD += ../lib/stubs/libS Index: pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.6 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.7 --- pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.6 Tue Dec 7 18:25:46 2021 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac Fri Feb 10 01:22:08 2023 @@ -1,6 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.6 2021/12/07 18:25:46 adam Exp $ +$NetBSD: patch-configure.ac,v 1.7 2023/02/10 01:22:08 khorben Exp $ ---- configure.ac.orig 2021-08-31 09:02:50.000000000 +0000 +--- configure.ac.orig 2022-02-11 15:32:23.000000000 +0000 +++ configure.ac @@ -129,6 +129,9 @@ case "$host_os" in [solaris*]) @@ -12,16 +12,25 @@ $NetBSD: patch-configure.ac,v 1.6 2021/1 [*]) AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.]) ;; -@@ -525,7 +528,7 @@ AC_VMW_CHECK_LIB([fuse], - [], - [], - [fuse.h], -- [fuse_main], -+ [fuse_exit], - [have_fuse=yes], - [have_fuse=no; - AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) -@@ -1140,7 +1143,7 @@ AC_PATH_PROG( +@@ -581,7 +584,7 @@ if test "$with_fuse" = "auto" || + [], + [3.10.0], + [fuse3/fuse.h], +- [fuse_main], ++ [fuse_exit], + [have_fuse3=yes; + AC_DEFINE([HAVE_FUSE3], 1, [Define to 1 if using FUSE3.]) + AC_DEFINE([FUSE_USE_VERSION], 35, [FUSE API version to use.])], +@@ -609,7 +612,7 @@ if test "$with_fuse" = "fuse" || + [], + [], + [fuse.h], +- [fuse_main], ++ [fuse_exit], + [have_fuse=yes; + AC_DEFINE([HAVE_FUSE], 1, [Define to 1 if using FUSE.]) + AC_DEFINE([FUSE_USE_VERSION], 29, [FUSE API version to use.])], +@@ -1369,7 +1372,7 @@ AC_PATH_PROG( [RPCGEN], [rpcgen], [not_found]) @@ -30,7 +39,7 @@ $NetBSD: patch-configure.ac,v 1.6 2021/1 AC_MSG_ERROR([rpcgen not found.]) fi -@@ -1362,6 +1365,15 @@ if test "$os" = "linux"; then +@@ -1591,6 +1594,15 @@ if test "$os" = "linux"; then fi fi @@ -46,7 +55,7 @@ $NetBSD: patch-configure.ac,v 1.6 2021/1 if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm" MODULES_DIR="/boot/modules" -@@ -1459,6 +1471,7 @@ fi +@@ -1688,6 +1700,7 @@ fi AM_CONDITIONAL(LINUX, test "$os" = "linux") AM_CONDITIONAL(SOLARIS, test "$os" = "solaris") Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c:1.3 --- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c:1.2 Fri Dec 23 04:11:03 2016 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c Fri Feb 10 01:22:08 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_guestApp_guestApp.c,v 1.2 2016/12/23 04:11:03 ryoon Exp $ +$NetBSD: patch-lib_guestApp_guestApp.c,v 1.3 2023/02/10 01:22:08 khorben Exp $ * Fix pkgsrc powerops scripts location ---- lib/guestApp/guestApp.c.orig 2016-09-29 10:07:22.000000000 +0000 +--- lib/guestApp/guestApp.c.orig 2022-02-11 15:32:56.000000000 +0000 +++ lib/guestApp/guestApp.c @@ -63,7 +63,7 @@ #elif defined __APPLE__ Index: pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.5 --- pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.4 Tue Jan 31 07:59:28 2023 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am Fri Feb 10 01:22:08 2023 @@ -1,8 +1,6 @@ -$NetBSD: patch-scripts_Makefile.am,v 1.4 2023/01/31 07:59:28 khorben Exp $ +$NetBSD: patch-scripts_Makefile.am,v 1.5 2023/02/10 01:22:08 khorben Exp $ -Fix the installation path for configuration scripts and vm-support - ---- scripts/Makefile.am.orig 2021-08-31 09:02:49.000000000 +0000 +--- scripts/Makefile.am.orig 2022-02-11 15:32:23.000000000 +0000 +++ scripts/Makefile.am @@ -20,12 +20,13 @@ defaultscripts += poweroff-vm-default defaultscripts += suspend-vm-default Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c:1.4 --- pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c:1.3 Sat Jan 22 18:52:44 2022 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Fri Feb 10 01:22:08 2023 @@ -1,94 +1,15 @@ -$NetBSD: patch-vmhgfs-fuse_config.c,v 1.3 2022/01/22 18:52:44 pho Exp $ +$NetBSD: patch-vmhgfs-fuse_config.c,v 1.4 2023/02/10 01:22:08 khorben Exp $ * The original SysCompatCheck() only works on Linux. * librefuse didn't support the old style -ho option. Fixed in HEAD. ---- vmhgfs-fuse/config.c.orig 2018-06-23 10:03:28.000000000 +0000 +--- vmhgfs-fuse/config.c.orig 2022-02-11 15:32:22.000000000 +0000 +++ vmhgfs-fuse/config.c -@@ -23,6 +23,7 @@ - +@@ -24,6 +24,7 @@ #include "module.h" + #include #include +#include #ifdef VMX86_DEVEL int LOGLEVEL_THRESHOLD = 4; -@@ -136,6 +137,7 @@ Usage(char *prog_name) // IN - #define PROC_FILESYSTEMS "/proc/filesystems" - #define FUSER_KERNEL_FS "fuse" - -+#if defined(__linux__) - /* - *---------------------------------------------------------------------- - * -@@ -173,8 +175,9 @@ SysCompatFusermountCheck(void) // IN: - - return fusermountExists; - } -+#endif - -- -+#if defined(__linux__) - /* - *---------------------------------------------------------------------- - * -@@ -253,8 +256,9 @@ exit: - free(modulesDep); - return installedFuse; - } -+#endif - -- -+#if defined(__linux__) - /* - *---------------------------------------------------------------------- - * -@@ -307,7 +311,7 @@ exit: - } - return registeredFuse; - } -- -+#endif - - /* - *---------------------------------------------------------------------- -@@ -328,6 +332,7 @@ exit: - */ - static HgfsSystemCompatibility - SysCompatCheck(char *prog_name) // IN -+#if defined(__linux__) - { - struct utsname buf; - HgfsSystemCompatibility sysCompat = HGFS_SYSCOMPAT_OS_NOT_SUPPORTED; -@@ -381,6 +386,17 @@ exit: - HgfsSystemCompatibilityMsg[sysCompat]); - return sysCompat; - } -+#elif defined(__NetBSD__) -+{ -+ HgfsSystemCompatibility sysCompat = HGFS_SYSCOMPAT_FUSE_ENABLED; -+ struct stat st; -+ -+ if (stat("/dev/puffs", &st) == -1) -+ sysCompat = HGFS_SYSCOMPAT_OS_NO_FUSE; -+ -+ return sysCompat; -+} -+#endif - - - /* -@@ -444,7 +460,13 @@ vmhgfsOptProc(void *data, - - case KEY_HELP: - Usage(outargs->argv[0]); -+#if defined(__NetBSD__) && FUSE_H_ < 20211204 -+ fuse_opt_add_arg(outargs, "--help"); -+ free(outargs->argv[0]); -+ outargs->argv[0] = strdup(""); -+#else - fuse_opt_add_arg(outargs, "-ho"); -+#endif - fuse_main(outargs->argc, outargs->argv, NULL, NULL); - exit(1); - --_----------=_167599212982670--