[pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools Correct few build failues in op...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/815e268842a7
branches:  trunk
changeset: 364382:815e268842a7
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Fri Jun 23 18:25:12 2017 +0000

description:
Correct few build failues in open-vm-tools

Include PAM blk3.
Address <sys/user.h> removal fallout on NetBSD 8.99.1.

diffstat:

 sysutils/open-vm-tools/Makefile         |   3 +-
 sysutils/open-vm-tools/distinfo         |   4 +-
 sysutils/open-vm-tools/patches/patch-bf |  36 +++++++++++++++++---------------
 3 files changed, 23 insertions(+), 20 deletions(-)

diffs (191 lines):

diff -r 65ab11bbd18f -r 815e268842a7 sysutils/open-vm-tools/Makefile
--- a/sysutils/open-vm-tools/Makefile   Fri Jun 23 17:34:07 2017 +0000
+++ b/sysutils/open-vm-tools/Makefile   Fri Jun 23 18:25:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2017/05/03 08:38:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.72 2017/06/23 18:25:12 kamil Exp $
 
 DISTNAME=      open-vm-tools-10.1.5-5055683
 PKGNAME=       open-vm-tools-10.1.5
@@ -61,6 +61,7 @@
 .include "../../archivers/libmspack/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
diff -r 65ab11bbd18f -r 815e268842a7 sysutils/open-vm-tools/distinfo
--- a/sysutils/open-vm-tools/distinfo   Fri Jun 23 17:34:07 2017 +0000
+++ b/sysutils/open-vm-tools/distinfo   Fri Jun 23 18:25:12 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/04/16 02:49:50 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2017/06/23 18:25:12 kamil Exp $
 
 SHA1 (open-vm-tools-10.1.5-5055683.tar.gz) = 6de8e774cd61dde304c6e93a34b4fcdaefb12fc9
 RMD160 (open-vm-tools-10.1.5-5055683.tar.gz) = 54b39bc8ef20bbd948a7a50b0aa2e3b4f28c7477
@@ -22,7 +22,7 @@
 SHA1 (patch-bc) = c2f316cd9035648676fd9d0d7e40fc7f6bf5c8d4
 SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
-SHA1 (patch-bf) = 705b0eb11296e5563af9167dc2bc3ba13dec645a
+SHA1 (patch-bf) = dc72e905601521cc703a72aea7f1b31ac03a8802
 SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
 SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
 SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
diff -r 65ab11bbd18f -r 815e268842a7 sysutils/open-vm-tools/patches/patch-bf
--- a/sysutils/open-vm-tools/patches/patch-bf   Fri Jun 23 17:34:07 2017 +0000
+++ b/sysutils/open-vm-tools/patches/patch-bf   Fri Jun 23 18:25:12 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.5 2016/12/23 04:11:03 ryoon Exp $
+$NetBSD: patch-bf,v 1.6 2017/06/23 18:25:12 kamil Exp $
 
---- lib/procMgr/procMgrPosix.c.orig    2016-09-29 10:07:22.000000000 +0000
+--- lib/procMgr/procMgrPosix.c.orig    2017-02-11 10:06:31.000000000 +0000
 +++ lib/procMgr/procMgrPosix.c
 @@ -27,7 +27,7 @@
  // pull in setresuid()/setresgid() if possible
@@ -11,7 +11,7 @@
  #include <asm/param.h>
  #endif
  #if !defined(sun) && !defined(__APPLE__)
-@@ -47,13 +47,13 @@
+@@ -47,13 +47,15 @@
  #include <time.h>
  #include <grp.h>
  #include <sys/syscall.h>
@@ -20,14 +20,16 @@
  // sys/param.h is required on FreeBSD before sys/user.h
  #   include <sys/param.h>
  // Pull in PAGE_SIZE/PAGE_SHIFT defines ahead of vm_basic_defs.h
++#if defined(__FreeBSD__) || defined(__DragonFly__)
  #   include <sys/user.h>
  #endif
 -#if defined (__FreeBSD__)
++#endif
 +#if defined (__FreeBSD__) || defined(__NetBSD__)
  #include <kvm.h>
  #include <limits.h>
  #include <paths.h>
-@@ -136,7 +136,7 @@ Bool ProcMgr_PromoteEffectiveToReal(void
+@@ -136,7 +138,7 @@ Bool ProcMgr_PromoteEffectiveToReal(void
  #ifdef sun
  #define  BASH_PATH "/usr/bin/bash"
  #else
@@ -36,7 +38,7 @@
  #endif
  
  
-@@ -607,7 +607,7 @@ abort:
+@@ -607,7 +609,7 @@ abort:
   *----------------------------------------------------------------------
   */
  
@@ -45,7 +47,7 @@
  ProcMgrProcInfoArray *
  ProcMgr_ListProcesses(void)
  {
-@@ -615,7 +615,11 @@ ProcMgr_ListProcesses(void)
+@@ -615,7 +617,11 @@ ProcMgr_ListProcesses(void)
     ProcMgrProcInfo procInfo;
     Bool failed = TRUE;
     static kvm_t *kd;
@@ -57,7 +59,7 @@
     char errbuf[_POSIX2_LINE_MAX];
     int i;
     int nentries=-1;
-@@ -638,7 +642,12 @@ ProcMgr_ListProcesses(void)
+@@ -638,7 +644,12 @@ ProcMgr_ListProcesses(void)
     /*
      * Get the list of process info structs
      */
@@ -70,7 +72,7 @@
     if (kp == NULL || nentries <= 0) {
        Warning("%s: failed to get proc infos with error: %s\n",
                __FUNCTION__, kvm_geterr(kd));
-@@ -666,14 +675,26 @@ ProcMgr_ListProcesses(void)
+@@ -666,14 +677,26 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the pid of the process.
         */
@@ -97,7 +99,7 @@
                             : Unicode_Alloc(pwd->pw_name, STRING_ENCODING_DEFAULT);
  
        /*
-@@ -681,15 +702,24 @@ ProcMgr_ListProcesses(void)
+@@ -681,15 +704,24 @@ ProcMgr_ListProcesses(void)
         * maximum allowed size, then we can save it right now. Else we shall
         * need to try and parse it from the entire command line.
         */
@@ -122,7 +124,7 @@
        if (cmdLineTemp != NULL) {
           /*
            * Flatten the argument list to get cmd & all params.
-@@ -745,9 +775,15 @@ ProcMgr_ListProcesses(void)
+@@ -745,9 +777,15 @@ ProcMgr_ListProcesses(void)
           procInfo.procCmdLine = DynBuf_Detach(&dbuf);
           DynBuf_Destroy(&dbuf);
        } else {
@@ -138,7 +140,7 @@
              cmdNameLookup = FALSE;
           }
        }
-@@ -755,7 +791,11 @@ ProcMgr_ListProcesses(void)
+@@ -755,7 +793,11 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the start time of the process
         */
@@ -150,7 +152,7 @@
  
        /*
         * Store the process info pointer into a list buffer.
-@@ -785,7 +825,7 @@ abort:
+@@ -785,7 +827,7 @@ abort:
  
     return procList;
  }
@@ -159,7 +161,7 @@
  
  
  #if defined(__APPLE__)
-@@ -2022,7 +2062,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
+@@ -2022,7 +2064,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
     free(asyncProc);
  }
  
@@ -168,7 +170,7 @@
  
  /*
   *----------------------------------------------------------------------
-@@ -2104,7 +2144,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2104,7 +2146,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // first change group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);
@@ -177,7 +179,7 @@
     ret = setegid(ppw->pw_gid);
  #else
     ret = setresgid(ppw->pw_gid, ppw->pw_gid, root_gid);
-@@ -2123,7 +2163,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2123,7 +2165,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // now user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
@@ -186,7 +188,7 @@
     ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2185,7 +2225,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2185,7 +2227,7 @@ ProcMgr_ImpersonateUserStop(void)
     // first change back user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
@@ -195,7 +197,7 @@
     ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2198,7 +2238,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2198,7 +2240,7 @@ ProcMgr_ImpersonateUserStop(void)
     // now group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);