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

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Oct 12 13:57:13 UTC 2016

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile distinfo
        pkgsrc/sysutils/open-vm-tools/patches: patch-bf
            patch-vgauth_common_VGAuthLog.c

Log Message:
Fix a wrong preprocessor condition and pass initialize variable to kvm_getproc2
>From OBATA Akio, thank you.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bf
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c

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.59 pkgsrc/sysutils/open-vm-tools/Makefile:1.60
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.59 Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Wed Oct 12 13:57:13 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2016/10/09 03:41:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2016/10/12 13:57:13 ryoon Exp $
 
 DISTNAME=      open-vm-tools-10.0.7-3227872
 PKGNAME=       open-vm-tools-10.0.7
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  https://github.com/vmware/open-vm-tools/files/133266/
 

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.12 pkgsrc/sysutils/open-vm-tools/distinfo:1.13
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.12 Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Wed Oct 12 13:57:13 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2016/10/12 13:57:13 ryoon Exp $
 
 SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d
 RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625
@@ -22,7 +22,7 @@ SHA1 (patch-bb) = e22d082689016d81add208
 SHA1 (patch-bc) = c2f316cd9035648676fd9d0d7e40fc7f6bf5c8d4
 SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
-SHA1 (patch-bf) = 674f18131037a3aa5f01371edb9e576c39a9ecaf
+SHA1 (patch-bf) = b3fd95f533f3191a6c2ee6a6540218d25d15623d
 SHA1 (patch-bh) = 86793b6411a64d3189f47d5236f2a6f4c9fff05c
 SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
 SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
@@ -46,7 +46,7 @@ SHA1 (patch-scripts_netbsd_network) = cf
 SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = 61acce40961ac82b48e055c159efd0c3b7a8899c
 SHA1 (patch-services_plugins_timeSync_Makefile.am) = 45a9c9044f1e4274c173d822a74dfc63bde0f5e9
 SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5
-SHA1 (patch-vgauth_common_VGAuthLog.c) = e64fc476b80015759cca3aafc8b48a3c4daa6dde
+SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9
 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768
 SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-bf
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.3
--- pkgsrc/sysutils/open-vm-tools/patches/patch-bf:1.2  Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bf      Wed Oct 12 13:57:13 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.2 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bf,v 1.3 2016/10/12 13:57:13 ryoon Exp $
 
 --- lib/procMgr/procMgrPosix.c.orig    2016-02-16 20:06:46.000000000 +0000
 +++ lib/procMgr/procMgrPosix.c
@@ -53,8 +53,8 @@ $NetBSD: patch-bf,v 1.2 2016/10/09 03:41
      * Get the list of process info structs
      */
 +#if defined(__NetBSD__)
-+   int temp; 
-+   kp = kvm_getproc2(kd, KERN_PROC_ALL, flag, temp, &nentries);
++   int elemsize = INT_MAX;
++   kp = kvm_getproc2(kd, KERN_PROC_ALL, flag, elemsize, &nentries);
 +#else
     kp = kvm_getprocs(kd, KERN_PROC_PROC, flag, &nentries);
 +#endif

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c:1.1   Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-vgauth_common_VGAuthLog.c       Wed Oct 12 13:57:13 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-vgauth_common_VGAuthLog.c,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-vgauth_common_VGAuthLog.c,v 1.2 2016/10/12 13:57:13 ryoon Exp $
 
 --- vgauth/common/VGAuthLog.c.orig     2016-02-16 20:06:48.000000000 +0000
 +++ vgauth/common/VGAuthLog.c
@@ -7,7 +7,7 @@ $NetBSD: patch-vgauth_common_VGAuthLog.c
     buf[sizeof buf - 1] = '\0';
  
 -#ifdef sun
-+#if defined(sun) && defined(__NetBSD__)
++#if defined(sun) || defined(__NetBSD__)
     strerror_r(code, errMsg, sizeof errMsg);
     g_warning("[function %s, file %s, line %d], %s, [errno = %d], %s\n",
               func, file, line, buf, code, errMsg);