Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C7C771A923A for ; Sat, 22 Jan 2022 18:52:46 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0C8EF84D61; Sat, 22 Jan 2022 18:52:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4585484D36 for ; Sat, 22 Jan 2022 18:52:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Jnn5m5yLVsJP for ; Sat, 22 Jan 2022 18:52:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A5FF184CFC for ; Sat, 22 Jan 2022 18:52:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A37F9FB24; Sat, 22 Jan 2022 18:52:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1642877564117640" MIME-Version: 1.0 Date: Sat, 22 Jan 2022 18:52:44 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/sysutils/open-vm-tools To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220122185244.A37F9FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1642877564117640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sat Jan 22 18:52:44 UTC 2022 Modified Files: pkgsrc/sysutils/open-vm-tools: distinfo pkgsrc/sysutils/open-vm-tools/patches: patch-vmhgfs-fuse_config.c Log Message: Conditionalise workarounds for old NetBSD librefuse To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/open-vm-tools/distinfo cvs rdiff -u -r1.2 -r1.3 \ 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. --_----------=_1642877564117640 Content-Disposition: inline Content-Length: 2807 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/open-vm-tools/distinfo diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.32 pkgsrc/sysutils/open-vm-tools/distinfo:1.33 --- pkgsrc/sysutils/open-vm-tools/distinfo:1.32 Tue Dec 7 18:25:45 2021 +++ pkgsrc/sysutils/open-vm-tools/distinfo Sat Jan 22 18:52:44 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2021/12/07 18:25:45 adam Exp $ +$NetBSD: distinfo,v 1.33 2022/01/22 18:52:44 pho Exp $ BLAKE2s (open-vm-tools-11.3.5-18557794.tar.gz) = 6093fe8c71a826684fdc8eed50c3367450097b0fd94e39a0a23e45f44a97a635 SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e @@ -53,5 +53,5 @@ SHA1 (patch-vgauth_common_VGAuthLog.c) = SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768 SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07 -SHA1 (patch-vmhgfs-fuse_config.c) = b991c62afde772b37a334341907242d4bc1f9dec +SHA1 (patch-vmhgfs-fuse_config.c) = 0518ca08d9b5d268960e1a820899eaefd1d18361 SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21 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.2 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.2 Mon Nov 21 00:16:29 2016 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Sat Jan 22 18:52:44 2022 @@ -1,9 +1,9 @@ -$NetBSD: patch-vmhgfs-fuse_config.c,v 1.2 2016/11/21 00:16:29 wiz Exp $ +$NetBSD: patch-vmhgfs-fuse_config.c,v 1.3 2022/01/22 18:52:44 pho Exp $ * The original SysCompatCheck() only works on Linux. -* librefuse doesn't support the old style -ho option. +* librefuse didn't support the old style -ho option. Fixed in HEAD. ---- vmhgfs-fuse/config.c.orig 2016-02-16 20:06:49.000000000 +0000 +--- vmhgfs-fuse/config.c.orig 2018-06-23 10:03:28.000000000 +0000 +++ vmhgfs-fuse/config.c @@ -23,6 +23,7 @@ @@ -78,14 +78,17 @@ $NetBSD: patch-vmhgfs-fuse_config.c,v 1. /* -@@ -444,7 +460,9 @@ vmhgfsOptProc(void *data, +@@ -444,7 +460,13 @@ vmhgfsOptProc(void *data, case KEY_HELP: Usage(outargs->argv[0]); -- fuse_opt_add_arg(outargs, "-ho"); ++#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); --_----------=_1642877564117640--