integrate the patch from the following url:

http://www.ogris.de/samba/unix-active-directory.html
and install nss_winbind. bump PKGREVISION.

11 files changed, 156 insertions, 11 deletions

diff --git a/net/samba35/INSTALL.nss_winbind b/net/samba35/INSTALL.nss_winbind
new file mode 100644
index 00000000000..21018f44ab0
--- /dev/null
+++ b/net/samba35/INSTALL.nss_winbind
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL.nss_winbind,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	ln -sf ${PREFIX}/lib/nss_winbind.so.0 /usr/lib/nss_winbind.so.0
+	;;
+esac
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index ed736d2108c..20a9f68f918 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/09/30 13:41:33 adam Exp $
+# $NetBSD: Makefile,v 1.11 2011/10/11 20:30:00 jmcneill Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -87,8 +88,10 @@ PLIST.macosx=		yes
 
 .if ${_OPSYS_SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=	LIBEXT=dylib
+SAMBA_LIBEXT=	dylib
 .else
 PLIST_SUBST+=	LIBEXT=so
+SAMBA_LIBEXT=	so
 .endif
 
 .if !defined(PWD_MKDB)
@@ -99,6 +102,13 @@ MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
+.if ${OPSYS} == "NetBSD"
+.if !empty(PKG_OPTIONS:Mwinbind)
+# Install a /usr/lib/nss_winbind.so.0 -> ${PREFIX}/lib/nss_winbind.so.0 symlink
+INSTALL_TEMPLATES+=	INSTALL.nss_winbind
+.endif
+.endif
+
 INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
 DOCDIR=		share/doc/${PKGBASE}
@@ -154,6 +164,12 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \
 		${DESTDIR}${PREFIX}/${EGDIR}
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
+.if ${OPSYS} == "NetBSD"
+.if !empty(PKG_OPTIONS:Mwinbind)
+	${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/nsswitch/nss_winbind.${SAMBA_LIBEXT} \
+		${DESTDIR}${PREFIX}/lib/nss_winbind.${SAMBA_LIBEXT}.0
+.endif
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/net/samba35/PLIST b/net/samba35/PLIST
index 27194a4b580..74eac087443 100644
--- a/net/samba35/PLIST
+++ b/net/samba35/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/07/10 17:03:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/10/11 20:30:00 jmcneill Exp $
 bin/eventlogadm
 bin/findsmb
 bin/ldbadd
@@ -48,6 +48,7 @@ lib/libtdb.${LIBEXT}
 lib/libtdb.${LIBEXT}.1
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0
+${PLIST.winbind}lib/nss_winbind.${LIBEXT}.0
 lib/samba/auth/script.${LIBEXT}
 lib/samba/charset/CP437.${LIBEXT}
 lib/samba/charset/CP850.${LIBEXT}
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index fafabd643f4..8e179ff1fc1 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/08/05 09:51:45 adam Exp $
+$NetBSD: distinfo,v 1.8 2011/10/11 20:30:00 jmcneill Exp $
 
 SHA1 (samba-3.5.11.tar.gz) = 0801871ab6a11f7d8eb8bf32ff0b87896d263441
 RMD160 (samba-3.5.11.tar.gz) = b3ee1e044e9df417b0dcaf954a6a137db742cba3
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
-SHA1 (patch-af) = cd01ec9f17c6e329973a26991fc2bda1df9519d6
+SHA1 (patch-af) = 275cb3b20d6fe9f000ba3c51bc9450a428e782cb
 SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf
 SHA1 (patch-ah) = 6142078efec4263124aa793108c43eef0ce61da4
 SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
@@ -26,3 +26,9 @@ SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
 SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
 SHA1 (patch-av) = fccde3e48f2b3de3b1adfaa488a67c57696d1a83
 SHA1 (patch-aw) = 36cb31313cdbd1e4670f33924371df5ed3390420
+SHA1 (patch-ba) = 87799a62831b45e6cde8c36fbafbc08596411f98
+SHA1 (patch-bb) = 6283ffa8781d0c069f81e80704a018028e6b2b50
+SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea
+SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47
+SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa
+SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973
diff --git a/net/samba35/patches/patch-af b/net/samba35/patches/patch-af
index 424efe08b6e..813196457ed 100644
--- a/net/samba35/patches/patch-af
+++ b/net/samba35/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
+$NetBSD: patch-af,v 1.4 2011/10/11 20:30:00 jmcneill Exp $
 
---- configure.orig	2011-06-14 11:18:38.000000000 +0000
+--- configure.orig	2011-08-03 18:25:14.000000000 +0000
 +++ configure
-@@ -18317,6 +18317,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
+@@ -18345,6 +18345,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -18353,7 +18354,7 @@ fi
+@@ -18381,7 +18382,7 @@ fi
  $as_echo "$BLDSHARED" >&6; }
  
  saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -25327,9 +25328,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -25355,9 +25356,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -25341,31 +25342,31 @@ else
+@@ -25369,31 +25370,31 @@ else
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -72,7 +72,7 @@ $NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
  _ACEOF
  
  fi
-@@ -34478,31 +34479,39 @@ case "$host_os" in
+@@ -34506,31 +34507,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
@@ -134,3 +134,20 @@ $NetBSD: patch-af,v 1.3 2011/06/15 11:45:08 adam Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
+@@ -34728,6 +34737,16 @@ $as_echo "#define HAVE_PASSWD_PW_AGE 1" 
+ 
+ fi
+ 
++# NetBSD
++
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_class" "ac_cv_member_struct_passwd_pw_class" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_class" = x""yes; then :
++
++$as_echo "#define HAVE_PASSWD_PW_CLASS 1" >>confdefs.h
++
++fi
++
+ 
+ # AIX 4.3.x and 5.1 do not have as many members in
+ # struct secmethod_table as AIX 5.2
diff --git a/net/samba35/patches/patch-ba b/net/samba35/patches/patch-ba
new file mode 100644
index 00000000000..65a91bdb547
--- /dev/null
+++ b/net/samba35/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- configure.in.orig	2011-08-03 18:24:05.000000000 +0000
++++ configure.in
+@@ -6239,6 +6239,11 @@ AC_CHECK_MEMBER(struct passwd.pw_age,
+ 		AC_DEFINE(HAVE_PASSWD_PW_AGE, 1, [Defined if struct passwd has pw_age field]),,
+ 		[#include <pwd.h>])
+ 
++# NetBSD
++AC_CHECK_MEMBER(struct passwd.pw_class,
++		AC_DEFINE(HAVE_PASSWD_PW_CLASS, 1, [Defined if struct passwd has pw_class field]),,
++		[#include <pwd.h>])
++
+ # AIX 4.3.x and 5.1 do not have as many members in
+ # struct secmethod_table as AIX 5.2
+ AC_CHECK_MEMBERS([struct secmethod_table.method_attrlist], , ,
diff --git a/net/samba35/patches/patch-bb b/net/samba35/patches/patch-bb
new file mode 100644
index 00000000000..fa5b087d489
--- /dev/null
+++ b/net/samba35/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- include/config.h.in.orig	2011-08-03 18:25:13.000000000 +0000
++++ include/config.h.in
+@@ -1688,6 +1688,9 @@
+ /* Defined if struct passwd has pw_age field */
+ #undef HAVE_PASSWD_PW_AGE
+ 
++/* Defined if struct passwd has pw_class field */
++#undef HAVE_PASSWD_PW_CLASS
++
+ /* Defined if struct passwd has pw_comment field */
+ #undef HAVE_PASSWD_PW_COMMENT
+ 
diff --git a/net/samba35/patches/patch-bc b/net/samba35/patches/patch-bc
new file mode 100644
index 00000000000..8a783169b72
--- /dev/null
+++ b/net/samba35/patches/patch-bc
@@ -0,0 +1,25 @@
+$NetBSD: patch-bc,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- ../nsswitch/winbind_nss_netbsd.c.orig	2011-08-03 18:24:05.000000000 +0000
++++ ../nsswitch/winbind_nss_netbsd.c
+@@ -215,6 +215,7 @@ netbsdwinbind_getgroupmembership(void *n
+ {
+ 	int		*result	= va_arg(ap, int *);
+ 	const char 	*uname	= va_arg(ap, const char *);
++	gid_t		 bgid	= 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 *);
+@@ -234,6 +235,12 @@ netbsdwinbind_getgroupmembership(void *n
+ 	wblistv = (gid_t *)response.extra_data.data;
+ 	wblistc = response.data.num_entries;
+ 
++	if (*groupc < maxgrp)				/* add basegid */
++		groups[*groupc] = bgid;
++	else
++		*result = -1;
++	(*groupc)++;
++
+ 	for (i = 0; i < wblistc; i++) {			/* add winbind gids */
+ 		isdup = 0;				/* skip duplicates */
+ 		for (dupc = 0; dupc < MIN(maxgrp, *groupc); dupc++) {
diff --git a/net/samba35/patches/patch-bd b/net/samba35/patches/patch-bd
new file mode 100644
index 00000000000..e049f0855e4
--- /dev/null
+++ b/net/samba35/patches/patch-bd
@@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- ../nsswitch/winbind_nss_linux.c.orig	2011-08-03 18:24:05.000000000 +0000
++++ ../nsswitch/winbind_nss_linux.c
+@@ -254,6 +254,10 @@ static NSS_STATUS fill_pwent(struct pass
+ 	result->pw_age = "";
+ #endif
+ 
++#if HAVE_PASSWD_PW_CLASS
++	result->pw_class = "";
++#endif
++
+ 	return NSS_STATUS_SUCCESS;
+ }
+ 
diff --git a/net/samba35/patches/patch-be b/net/samba35/patches/patch-be
new file mode 100644
index 00000000000..31893367a97
--- /dev/null
+++ b/net/samba35/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- ../nsswitch/pam_winbind.c.orig	2011-08-03 18:24:05.000000000 +0000
++++ ../nsswitch/pam_winbind.c
+@@ -10,6 +10,10 @@
+    <sopwith@redhat.com> (see copyright below for full details)
+ */
+ 
++#ifdef __NetBSD__
++#define NO_STATIC_MODULES
++#endif
++
+ #include "pam_winbind.h"
+ #define CONST_DISCARD(type,ptr) ((type)(void *)ptr)
+ 
diff --git a/net/samba35/patches/patch-bf b/net/samba35/patches/patch-bf
new file mode 100644
index 00000000000..62ec9ab8802
--- /dev/null
+++ b/net/samba35/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+
+--- Makefile.in.orig	2011-08-03 18:24:05.000000000 +0000
++++ Makefile.in
+@@ -2552,7 +2552,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(B
+ bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
+ 	@echo "Linking shared library $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
+-		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
++		$(LIBS) $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
+ 
+ ##########
+ # Plugins: