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

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/open-vm-tools
From: "Pierre Pronchery" <khorben%netbsd.org@localhost>
Date: Tue, 31 Jan 2023 07:59:28 +0000

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue Jan 31 07:59:28 UTC 2023

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile PLIST distinfo
        pkgsrc/sysutils/open-vm-tools/patches: patch-scripts_Makefile.am
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-Makefile.am
            patch-vmblockmounter_Makefile.am

Log Message:
open-vm-tools: fix the installation of vm-support and tools.conf

Bumps PKGREVISION.

Tested on NetBSD/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/open-vm-tools/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am \
    pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am

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/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.109 pkgsrc/sysutils/open-vm-tools/Makefile:1.110
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.109        Sun Jan 29 21:17:49 2023
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Tue Jan 31 07:59:27 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.109 2023/01/29 21:17:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.110 2023/01/31 07:59:27 khorben Exp $
 
 OVTVER=                11.3.5
 DISTNAME=      open-vm-tools-${OVTVER}-18557794
 PKGNAME=       open-vm-tools-${OVTVER}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 GITHUB_RELEASE=        stable-${OVTVER}
@@ -41,6 +41,7 @@ CONF_FILES_PERMS+=    ${EGDIR}/poweron-vm-d
 CONF_FILES_PERMS+=     ${EGDIR}/resume-vm-default ${PKG_SYSCONFDIR}/resume-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+=     ${EGDIR}/statechange.subr ${PKG_SYSCONFDIR}/statechange.subr ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+=     ${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+=     ${EGDIR}/tools.conf ${PKG_SYSCONFDIR}/tools.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 RCD_SCRIPTS=           vmtools
 
 SUBST_CLASSES+=                        fix-etc-path
@@ -55,6 +56,10 @@ CHECK_PORTABILITY_SKIP+=     scripts/solaris
 pre-configure:
        cd ${WRKSRC} && autoreconf -f -i
 
+post-install:
+       mv ${DESTDIR}${PREFIX}/etc/vmware-tools/tools.conf.example \
+               ${DESTDIR}${EGDIR}/tools.conf
+
 .include "options.mk"
 .include "../../archivers/libmspack/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/sysutils/open-vm-tools/PLIST
diff -u pkgsrc/sysutils/open-vm-tools/PLIST:1.5 pkgsrc/sysutils/open-vm-tools/PLIST:1.6
--- pkgsrc/sysutils/open-vm-tools/PLIST:1.5     Tue Dec  7 18:25:45 2021
+++ pkgsrc/sysutils/open-vm-tools/PLIST Tue Jan 31 07:59:27 2023
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2021/12/07 18:25:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/01/31 07:59:27 khorben Exp $
+bin/vm-support
 bin/vmhgfs-fuse
 bin/vmtoolsd
 bin/vmware-checkvm
@@ -36,6 +37,7 @@ share/examples/vmware-tools/resume-vm-de
 share/examples/vmware-tools/scripts/vmware/network
 share/examples/vmware-tools/statechange.subr
 share/examples/vmware-tools/suspend-vm-default
+share/examples/vmware-tools/tools.conf
 share/open-vm-tools/messages/de/toolboxcmd.vmsg
 share/open-vm-tools/messages/de/vmtoolsd.vmsg
 share/open-vm-tools/messages/en/toolboxcmd.vmsg

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.34 pkgsrc/sysutils/open-vm-tools/distinfo:1.35
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.34 Sun Jan 30 16:22:19 2022
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Tue Jan 31 07:59:27 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2022/01/30 16:22:19 pho Exp $
+$NetBSD: distinfo,v 1.35 2023/01/31 07:59:27 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
 SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
 SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
@@ -42,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) = 295d0b5ab46f9d9df28a7b23ab4a5449fa1528f7
+SHA1 (patch-scripts_Makefile.am) = 499d60ff81d78bd71ee58c90cf77b850f82455db
 SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
 SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
 SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = be7912f53989d298b5965cb566085cd0a0e5cc90
@@ -52,6 +53,7 @@ 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_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07
 SHA1 (patch-vmhgfs-fuse_config.c) = 0518ca08d9b5d268960e1a820899eaefd1d18361
 SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.4
--- pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.3 Tue Dec  7 18:25:46 2021
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am     Tue Jan 31 07:59:28 2023
@@ -1,8 +1,10 @@
-$NetBSD: patch-scripts_Makefile.am,v 1.3 2021/12/07 18:25:46 adam Exp $
+$NetBSD: patch-scripts_Makefile.am,v 1.4 2023/01/31 07:59:28 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
-@@ -20,7 +20,8 @@ defaultscripts += poweroff-vm-default
+@@ -20,12 +20,13 @@ defaultscripts += poweroff-vm-default
  defaultscripts += suspend-vm-default
  defaultscripts += resume-vm-default
  
@@ -12,3 +14,9 @@ $NetBSD: patch-scripts_Makefile.am,v 1.3
  
  conf_SCRIPTS = ./common/statechange.subr
  conf_SCRIPTS += $(defaultscripts)
+ 
+-vmsupportdir = /usr/bin
++vmsupportdir = ${PREFIX}/bin
+ 
+ vmsupport_SCRIPTS = ./common/vm-support
+ 

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am:1.1
--- /dev/null   Tue Jan 31 07:59:28 2023
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-Makefile.am     Tue Jan 31 07:59:28 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2023/01/31 07:59:28 khorben Exp $
+
+Fix the installation path for tools.conf
+
+--- Makefile.am.orig   2021-08-31 09:02:50.000000000 +0000
++++ Makefile.am
+@@ -72,6 +72,6 @@ if HAVE_UDEV
+ endif
+ 
+ install-data-local:
+-      $(INSTALL) -d $(DESTDIR)/etc/vmware-tools/
+-      $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)/etc/vmware-tools/tools.conf.example
++      $(INSTALL) -d $(DESTDIR)$(sysconfdir)
++      $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)$(sysconfdir)/tools.conf.example
+ 
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am:1.1
--- /dev/null   Tue Jan 31 07:59:28 2023
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-vmblockmounter_Makefile.am      Tue Jan 31 07:59:28 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-vmblockmounter_Makefile.am,v 1.1 2023/01/31 07:59:28 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
+@@ -22,21 +22,3 @@ mount_vmblock_LDADD += ../lib/stubs/libS
+ 
+ mount_vmblock_SOURCES =
+ mount_vmblock_SOURCES += vmblockmounter.c
+-
+-if FREEBSD
+-install-exec-hook:
+-      mv $(DESTDIR)$(sbindir)/mount.vmblock \
+-              $(DESTDIR)$(sbindir)/mount_vmblock
+-      -$(MKDIR_P) $(DESTDIR)/sbin
+-      -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmblock \
+-              $(DESTDIR)/sbin/mount_vmblock &> /dev/null
+-uninstall-hook:
+-      rm -f $(DESTDIR)$(sbindir)/mount_vmblock
+-else
+-install-exec-hook:
+-      -$(MKDIR_P) $(DESTDIR)/sbin
+-      -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmblock \
+-              $(DESTDIR)/sbin/mount.vmblock &> /dev/null
+-uninstall-hook:
+-      rm -f $(DESTDIR)/sbin/mount.vmblock
+-endif !FREEBSD

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/hs-hls-alternate-number-format-plugin
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/hs-hls-alternate-number-format-plugin
Indexes:

Home | Main Index | Thread Index | Old Index