Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 7A3D97A2CC for ; Mon, 21 Nov 2016 00:14:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 2780B855B5; Mon, 21 Nov 2016 00:14:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A8D1A8558E for ; Mon, 21 Nov 2016 00:14:17 +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 LBpwBPWzntje for ; Mon, 21 Nov 2016 00:14:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C54EC84CBD for ; Mon, 21 Nov 2016 00:14:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9E5CAFBA6; Mon, 21 Nov 2016 00:14:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_14796872569980" MIME-Version: 1.0 Date: Mon, 21 Nov 2016 00:14:16 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20161121001416.9E5CAFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_14796872569980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Mon Nov 21 00:14:16 UTC 2016 Modified Files: pkgsrc/doc: CHANGES-2016 pkgsrc/sysutils/open-vm-tools: Makefile PLIST.common distinfo options.mk pkgsrc/sysutils/open-vm-tools/patches: patch-configure.ac Added Files: pkgsrc/sysutils/open-vm-tools: MESSAGE.x11 pkgsrc/sysutils/open-vm-tools/patches: patch-vmhgfs-fuse_config.c patch-vmhgfs-fuse_fsutil.h Log Message: Build bin/vmhgfs-fuse and bin/vmware-vmblock-fuse Please note that you need -CURRENT to actually use these filesystems. They still build on older systems but fail to run. To generate a diff of this commit: cvs rdiff -u -r1.4754 -r1.4755 pkgsrc/doc/CHANGES-2016 cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/open-vm-tools/MESSAGE.x11 cvs rdiff -u -r1.62 -r1.63 pkgsrc/sysutils/open-vm-tools/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/PLIST.common \ pkgsrc/sysutils/open-vm-tools/options.mk cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/open-vm-tools/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c \ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_14796872569980 Content-Disposition: inline Content-Length: 10241 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/CHANGES-2016 diff -u pkgsrc/doc/CHANGES-2016:1.4754 pkgsrc/doc/CHANGES-2016:1.4755 --- pkgsrc/doc/CHANGES-2016:1.4754 Sun Nov 20 21:23:31 2016 +++ pkgsrc/doc/CHANGES-2016 Mon Nov 21 00:14:16 2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.4754 2016/11/20 21:23:31 leot Exp $ +$NetBSD: CHANGES-2016,v 1.4755 2016/11/21 00:14:16 pho Exp $ Changes to the packages collection and infrastructure in 2016: @@ -6552,3 +6552,4 @@ Changes to the packages collection and i Updated multimedia/py-m3u8 to 0.3.0 [joerg 2016-11-20] Updated multimedia/mkvtoolnix to 9.5.0 [joerg 2016-11-20] Updated net/youtube-dl to 20161118 [leot 2016-11-20] + Updated sysutils/open-vm-tools to 10.0.7nb4 [pho 2016-11-20] Index: pkgsrc/sysutils/open-vm-tools/Makefile diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.62 pkgsrc/sysutils/open-vm-tools/Makefile:1.63 --- pkgsrc/sysutils/open-vm-tools/Makefile:1.62 Mon Oct 17 20:55:49 2016 +++ pkgsrc/sysutils/open-vm-tools/Makefile Mon Nov 21 00:14:16 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.62 2016/10/17 20:55:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.63 2016/11/21 00:14:16 pho Exp $ DISTNAME= open-vm-tools-10.0.7-3227872 PKGNAME= open-vm-tools-10.0.7 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://github.com/vmware/open-vm-tools/files/133266/ @@ -60,6 +60,7 @@ CWRAPPERS_APPEND.cc+= -Wno-error=unused- .include "../../archivers/libmspack/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../mk/fuse.buildlink3.mk" .include "../../net/libdnet/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/xml-security-c/buildlink3.mk" Index: pkgsrc/sysutils/open-vm-tools/PLIST.common diff -u pkgsrc/sysutils/open-vm-tools/PLIST.common:1.3 pkgsrc/sysutils/open-vm-tools/PLIST.common:1.4 --- pkgsrc/sysutils/open-vm-tools/PLIST.common:1.3 Sun Oct 9 03:41:56 2016 +++ pkgsrc/sysutils/open-vm-tools/PLIST.common Mon Nov 21 00:14:16 2016 @@ -1,10 +1,12 @@ -@comment $NetBSD: PLIST.common,v 1.3 2016/10/09 03:41:56 ryoon Exp $ +@comment $NetBSD: PLIST.common,v 1.4 2016/11/21 00:14:16 pho Exp $ +bin/vmhgfs-fuse bin/vmtoolsd bin/vmware-checkvm bin/vmware-hgfsclient bin/vmware-namespace-cmd bin/vmware-rpctool bin/vmware-toolbox-cmd +bin/vmware-vmblock-fuse bin/vmware-xferlogs include/libDeployPkg/guestcust-events.h include/libDeployPkg/imgcust-api.h Index: pkgsrc/sysutils/open-vm-tools/options.mk diff -u pkgsrc/sysutils/open-vm-tools/options.mk:1.3 pkgsrc/sysutils/open-vm-tools/options.mk:1.4 --- pkgsrc/sysutils/open-vm-tools/options.mk:1.3 Sun Oct 9 03:41:56 2016 +++ pkgsrc/sysutils/open-vm-tools/options.mk Mon Nov 21 00:14:16 2016 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2016/10/09 03:41:56 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2016/11/21 00:14:16 pho Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.open-vm-tools PKG_SUPPORTED_OPTIONS= x11 @@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS= x11 .if !empty(PKG_OPTIONS:Mx11) PLIST_SRC+= PLIST.x11 +MESSAGE_SRC+= MESSAGE.x11 . include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk" . include "../../x11/gtkmm/buildlink3.mk" . include "../../sysutils/desktop-file-utils/desktopdb.mk" Index: pkgsrc/sysutils/open-vm-tools/distinfo diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.15 pkgsrc/sysutils/open-vm-tools/distinfo:1.16 --- pkgsrc/sysutils/open-vm-tools/distinfo:1.15 Mon Oct 17 20:55:49 2016 +++ pkgsrc/sysutils/open-vm-tools/distinfo Mon Nov 21 00:14:16 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2016/10/17 20:55:49 ryoon Exp $ +$NetBSD: distinfo,v 1.16 2016/11/21 00:14:16 pho Exp $ SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625 @@ -27,7 +27,7 @@ SHA1 (patch-bh) = 813a390478247b12c0ec0d SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d -SHA1 (patch-configure.ac) = cf2c2bb8526ee4916a1a81059b9b776cec97b877 +SHA1 (patch-configure.ac) = 1a8422cdca984b32c0d9e4fa926a92fa3b9178ba SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af SHA1 (patch-libDeployPkg_processPosix.c) = 9f62110eb903eec85e51d8e579abc3d36e54fe7e SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531 @@ -53,3 +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) = d14e2c585a7c5716ea9dd4b60ef1411d299282ae +SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21 Index: pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.3 --- pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.2 Sun Oct 9 03:41:56 2016 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac Mon Nov 21 00:14:16 2016 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.2 2016/10/09 03:41:56 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.3 2016/11/21 00:14:16 pho Exp $ --- configure.ac.orig 2016-02-16 20:06:45.000000000 +0000 +++ configure.ac @@ -12,6 +12,15 @@ $NetBSD: patch-configure.ac,v 1.2 2016/1 [*]) AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.]) ;; +@@ -374,7 +377,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.])]) @@ -1064,6 +1067,15 @@ if test "$os" = "linux"; then buildHgfsmounter=yes fi Added files: Index: pkgsrc/sysutils/open-vm-tools/MESSAGE.x11 diff -u /dev/null pkgsrc/sysutils/open-vm-tools/MESSAGE.x11:1.1 --- /dev/null Mon Nov 21 00:14:16 2016 +++ pkgsrc/sysutils/open-vm-tools/MESSAGE.x11 Mon Nov 21 00:14:16 2016 @@ -0,0 +1,14 @@ +=========================================================================== +$NetBSD: MESSAGE.x11,v 1.1 2016/11/21 00:14:16 pho Exp $ + +You need to mount the vmblock file system in order to enable the clipboard +synchronization and drag and drop support: + + # mkdir /var/run/vmblock-fuse + # vmware-vmblock-fuse /var/run/vmblock-fuse + +Then start vmware-user-suid-wrapper in your .xinitrc: + + % vmware-user-suid-wrapper + +=========================================================================== Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c:1.1 --- /dev/null Mon Nov 21 00:14:16 2016 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Mon Nov 21 00:14:16 2016 @@ -0,0 +1,91 @@ +$NetBSD: patch-vmhgfs-fuse_config.c,v 1.1 2016/11/21 00:14:16 pho Exp $ + +* The original SysCompatCheck() only works on Linux. +* librefuse doesn't support the old style -ho option. + +--- vmhgfs-fuse/config.c.orig 2016-02-16 20:06:49.000000000 +0000 ++++ vmhgfs-fuse/config.c +@@ -23,6 +23,7 @@ + + #include "module.h" + #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,9 @@ vmhgfsOptProc(void *data, + + case KEY_HELP: + Usage(outargs->argv[0]); +- fuse_opt_add_arg(outargs, "-ho"); ++ fuse_opt_add_arg(outargs, "--help"); ++ free(outargs->argv[0]); ++ outargs->argv[0] = strdup(""); + fuse_main(outargs->argc, outargs->argv, NULL, NULL); + exit(1); + Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h:1.1 --- /dev/null Mon Nov 21 00:14:16 2016 +++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h Mon Nov 21 00:14:16 2016 @@ -0,0 +1,15 @@ +$NetBSD: patch-vmhgfs-fuse_fsutil.h,v 1.1 2016/11/21 00:14:16 pho Exp $ + +loff_t needs to be typedef'ed on NetBSD too. + +--- vmhgfs-fuse/fsutil.h.orig 2016-02-16 20:06:49.000000000 +0000 ++++ vmhgfs-fuse/fsutil.h +@@ -32,7 +32,7 @@ + #include "hgfsProto.h" + #include + +-#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) || defined(__NetBSD__) + typedef long long loff_t; + #endif + --_----------=_14796872569980--