Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/samba4/Makefile,v
retrieving revision 1.102
diff -u -p -u -r1.102 Makefile
--- Makefile	6 Jul 2020 14:38:06 -0000	1.102
+++ Makefile	21 Jul 2020 15:47:41 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.102 2020/07/06 14:38:06 adam Exp $
 
 DISTNAME=	samba-4.12.5
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/samba4/distinfo,v
retrieving revision 1.49
diff -u -p -u -r1.49 distinfo
--- distinfo	6 Jul 2020 14:38:06 -0000	1.49
+++ distinfo	21 Jul 2020 15:47:41 -0000
@@ -24,7 +24,7 @@ SHA1 (patch-lib_util_smb__threads.h) = 9
 SHA1 (patch-lib_util_tfork.c) = cd70dcff5f2ce94ffe642e0f029f03ee07dff27d
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = bf327282a59aefeeb2d6bf9eccf9b3a832033066
-SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 71d8acd0aa4c297d75555fba650461c778495caa
+SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 50c3aaecf345449e02642e387eeac3dd7043e77a
 SHA1 (patch-source3_smbd_process.c) = 532d2426b9bd2a215d133bc489741558aa07f849
Index: patches/patch-nsswitch_winbind__nss__netbsd.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/samba4/patches/patch-nsswitch_winbind__nss__netbsd.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-nsswitch_winbind__nss__netbsd.c
--- patches/patch-nsswitch_winbind__nss__netbsd.c	20 Mar 2019 19:09:10 -0000	1.1
+++ patches/patch-nsswitch_winbind__nss__netbsd.c	21 Jul 2020 15:47:41 -0000
@@ -1,10 +1,19 @@
 $NetBSD: patch-nsswitch_winbind__nss__netbsd.c,v 1.1 2019/03/20 19:09:10 adam Exp $
 
 Syntax error fix.
+Add primary group support
 
---- nsswitch/winbind_nss_netbsd.c.orig	2019-03-20 11:23:40.911995594 +0000
-+++ nsswitch/winbind_nss_netbsd.c
-@@ -185,7 +185,7 @@ netbsdwinbind_getgroupmembership(void *n
+--- nsswitch/winbind_nss_netbsd.c.orig	2020-01-31 05:25:36.000000000 -0500
++++ nsswitch/winbind_nss_netbsd.c	2020-07-21 10:24:19.651265315 -0400
+@@ -176,6 +176,7 @@
+ {
+ 	int		*result	= va_arg(ap, int *);
+ 	const char 	*uname	= va_arg(ap, const char *);
++	gid_t		 agroup	= va_arg(ap, gid_t);
+ 	gid_t		*groups	= va_arg(ap, gid_t *);
+ 	int		 maxgrp	= va_arg(ap, int);
+ 	int		*groupc	= va_arg(ap, int *);
+@@ -185,10 +186,17 @@
  	};
  	struct winbindd_response response = {
  		.length = 0,
@@ -13,3 +22,13 @@ Syntax error fix.
  	gid_t	*wblistv;
  	int	wblistc, i, isdup, dupc;
  
++	/* add the primary group */
++	if (*groupc < maxgrp)
++		groups[*groupc] = agroup;
++	else
++		*result = -1;
++	(*groupc)++;
++
+ 	strncpy(request.data.username, uname,
+ 				sizeof(request.data.username) - 1);
+ 	i = winbindd_request_response(NULL, WINBINDD_GETGROUPS,