Update to Samba 3.5.11 from net/samba35, part of Samba packages rearrangement.

56 files changed, 941 insertions, 1797 deletions

diff --git a/net/samba/INSTALL.nss_winbind b/net/samba/INSTALL.nss_winbind
new file mode 100644
index 00000000000..d187e4c8e83
--- /dev/null
+++ b/net/samba/INSTALL.nss_winbind
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL.nss_winbind,v 1.1 2011/12/16 11:05:24 asau 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/samba/Makefile b/net/samba/Makefile
index 34afa5de4e8..b0483e556d2 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,92 +1,98 @@
-# $NetBSD: Makefile,v 1.204 2011/04/22 13:44:27 obache Exp $
+# $NetBSD: Makefile,v 1.205 2011/12/16 11:05:24 asau Exp $
 
-.include "Makefile.mirrors"
+.include "../../net/samba/Makefile.mirrors"
 
-DISTNAME=		samba-${VERSION}
-PKGREVISION=		7
-CATEGORIES=		net
-MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
+DISTNAME=	samba-${VERSION}
+PKGREVISION=	1
+CATEGORIES=	net
+MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
-.include "Makefile.patches"
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.samba.org/
+COMMENT=	SMB/CIFS protocol server suite
+LICENSE=	gnu-gpl-v3
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.samba.org/
-COMMENT=		SMB/CIFS protocol server suite
-LICENSE=		gnu-gpl-v2
-
-VERSION=		3.0.37
-CONFLICTS+=		ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]*	\
-			winbind-[0-9]*
-MAKE_JOBS_SAFE=		NO
+VERSION=	3.5.11
+CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-GNU_CONFIGURE=		yes
+FILESDIR=		${PKGDIR}/../../net/samba/files
+DESCR_SRC=		${PKGDIR}/../../net/samba/DESCR
+MESSAGE_SRC=		${PKGDIR}/../../net/samba/MESSAGE
+WRKSRC=			${WRKDIR}/${DISTNAME}/source3
 BUILD_DEFS+=		VARBASE
-CHECK_WRKREF_SKIP=	*
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_SYSCONFSUBDIR?=	samba
+PKG_SYSCONFSUBDIR=	samba
 SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
-SAMBA_LIBDIR?=		${PREFIX}/lib/samba
+SAMBA_LIBDIR?=		${PREFIX}/lib
 SAMBA_LOCKDIR?=		${SAMBA_VARDIR}/run/samba
 SAMBA_LOGDIR?=		${SAMBA_VARDIR}/log
+SAMBA_MODULESDIR?=	${SAMBA_LIBDIR}/samba
 SAMBA_PIDDIR?=		${SAMBA_VARDIR}/run
 SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
 SAMBA_STATEDIR?=	${SAMBA_VARDIR}/db/samba
 SAMBA_VARDIR?=		${VARBASE}
 WINBINDD_RCD_SCRIPT=	# empty
 
-FILES_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR:Q}
-FILES_SUBST+=		SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q}
-FILES_SUBST+=		SAMBA_LOGDIR=${SAMBA_LOGDIR:Q}
-FILES_SUBST+=		SAMBA_PIDDIR=${SAMBA_PIDDIR:Q}
+FILES_SUBST+=		SAMBA_ETCDIR=${SAMBA_ETCDIR}
+FILES_SUBST+=		SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
+FILES_SUBST+=		SAMBA_LOGDIR=${SAMBA_LOGDIR}
+FILES_SUBST+=		SAMBA_PIDDIR=${SAMBA_PIDDIR}
 FILES_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE:Q}
-FILES_SUBST+=		SAMBA_STATEDIR=${SAMBA_STATEDIR:Q}
-FILES_SUBST+=		SAMBA_VARDIR=${SAMBA_VARDIR:Q}
+FILES_SUBST+=		SAMBA_STATEDIR=${SAMBA_STATEDIR}
+FILES_SUBST+=		SAMBA_VARDIR=${SAMBA_VARDIR}
 FILES_SUBST+=		WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q}
 
-CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR:Q}
-CONFIGURE_ARGS+=	--with-libdir=${SAMBA_LIBDIR:Q}
-CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR:Q}
-CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR:Q}
-CONFIGURE_ARGS+=	--with-piddir=${SAMBA_PIDDIR:Q}
-CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE:Q}
-CONFIGURE_ARGS+=	--with-statedir=${SAMBA_STATEDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${SAMBA_VARDIR:Q}
-
-CONFIGURE_ARGS+=	--with-mandir=${PREFIX:Q}/${PKGMANDIR:Q}
-CONFIGURE_ARGS+=	--with-swatdir=${PREFIX:Q}/share/samba/swat
-
-.include "../../converters/libiconv/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
+# mktemp is useful for the replacement adduser script, but don't require
+# a full dependency since it's not actually needed by samba.
+USE_TOOLS+=		gmake mktemp perl:run
+REPLACE_PERL=		script/findsmb.in
 
+BROKEN_GETTEXT_DETECTION=yes
 USE_GNU_READLINE=	yes
-.include "../../devel/readline/buildlink3.mk"
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
+CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
+CONFIGURE_ARGS+=	--with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+=	--with-logfilebase=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+=	--with-modulesdir=${SAMBA_MODULESDIR}
+CONFIGURE_ARGS+=	--with-piddir=${SAMBA_PIDDIR}
+CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE:Q}
+CONFIGURE_ARGS+=	--with-statedir=${SAMBA_STATEDIR}
+CONFIGURE_ARGS+=	--localstatedir=${SAMBA_VARDIR}
+CONFIGURE_ARGS+=	--with-mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--with-swatdir=${PREFIX}/share/samba/swat
+#
+# Explicitly disable samba4 merged-build option which is broken.
+#
+CONFIGURE_ARGS+=	--enable-merged-build=no
 
-.include "options.mk"
+.include "../../net/samba/options.mk"
 
-# Only Linux supports mount.cifs for mounting a CIFS share into the
-# filesystem.
-#
-PLIST_VARS+=		cifsmount
+PLIST_VARS+=		cifsmount macosx
+
+# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem.
 .if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--with-cifsmount
+CONFIGURE_ARGS+=	--with-cifsmount --with-cifsumount
 PLIST.cifsmount=	yes
 .endif
 
-# mktemp is useful for the replacement adduser script, but don't require
-# a full dependency since it's not actually needed by samba.
-#
-USE_TOOLS+=		mktemp
+.if ${OPSYS} == "Darwin"
+PLIST.macosx=		yes
+.endif
 
-# findsmb uses perl
-#
-USE_TOOLS+=		perl:run
-REPLACE_PERL=		script/findsmb.in
+.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)
 PWD_MKDB!=	${TYPE} pwd_mkdb 2>&1 | \
@@ -96,80 +102,78 @@ MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
-DOCDIR=		share/doc/${PKGBASE}
-EGDIR=		share/examples/${PKGBASE}
+.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}
 
-CONF_FILES=		${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
-MAKE_DIRS=		${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
-OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
-OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
-RCD_SCRIPTS+=		samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
+DOCDIR=		share/doc/${PKGBASE}
+EGDIR=		share/examples/${PKGBASE}
+CONF_FILES=	${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
+MAKE_DIRS=	${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
+OWN_DIRS=	${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
+OWN_DIRS_PERMS=	${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+RCD_SCRIPTS+=	samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 
 SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_FILES.paths=	${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
-SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g' -e 's,@CAT@,${CAT},g'
-SUBST_SED.paths+=	-e 's,@MKTEMP@,${MKTEMP},g' -e 's,@RM@,${RM},g'
-SUBST_SED.paths+=	-e 's,@PWD_MKDB@,${PWD_MKDB},g' -e 's,@SH@,${SH},g'
 SUBST_STAGE.paths=	post-patch
-
-# Get the shared library major and minors for the installed shared
-# libraries.  We'll need these to create the versioned symlinks for
-# the shared libraries because samba Makefile doesn't do it on its
-# own.
-#
-SAMBA_LIBS=		smbclient msrpc smbsharemodes addns
-
-.PHONY: install-samba-lib-symlinks
-.for l in ${SAMBA_LIBS}
-.  for NUM in MAJOR MINOR
-LIB${NUM}_cmd.${l}=	${AWK} -F= '/^LIB${l:tu}_${NUM}/ { print $$2; }' \
-				${WRKSRC:Q}/Makefile.in
-LIB${NUM}.${l}=		${LIB${NUM}_cmd.${l}:sh}
-PLIST_SUBST+=		LIB${NUM}.${l}=${LIB${NUM}.${l}}
-.  endfor
-
-SAMBA_VERSIONS.${l}=	${LIBMAJOR.${l}} ${LIBMAJOR.${l}}.${LIBMINOR.${l}}
-
-.PHONY: install-samba-lib-symlinks-${l}
-install-samba-lib-symlinks: install-samba-lib-symlinks-${l}
-install-samba-lib-symlinks-${l}:
-	for v in ${SAMBA_VERSIONS.${l}}; do				\
-		cd ${DESTDIR}${SAMBA_LIBDIR} &&				\
-			rm -f lib${l}.so.$$v &&				\
-			ln -s lib${l}.so lib${l}.so.$$v;		\
-	done
-.endfor
+SUBST_SED.paths+=	-e 's,@AWK@,${AWK},g'
+SUBST_SED.paths+=	-e 's,@CAT@,${CAT},g'
+SUBST_SED.paths+=	-e 's,@MKTEMP@,${MKTEMP},g'
+SUBST_SED.paths+=	-e 's,@RM@,${RM},g'
+SUBST_SED.paths+=	-e 's,@PWD_MKDB@,${PWD_MKDB},g'
+SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 
 post-extract:
 	${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
 
-post-install: install-samba-lib-symlinks
+post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include
 	${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js
-	for d in idmap pdb rpc; do					\
-		${RMDIR} ${DESTDIR}${SAMBA_LIBDIR}/$$d;			\
-	done
-	cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do	\
+	${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/gpext
+	${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/idmap
+	${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/pdb
+	${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/rpc
+	set -e ; cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \
 		${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
 	done
-	${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
-	${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
-	cd ${WRKDIR}/${DISTNAME}/examples; \
-		${INSTALL_DATA} LDAP/samba.schema ${DESTDIR}${PREFIX}/${EGDIR}; \
-		${INSTALL_DATA} smb.conf.default ${DESTDIR}${PREFIX}/${EGDIR}
-	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
-	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${DESTDIR}${PREFIX}/${EGDIR}
-	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
-	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/libmsrpc.h \
-		${DESTDIR}${PREFIX}/include/libsmbclient.h
+	${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
+		${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
+		${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/LDAP/samba.schema \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/smb.conf.default \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpasswd.sh \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpwdtbl.sh \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${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 "../../security/openssl/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches
deleted file mode 100644
index dfc34e4d66c..00000000000
--- a/net/samba/Makefile.patches
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.patches,v 1.10 2009/03/21 18:25:34 tron Exp $
-#
-# This Makefile fragment describes the recommended patches for the
-# currently packaged version of Samba.  All recommended patches for
-# particular release of Samba are also integrated into the next release
-# of Samba, so upon updating to the latest release of Samba, the
-# PATCHFILES variable should be empty.
-#
-# The PATCHFILES are listed in chronological order according to the time
-# they are added to ${PATCH_SITES}.
-#
-#PATCH_SITES=	http://www.samba.org/samba/patches/patches-${VERSION}/
-#PATCHFILES=
-#PATCH_DIST_STRIP= -p2
-#PATCH_SITES=	http://www.samba.org/samba/ftp/patches/security/
-#PATCHFILES=
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 4d25792d62d..ce03bb42a23 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,12 +1,19 @@
-@comment $NetBSD: PLIST,v 1.44 2009/08/16 16:37:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.45 2011/12/16 11:05:24 asau Exp $
 bin/eventlogadm
 bin/findsmb
+bin/ldbadd
+bin/ldbdel
+bin/ldbedit
+bin/ldbmodify
+bin/ldbrename
+bin/ldbsearch
 bin/net
 bin/nmblookup
 bin/ntlm_auth
 bin/pdbedit
 bin/profiles
 bin/rpcclient
+bin/sharesec
 bin/smbcacls
 bin/smbclient
 bin/smbcontrol
@@ -22,59 +29,82 @@ bin/tdbdump
 bin/tdbtool
 bin/testparm
 ${PLIST.winbind}bin/wbinfo
-include/libmsrpc.h
 include/libsmbclient.h
-${PLIST.winbind}${NSS_WINBIND}
-${PLIST.winbind}${NSS_WINS}
-lib/samba/auth/script.so
-lib/samba/charset/CP437.so
-lib/samba/charset/CP850.so
+include/netapi.h
+include/smb_share_modes.h
+include/talloc.h
+include/tdb.h
+${PLIST.winbind}include/wbclient.h
+${PLIST.winbind}include/wbc_async.h
+lib/libnetapi.${LIBEXT}
+lib/libnetapi.${LIBEXT}.0
+lib/libsmbclient.${LIBEXT}
+lib/libsmbclient.${LIBEXT}.0
+lib/libsmbsharemodes.${LIBEXT}
+lib/libsmbsharemodes.${LIBEXT}.0
+lib/libtalloc.${LIBEXT}
+lib/libtalloc.${LIBEXT}.2
+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}
+${PLIST.macosx}lib/samba/charset/macosxfs.${LIBEXT}
 lib/samba/de.msg
 lib/samba/en.msg
 lib/samba/fi.msg
 lib/samba/fr.msg
 lib/samba/it.msg
 lib/samba/ja.msg
-lib/samba/libaddns.so
-lib/samba/libaddns.so.${LIBMAJOR.addns}
-lib/samba/libaddns.so.${LIBMAJOR.addns}.${LIBMINOR.addns}
-lib/samba/libmsrpc.so
-lib/samba/libmsrpc.so.${LIBMAJOR.msrpc}
-lib/samba/libmsrpc.so.${LIBMAJOR.msrpc}.${LIBMINOR.msrpc}
-lib/samba/libsmbclient.so
-lib/samba/libsmbclient.so.${LIBMAJOR.smbclient}
-lib/samba/libsmbclient.so.${LIBMAJOR.smbclient}.${LIBMINOR.smbclient}
-lib/samba/libsmbsharemodes.so
-lib/samba/libsmbsharemodes.so.${LIBMAJOR.smbsharemodes}
-lib/samba/libsmbsharemodes.so.${LIBMAJOR.smbsharemodes}.${LIBMINOR.smbsharemodes}
 lib/samba/lowcase.dat
 lib/samba/nl.msg
 lib/samba/pl.msg
+lib/samba/ru.msg
 lib/samba/tr.msg
 lib/samba/upcase.dat
 lib/samba/valid.dat
-lib/samba/vfs/audit.so
-lib/samba/vfs/cap.so
-lib/samba/vfs/default_quota.so
-lib/samba/vfs/expand_msdfs.so
-lib/samba/vfs/extd_audit.so
-lib/samba/vfs/fake_perms.so
-lib/samba/vfs/full_audit.so
-lib/samba/vfs/netatalk.so
-${PLIST.fam}lib/samba/vfs/notify_fam.so
-lib/samba/vfs/readahead.so
-lib/samba/vfs/readonly.so
-lib/samba/vfs/recycle.so
-lib/samba/vfs/shadow_copy.so
-${PLIST.pam}lib/security/pam_smbpass.so
-${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.so
+lib/samba/vfs/acl_tdb.${LIBEXT}
+lib/samba/vfs/acl_xattr.${LIBEXT}
+lib/samba/vfs/audit.${LIBEXT}
+lib/samba/vfs/cap.${LIBEXT}
+lib/samba/vfs/catia.${LIBEXT}
+lib/samba/vfs/default_quota.${LIBEXT}
+lib/samba/vfs/expand_msdfs.${LIBEXT}
+lib/samba/vfs/extd_audit.${LIBEXT}
+lib/samba/vfs/fake_perms.${LIBEXT}
+lib/samba/vfs/full_audit.${LIBEXT}
+lib/samba/vfs/netatalk.${LIBEXT}
+${PLIST.fam}lib/samba/vfs/notify_fam.${LIBEXT}
+lib/samba/vfs/preopen.${LIBEXT}
+lib/samba/vfs/readahead.${LIBEXT}
+lib/samba/vfs/readonly.${LIBEXT}
+lib/samba/vfs/recycle.${LIBEXT}
+lib/samba/vfs/scannedonly.${LIBEXT}
+lib/samba/vfs/shadow_copy.${LIBEXT}
+lib/samba/vfs/shadow_copy2.${LIBEXT}
+lib/samba/vfs/smb_traffic_analyzer.${LIBEXT}
+lib/samba/vfs/streams_depot.${LIBEXT}
+lib/samba/vfs/streams_xattr.${LIBEXT}
+lib/samba/vfs/xattr_tdb.${LIBEXT}
+${PLIST.pam}lib/security/pam_smbpass.${LIBEXT}
+${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.${LIBEXT}
 ${PLIST.cups}libexec/cups/backend/smb
 man/man1/findsmb.1
+man/man1/ldbadd.1
+man/man1/ldbdel.1
+man/man1/ldbedit.1
+man/man1/ldbmodify.1
+man/man1/ldbrename.1
+man/man1/ldbsearch.1
 man/man1/log2pcap.1
 man/man1/nmblookup.1
 man/man1/ntlm_auth.1
 man/man1/profiles.1
 man/man1/rpcclient.1
+man/man1/sharesec.1
 man/man1/smbcacls.1
 man/man1/smbclient.1
 man/man1/smbcontrol.1
@@ -87,21 +117,26 @@ man/man1/testparm.1
 man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
+man/man5/pam_winbind.conf.5
 man/man5/smb.conf.5
 man/man5/smbgetrc.5
 man/man5/smbpasswd.5
 man/man7/libsmbclient.7
-man/man7/pam_winbind.7
 man/man7/samba.7
+man/man7/winbind_krb5_locator.7
 man/man8/eventlogadm.8
 man/man8/idmap_ad.8
+man/man8/idmap_adex.8
+man/man8/idmap_hash.8
 man/man8/idmap_ldap.8
 man/man8/idmap_nss.8
 man/man8/idmap_rid.8
 man/man8/idmap_tdb.8
+man/man8/idmap_tdb2.8
 man/man8/mount.cifs.8
 man/man8/net.8
 man/man8/nmbd.8
+man/man8/pam_winbind.8
 man/man8/pdbedit.8
 man/man8/smbd.8
 man/man8/smbpasswd.8
@@ -111,23 +146,33 @@ man/man8/tdbbackup.8
 man/man8/tdbdump.8
 man/man8/tdbtool.8
 man/man8/umount.cifs.8
+man/man8/vfs_acl_tdb.8
+man/man8/vfs_acl_xattr.8
 man/man8/vfs_audit.8
 man/man8/vfs_cacheprime.8
 man/man8/vfs_cap.8
 man/man8/vfs_catia.8
 man/man8/vfs_commit.8
 man/man8/vfs_default_quota.8
+man/man8/vfs_dirsort.8
 man/man8/vfs_extd_audit.8
 man/man8/vfs_fake_perms.8
+man/man8/vfs_fileid.8
 man/man8/vfs_full_audit.8
 man/man8/vfs_gpfs.8
 man/man8/vfs_netatalk.8
 man/man8/vfs_notify_fam.8
 man/man8/vfs_prealloc.8
+man/man8/vfs_preopen.8
 man/man8/vfs_readahead.8
 man/man8/vfs_readonly.8
 man/man8/vfs_recycle.8
+man/man8/vfs_scannedonly.8
 man/man8/vfs_shadow_copy.8
+man/man8/vfs_shadow_copy2.8
+man/man8/vfs_smb_traffic_analyzer.8
+man/man8/vfs_streams_depot.8
+man/man8/vfs_streams_xattr.8
 man/man8/vfs_xattr_tdb.8
 man/man8/winbindd.8
 ${PLIST.cifsmount}sbin/mount.cifs
@@ -143,6 +188,7 @@ share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg
 share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg
 share/doc/samba/Win-NT-DeleteRoamingProfile.reg
 share/doc/samba/Win2000_PlainPassword.reg
+share/doc/samba/Win7_Samba3DomainMember.reg
 share/doc/samba/Win95_PlainPassword.reg
 share/doc/samba/Win98_PlainPassword.reg
 share/doc/samba/Win9X-CacheHandling.reg
@@ -165,7 +211,26 @@ ${PLIST.pam}share/examples/samba/pam_smbpass/password-sync
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 share/examples/samba/updatesmbpasswd.sh
-share/samba/swat/help/Samba3-ByExample/2000users.html
+share/locale/ar/LC_MESSAGES/pam_winbind.mo
+share/locale/cs/LC_MESSAGES/pam_winbind.mo
+share/locale/da/LC_MESSAGES/pam_winbind.mo
+share/locale/de/LC_MESSAGES/net.mo
+share/locale/de/LC_MESSAGES/pam_winbind.mo
+share/locale/es/LC_MESSAGES/pam_winbind.mo
+share/locale/fi/LC_MESSAGES/pam_winbind.mo
+share/locale/fr/LC_MESSAGES/pam_winbind.mo
+share/locale/hu/LC_MESSAGES/pam_winbind.mo
+share/locale/it/LC_MESSAGES/pam_winbind.mo
+share/locale/ja/LC_MESSAGES/pam_winbind.mo
+share/locale/ko/LC_MESSAGES/pam_winbind.mo
+share/locale/nb/LC_MESSAGES/pam_winbind.mo
+share/locale/nl/LC_MESSAGES/pam_winbind.mo
+share/locale/pl/LC_MESSAGES/pam_winbind.mo
+share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
+share/locale/ru/LC_MESSAGES/pam_winbind.mo
+share/locale/sv/LC_MESSAGES/pam_winbind.mo
+share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
+share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
 share/samba/swat/help/Samba3-ByExample/Big500users.html
 share/samba/swat/help/Samba3-ByExample/DMSMig.html
 share/samba/swat/help/Samba3-ByExample/DomApps.html
@@ -177,48 +242,10 @@ share/samba/swat/help/Samba3-ByExample/appendix.html
 share/samba/swat/help/Samba3-ByExample/ch14.html
 share/samba/swat/help/Samba3-ByExample/go01.html
 share/samba/swat/help/Samba3-ByExample/happy.html
-share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
-share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
-share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
-share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
-share/samba/swat/help/Samba3-ByExample/images/acct2net.png
-share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
-share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
-share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
-share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
-share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
-share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-share/samba/swat/help/Samba3-ByExample/images/lam-config.png
-share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
-share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
-share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
-share/samba/swat/help/Samba3-ByExample/images/lam-login.png
-share/samba/swat/help/Samba3-ByExample/images/lam-users.png
-share/samba/swat/help/Samba3-ByExample/images/openmag.png
-share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
-share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
-share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
-share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
-share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
 share/samba/swat/help/Samba3-ByExample/index.html
 share/samba/swat/help/Samba3-ByExample/ix01.html
 share/samba/swat/help/Samba3-ByExample/kerberos.html
+share/samba/swat/help/Samba3-ByExample/net2000users.html
 share/samba/swat/help/Samba3-ByExample/ntmigration.html
 share/samba/swat/help/Samba3-ByExample/nw4migration.html
 share/samba/swat/help/Samba3-ByExample/pr01.html
@@ -290,60 +317,6 @@ share/samba/swat/help/Samba3-HOWTO/domain-member.html
 share/samba/swat/help/Samba3-HOWTO/go01.html
 share/samba/swat/help/Samba3-HOWTO/groupmapping.html
 share/samba/swat/help/Samba3-HOWTO/idmapper.html
-share/samba/swat/help/Samba3-HOWTO/images/10small.png
-share/samba/swat/help/Samba3-HOWTO/images/11small.png
-share/samba/swat/help/Samba3-HOWTO/images/12small.png
-share/samba/swat/help/Samba3-HOWTO/images/13small.png
-share/samba/swat/help/Samba3-HOWTO/images/14small.png
-share/samba/swat/help/Samba3-HOWTO/images/1small.png
-share/samba/swat/help/Samba3-HOWTO/images/2small.png
-share/samba/swat/help/Samba3-HOWTO/images/3small.png
-share/samba/swat/help/Samba3-HOWTO/images/4small.png
-share/samba/swat/help/Samba3-HOWTO/images/5small.png
-share/samba/swat/help/Samba3-HOWTO/images/6small.png
-share/samba/swat/help/Samba3-HOWTO/images/7small.png
-share/samba/swat/help/Samba3-HOWTO/images/8small.png
-share/samba/swat/help/Samba3-HOWTO/images/9small.png
-share/samba/swat/help/Samba3-HOWTO/images/WME001.png
-share/samba/swat/help/Samba3-HOWTO/images/WME002.png
-share/samba/swat/help/Samba3-HOWTO/images/WME003.png
-share/samba/swat/help/Samba3-HOWTO/images/WME005.png
-share/samba/swat/help/Samba3-HOWTO/images/WME009.png
-share/samba/swat/help/Samba3-HOWTO/images/WME010.png
-share/samba/swat/help/Samba3-HOWTO/images/WME013.png
-share/samba/swat/help/Samba3-HOWTO/images/WME014.png
-share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
-share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
-share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
-share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
-share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
-share/samba/swat/help/Samba3-HOWTO/images/a_small.png
-share/samba/swat/help/Samba3-HOWTO/images/access1.png
-share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
-share/samba/swat/help/Samba3-HOWTO/images/cups1.png
-share/samba/swat/help/Samba3-HOWTO/images/cups2.png
-share/samba/swat/help/Samba3-HOWTO/images/domain.png
-share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
-share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
-share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
-share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
-share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
-share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
-share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
-share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
-share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
-share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
-share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
-share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
-share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
 share/samba/swat/help/Samba3-HOWTO/index.html
 share/samba/swat/help/Samba3-HOWTO/install.html
 share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@@ -365,6 +338,7 @@ share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
 share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
 share/samba/swat/help/Samba3-HOWTO/securing-samba.html
 share/samba/swat/help/Samba3-HOWTO/speed.html
+share/samba/swat/help/Samba3-HOWTO/tdb.html
 share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
 share/samba/swat/help/Samba3-HOWTO/type.html
 share/samba/swat/help/Samba3-HOWTO/unicode.html
@@ -374,11 +348,21 @@ share/samba/swat/help/manpages/cifs.upcall.8.html
 share/samba/swat/help/manpages/eventlogadm.8.html
 share/samba/swat/help/manpages/findsmb.1.html
 share/samba/swat/help/manpages/idmap_ad.8.html
+share/samba/swat/help/manpages/idmap_adex.8.html
+share/samba/swat/help/manpages/idmap_hash.8.html
 share/samba/swat/help/manpages/idmap_ldap.8.html
 share/samba/swat/help/manpages/idmap_nss.8.html
 share/samba/swat/help/manpages/idmap_rid.8.html
 share/samba/swat/help/manpages/idmap_tdb.8.html
+share/samba/swat/help/manpages/idmap_tdb2.8.html
 share/samba/swat/help/manpages/index.html
+share/samba/swat/help/manpages/ldb.3.html
+share/samba/swat/help/manpages/ldbadd.1.html
+share/samba/swat/help/manpages/ldbdel.1.html
+share/samba/swat/help/manpages/ldbedit.1.html
+share/samba/swat/help/manpages/ldbmodify.1.html
+share/samba/swat/help/manpages/ldbrename.1.html
+share/samba/swat/help/manpages/ldbsearch.1.html
 share/samba/swat/help/manpages/libsmbclient.7.html
 share/samba/swat/help/manpages/lmhosts.5.html
 share/samba/swat/help/manpages/log2pcap.1.html
@@ -387,11 +371,13 @@ share/samba/swat/help/manpages/net.8.html
 share/samba/swat/help/manpages/nmbd.8.html
 share/samba/swat/help/manpages/nmblookup.1.html
 share/samba/swat/help/manpages/ntlm_auth.1.html
-share/samba/swat/help/manpages/pam_winbind.7.html
+share/samba/swat/help/manpages/pam_winbind.8.html
+share/samba/swat/help/manpages/pam_winbind.conf.5.html
 share/samba/swat/help/manpages/pdbedit.8.html
 share/samba/swat/help/manpages/profiles.1.html
 share/samba/swat/help/manpages/rpcclient.1.html
 share/samba/swat/help/manpages/samba.7.html
+share/samba/swat/help/manpages/sharesec.1.html
 share/samba/swat/help/manpages/smb.conf.5.html
 share/samba/swat/help/manpages/smbcacls.1.html
 share/samba/swat/help/manpages/smbclient.1.html
@@ -400,41 +386,49 @@ share/samba/swat/help/manpages/smbcquotas.1.html
 share/samba/swat/help/manpages/smbd.8.html
 share/samba/swat/help/manpages/smbget.1.html
 share/samba/swat/help/manpages/smbgetrc.5.html
-share/samba/swat/help/manpages/smbmnt.8.html
-share/samba/swat/help/manpages/smbmount.8.html
 share/samba/swat/help/manpages/smbpasswd.5.html
 share/samba/swat/help/manpages/smbpasswd.8.html
 share/samba/swat/help/manpages/smbspool.8.html
 share/samba/swat/help/manpages/smbstatus.1.html
 share/samba/swat/help/manpages/smbtar.1.html
 share/samba/swat/help/manpages/smbtree.1.html
-share/samba/swat/help/manpages/smbumount.8.html
 share/samba/swat/help/manpages/swat.8.html
 share/samba/swat/help/manpages/tdbbackup.8.html
 share/samba/swat/help/manpages/tdbdump.8.html
 share/samba/swat/help/manpages/tdbtool.8.html
 share/samba/swat/help/manpages/testparm.1.html
 share/samba/swat/help/manpages/umount.cifs.8.html
+share/samba/swat/help/manpages/vfs_acl_tdb.8.html
+share/samba/swat/help/manpages/vfs_acl_xattr.8.html
 share/samba/swat/help/manpages/vfs_audit.8.html
 share/samba/swat/help/manpages/vfs_cacheprime.8.html
 share/samba/swat/help/manpages/vfs_cap.8.html
 share/samba/swat/help/manpages/vfs_catia.8.html
 share/samba/swat/help/manpages/vfs_commit.8.html
 share/samba/swat/help/manpages/vfs_default_quota.8.html
+share/samba/swat/help/manpages/vfs_dirsort.8.html
 share/samba/swat/help/manpages/vfs_extd_audit.8.html
 share/samba/swat/help/manpages/vfs_fake_perms.8.html
+share/samba/swat/help/manpages/vfs_fileid.8.html
 share/samba/swat/help/manpages/vfs_full_audit.8.html
 share/samba/swat/help/manpages/vfs_gpfs.8.html
 share/samba/swat/help/manpages/vfs_netatalk.8.html
 share/samba/swat/help/manpages/vfs_notify_fam.8.html
 share/samba/swat/help/manpages/vfs_prealloc.8.html
+share/samba/swat/help/manpages/vfs_preopen.8.html
 share/samba/swat/help/manpages/vfs_readahead.8.html
 share/samba/swat/help/manpages/vfs_readonly.8.html
 share/samba/swat/help/manpages/vfs_recycle.8.html
+share/samba/swat/help/manpages/vfs_scannedonly.8.html
 share/samba/swat/help/manpages/vfs_shadow_copy.8.html
+share/samba/swat/help/manpages/vfs_shadow_copy2.8.html
+share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
+share/samba/swat/help/manpages/vfs_streams_depot.8.html
+share/samba/swat/help/manpages/vfs_streams_xattr.8.html
 share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
 share/samba/swat/help/manpages/vfstest.1.html
 share/samba/swat/help/manpages/wbinfo.1.html
+share/samba/swat/help/manpages/winbind_krb5_locator.7.html
 share/samba/swat/help/manpages/winbindd.8.html
 share/samba/swat/help/welcome-no-samba-doc.html
 share/samba/swat/help/welcome.html
@@ -459,166 +453,3 @@ share/samba/swat/lang/tr/images/samba.gif
 share/samba/swat/lang/tr/images/shares.gif
 share/samba/swat/lang/tr/images/status.gif
 share/samba/swat/lang/tr/images/viewconfig.gif
-share/samba/swat/using_samba/appa.html
-share/samba/swat/using_samba/appb.html
-share/samba/swat/using_samba/appc.html
-share/samba/swat/using_samba/appd.html
-share/samba/swat/using_samba/appe.html
-share/samba/swat/using_samba/appf.html
-share/samba/swat/using_samba/appg.html
-share/samba/swat/using_samba/ch00.html
-share/samba/swat/using_samba/ch01.html
-share/samba/swat/using_samba/ch02.html
-share/samba/swat/using_samba/ch03.html
-share/samba/swat/using_samba/ch04.html
-share/samba/swat/using_samba/ch05.html
-share/samba/swat/using_samba/ch06.html
-share/samba/swat/using_samba/ch07.html
-share/samba/swat/using_samba/ch08.html
-share/samba/swat/using_samba/ch09.html
-share/samba/swat/using_samba/ch10.html
-share/samba/swat/using_samba/ch11.html
-share/samba/swat/using_samba/ch12.html
-share/samba/swat/using_samba/figs/sam2_0101.gif
-share/samba/swat/using_samba/figs/sam2_0102.gif
-share/samba/swat/using_samba/figs/sam2_0103.gif
-share/samba/swat/using_samba/figs/sam2_0104.gif
-share/samba/swat/using_samba/figs/sam2_0105.gif
-share/samba/swat/using_samba/figs/sam2_0106.gif
-share/samba/swat/using_samba/figs/sam2_0107.gif
-share/samba/swat/using_samba/figs/sam2_0108.gif
-share/samba/swat/using_samba/figs/sam2_0109.gif
-share/samba/swat/using_samba/figs/sam2_0110.gif
-share/samba/swat/using_samba/figs/sam2_0111.gif
-share/samba/swat/using_samba/figs/sam2_0112.gif
-share/samba/swat/using_samba/figs/sam2_0113.gif
-share/samba/swat/using_samba/figs/sam2_0114.gif
-share/samba/swat/using_samba/figs/sam2_0201.gif
-share/samba/swat/using_samba/figs/sam2_0202.gif
-share/samba/swat/using_samba/figs/sam2_0203.gif
-share/samba/swat/using_samba/figs/sam2_0204.gif
-share/samba/swat/using_samba/figs/sam2_0301.gif
-share/samba/swat/using_samba/figs/sam2_0302.gif
-share/samba/swat/using_samba/figs/sam2_0303.gif
-share/samba/swat/using_samba/figs/sam2_0304.gif
-share/samba/swat/using_samba/figs/sam2_0305.gif
-share/samba/swat/using_samba/figs/sam2_0306.gif
-share/samba/swat/using_samba/figs/sam2_0307.gif
-share/samba/swat/using_samba/figs/sam2_0308.gif
-share/samba/swat/using_samba/figs/sam2_0309.gif
-share/samba/swat/using_samba/figs/sam2_0310.gif
-share/samba/swat/using_samba/figs/sam2_0311.gif
-share/samba/swat/using_samba/figs/sam2_0312.gif
-share/samba/swat/using_samba/figs/sam2_0313.gif
-share/samba/swat/using_samba/figs/sam2_0314.gif
-share/samba/swat/using_samba/figs/sam2_0315.gif
-share/samba/swat/using_samba/figs/sam2_0316.gif
-share/samba/swat/using_samba/figs/sam2_0317.gif
-share/samba/swat/using_samba/figs/sam2_0318.gif
-share/samba/swat/using_samba/figs/sam2_0319.gif
-share/samba/swat/using_samba/figs/sam2_0320.gif
-share/samba/swat/using_samba/figs/sam2_0321.gif
-share/samba/swat/using_samba/figs/sam2_0322.gif
-share/samba/swat/using_samba/figs/sam2_0323.gif
-share/samba/swat/using_samba/figs/sam2_0324.gif
-share/samba/swat/using_samba/figs/sam2_0325.gif
-share/samba/swat/using_samba/figs/sam2_0326.gif
-share/samba/swat/using_samba/figs/sam2_0327.gif
-share/samba/swat/using_samba/figs/sam2_0328.gif
-share/samba/swat/using_samba/figs/sam2_0329.gif
-share/samba/swat/using_samba/figs/sam2_0330.gif
-share/samba/swat/using_samba/figs/sam2_0331.gif
-share/samba/swat/using_samba/figs/sam2_0332.gif
-share/samba/swat/using_samba/figs/sam2_0333.gif
-share/samba/swat/using_samba/figs/sam2_0334.gif
-share/samba/swat/using_samba/figs/sam2_0335.gif
-share/samba/swat/using_samba/figs/sam2_0336.gif
-share/samba/swat/using_samba/figs/sam2_0337.gif
-share/samba/swat/using_samba/figs/sam2_0338.gif
-share/samba/swat/using_samba/figs/sam2_0339.gif
-share/samba/swat/using_samba/figs/sam2_0340.gif
-share/samba/swat/using_samba/figs/sam2_0341.gif
-share/samba/swat/using_samba/figs/sam2_0342.gif
-share/samba/swat/using_samba/figs/sam2_0343.gif
-share/samba/swat/using_samba/figs/sam2_0344.gif
-share/samba/swat/using_samba/figs/sam2_0345.gif
-share/samba/swat/using_samba/figs/sam2_0346.gif
-share/samba/swat/using_samba/figs/sam2_0347.gif
-share/samba/swat/using_samba/figs/sam2_0348.gif
-share/samba/swat/using_samba/figs/sam2_0349.gif
-share/samba/swat/using_samba/figs/sam2_0350.gif
-share/samba/swat/using_samba/figs/sam2_0351.gif
-share/samba/swat/using_samba/figs/sam2_0352.gif
-share/samba/swat/using_samba/figs/sam2_0353.gif
-share/samba/swat/using_samba/figs/sam2_0354.gif
-share/samba/swat/using_samba/figs/sam2_0355.gif
-share/samba/swat/using_samba/figs/sam2_0356.gif
-share/samba/swat/using_samba/figs/sam2_0357.gif
-share/samba/swat/using_samba/figs/sam2_0358.gif
-share/samba/swat/using_samba/figs/sam2_0359.gif
-share/samba/swat/using_samba/figs/sam2_0360.gif
-share/samba/swat/using_samba/figs/sam2_0361.gif
-share/samba/swat/using_samba/figs/sam2_0401.gif
-share/samba/swat/using_samba/figs/sam2_0402.gif
-share/samba/swat/using_samba/figs/sam2_0403.gif
-share/samba/swat/using_samba/figs/sam2_0404.gif
-share/samba/swat/using_samba/figs/sam2_0405.gif
-share/samba/swat/using_samba/figs/sam2_0406.gif
-share/samba/swat/using_samba/figs/sam2_0407.gif
-share/samba/swat/using_samba/figs/sam2_0408.gif
-share/samba/swat/using_samba/figs/sam2_0409.gif
-share/samba/swat/using_samba/figs/sam2_0410.gif
-share/samba/swat/using_samba/figs/sam2_0411.gif
-share/samba/swat/using_samba/figs/sam2_0412.gif
-share/samba/swat/using_samba/figs/sam2_0413.gif
-share/samba/swat/using_samba/figs/sam2_0414.gif
-share/samba/swat/using_samba/figs/sam2_0415.gif
-share/samba/swat/using_samba/figs/sam2_0416.gif
-share/samba/swat/using_samba/figs/sam2_0417.gif
-share/samba/swat/using_samba/figs/sam2_0501.gif
-share/samba/swat/using_samba/figs/sam2_0502.gif
-share/samba/swat/using_samba/figs/sam2_0503.gif
-share/samba/swat/using_samba/figs/sam2_0504.gif
-share/samba/swat/using_samba/figs/sam2_0505.gif
-share/samba/swat/using_samba/figs/sam2_0506.gif
-share/samba/swat/using_samba/figs/sam2_0507.gif
-share/samba/swat/using_samba/figs/sam2_0508.gif
-share/samba/swat/using_samba/figs/sam2_0601.gif
-share/samba/swat/using_samba/figs/sam2_0602.gif
-share/samba/swat/using_samba/figs/sam2_0603.gif
-share/samba/swat/using_samba/figs/sam2_0604.gif
-share/samba/swat/using_samba/figs/sam2_0605.gif
-share/samba/swat/using_samba/figs/sam2_0701.gif
-share/samba/swat/using_samba/figs/sam2_0801.gif
-share/samba/swat/using_samba/figs/sam2_0802.gif
-share/samba/swat/using_samba/figs/sam2_0803.gif
-share/samba/swat/using_samba/figs/sam2_0804.gif
-share/samba/swat/using_samba/figs/sam2_0805.gif
-share/samba/swat/using_samba/figs/sam2_0806.gif
-share/samba/swat/using_samba/figs/sam2_0807.gif
-share/samba/swat/using_samba/figs/sam2_0808.gif
-share/samba/swat/using_samba/figs/sam2_0809.gif
-share/samba/swat/using_samba/figs/sam2_0810.gif
-share/samba/swat/using_samba/figs/sam2_0811.gif
-share/samba/swat/using_samba/figs/sam2_0901.gif
-share/samba/swat/using_samba/figs/sam2_0902.gif
-share/samba/swat/using_samba/figs/sam2_0903.gif
-share/samba/swat/using_samba/figs/sam2_1001.gif
-share/samba/swat/using_samba/figs/sam2_1002.gif
-share/samba/swat/using_samba/figs/sam2_1003.gif
-share/samba/swat/using_samba/figs/sam2_1004.gif
-share/samba/swat/using_samba/figs/sam2_1005.gif
-share/samba/swat/using_samba/figs/sam2_1006.gif
-share/samba/swat/using_samba/figs/sam2_1101.gif
-share/samba/swat/using_samba/figs/sam2_1102.gif
-share/samba/swat/using_samba/figs/sam2_af01.gif
-share/samba/swat/using_samba/figs/sam2_af02.gif
-share/samba/swat/using_samba/figs/sam2_af03.gif
-share/samba/swat/using_samba/figs/sam2_af04.gif
-share/samba/swat/using_samba/figs/sam2_af05.gif
-share/samba/swat/using_samba/figs/sam2_af06.gif
-share/samba/swat/using_samba/figs/sam2_af07.gif
-share/samba/swat/using_samba/inx.html
-share/samba/swat/using_samba/samba2_s.gif
-share/samba/swat/using_samba/samba2_xs.gif
-share/samba/swat/using_samba/toc.html
diff --git a/net/samba/distinfo b/net/samba/distinfo
index b29fa2646d1..5976a324ce2 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,44 +1,34 @@
-$NetBSD: distinfo,v 1.76 2011/08/02 14:05:27 taca Exp $
+$NetBSD: distinfo,v 1.77 2011/12/16 11:05:24 asau Exp $
 
-SHA1 (samba-3.0.37.tar.gz) = 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd
-RMD160 (samba-3.0.37.tar.gz) = 06b76ae22729e10c83d6af42d03b03ad69e49103
-Size (samba-3.0.37.tar.gz) = 23416703 bytes
-SHA1 (patch-aa) = c3a1fd7cf6f8db8ea4001c697b19df555b496b29
-SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
-SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
-SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
-SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
-SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
-SHA1 (patch-at) = de18d1fa7f1d4a2e9e3c0b28173584c7d42ed710
-SHA1 (patch-au) = e8a86ff28c2e22e1a9c3b80b90bcaea573b856ca
-SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
-SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
-SHA1 (patch-ax) = e528921710514bc2651bfca808c21d608f928a95
-SHA1 (patch-ay) = e6ccc4fb20fa909f5d3cecbc4bf3628ba5b355e9
-SHA1 (patch-ba) = e343938306be37a5d364f47effe0b1187b64fe47
-SHA1 (patch-bc) = d525b9201a5cda85346704ad7b860e2b3a3aeb08
-SHA1 (patch-bd) = faf24c792ecff76972d0a80f5418d8c38ca9ed21
-SHA1 (patch-be) = b3386824969a1a02cf8e5d5a9889ce55f6813f48
-SHA1 (patch-bg) = fb37c0496006258ac437f95acf6fe506bd19a68a
-SHA1 (patch-bh) = 3098da6f800f66f46615af853c94e09e2a984b24
-SHA1 (patch-bi) = 187427d1b884c6ae49369a7d33785cdd810e1769
-SHA1 (patch-bm) = 20107d012f7e17f34cbaca8b8059214273f687ba
-SHA1 (patch-bn) = e6071e4adf05c132d7e5ef0cc529b4e3df1cf567
-SHA1 (patch-bo) = a846f8ae3f7c92c99cf34c04a33ef0cf89dae9cf
-SHA1 (patch-bp) = ab55020e477ff36403b1e5a9ce97b2118cdf5cde
-SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
-SHA1 (patch-br) = fc0d4c1f638a534f86e59ed8ebaddbf1978fa64f
-SHA1 (patch-bs) = da62a8e59fbab1b9ef9fbcd623f5d63816667447
-SHA1 (patch-bu) = 317d0a197e4564c6ab734890302c1f73cc54e1df
-SHA1 (patch-bv) = 2d80f4e24edab32bf4f620f651e70b9e63d28cc5
-SHA1 (patch-bw) = 83a57fd2c21e1abd1bfab046e867096d46931958
-SHA1 (patch-ca) = 0c2c4c1bdb3348de3e8719cc468a6e0c28a36b73
-SHA1 (patch-ce) = 81c6c2d9c6c0df7180d41a0382f2b4600f545620
-SHA1 (patch-cf) = 8b50f657f8f4fa71936ec4766c2517ca5d128ff7
-SHA1 (patch-cg) = 2755a019759826a39c3e201f6a0d1646e6dd2fba
-SHA1 (patch-ch) = 3c4c404519154e294cee134ddb4d2b9c7d8e02a2
-SHA1 (patch-ci) = d78298d0997cf7877cfe2411355fb6c61dec17f6
-SHA1 (patch-da) = 2dddd250b2207d658b02ff43b46199ce4305b7f8
-SHA1 (patch-ee) = d52511dc7d065db7ba1464138c4bc85cfe2f0d59
-SHA1 (patch-lib_replace_test_os2__delete.c) = 27958a98f37fdc03e109c641d768721e4e587f31
-SHA1 (patch-libsmb_clikrb5.c) = 0efe8e7b06588a727b8cf459ed6e9dc46d1b8f13
+SHA1 (samba-3.5.11.tar.gz) = 0801871ab6a11f7d8eb8bf32ff0b87896d263441
+RMD160 (samba-3.5.11.tar.gz) = b3ee1e044e9df417b0dcaf954a6a137db742cba3
+Size (samba-3.5.11.tar.gz) = 30752782 bytes
+SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
+SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
+SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
+SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
+SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
+SHA1 (patch-af) = 275cb3b20d6fe9f000ba3c51bc9450a428e782cb
+SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf
+SHA1 (patch-ah) = 6142078efec4263124aa793108c43eef0ce61da4
+SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386
+SHA1 (patch-aj) = aecf98cf53e6bf6890e0fc9a40e6936df5f20a1a
+SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3
+SHA1 (patch-al) = f347808c376922da057256d3614a34b556721a66
+SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d
+SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1
+SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1
+SHA1 (patch-ap) = 3a47d212b1c29a6b3c46b83903c4f011c28a8c3c
+SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b
+SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a
+SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61
+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/samba/patches/patch-aa b/net/samba/patches/patch-aa
index fa7f1e8e9f2..39b27e4e8a7 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.33 2009/10/04 16:58:38 taca Exp $
+$NetBSD: patch-aa,v 1.34 2011/12/16 11:05:24 asau Exp $
 
---- nsswitch/pam_winbind.c.orig	2009-09-30 21:21:56.000000000 +0900
-+++ nsswitch/pam_winbind.c
-@@ -1295,6 +1295,8 @@ static char *_pam_delete(register char *
- 	return NULL;
- }
- 
-+PAM_EXTERN int pam_sm_close_session(pam_handle_t *, int, int, const char **);
-+
- /*
-  * obtain a password from the user
-  */
+Avoid an infinite loop in the configure script after 
+"checking for replacing readdir using getdirentries()..."
+
+--- ../lib/replace/test/os2_delete.c.orig	2011-07-24 20:04:44.000000000 +0000
++++ ../lib/replace/test/os2_delete.c	2011-08-01 08:09:59.000000000 +0000
+@@ -116,6 +116,7 @@
+ 	while (1) {
+ 		int n = os2_delete(d);
+ 		if (n == 0) break;
++		if (test_readdir_os2_delete_ret != 0) break; /* if FAILED */
+ 		total_deleted += n;
+ 	}
+ 	closedir(d);
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
new file mode 100644
index 00000000000..cd5d0c3988f
--- /dev/null
+++ b/net/samba/patches/patch-ab
@@ -0,0 +1,57 @@
+$NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $
+
+--- ../examples/smb.conf.default.orig	2010-01-14 10:12:10.000000000 +0000
++++ ../examples/smb.conf.default
+@@ -26,7 +26,7 @@
+    workgroup = MYGROUP
+ 
+ # server string is the equivalent of the NT Description field
+-   server string = Samba Server
++   server string = Samba %v (%h)
+ 
+ # Security mode. Defines in which mode Samba will operate. Possible 
+ # values are share, user, server, domain and ads. Most people will want 
+@@ -63,10 +63,10 @@
+ 
+ # this tells Samba to use a separate log file for each machine
+ # that connects
+-   log file = /usr/local/samba/var/log.%m
++;  log file = @VARBASE@/log/log.%m
+ 
+ # Put a capping on the size of the log files (in Kb).
+-   max log size = 50
++;  max log size = 50
+ 
+ # Use password server option only with security = server
+ # The argument list may include:
+@@ -145,7 +145,7 @@
+ 
+ # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+ # via DNS nslookups. The default is NO.
+-   dns proxy = no 
++;  dns proxy = no 
+ 
+ # These scripts are used on a domain controller or stand-alone 
+ # machine to add or delete corresponding unix accounts
+@@ -182,14 +182,14 @@
+ 
+ # NOTE: If you have a BSD-style print system there is no need to 
+ # specifically define each individual printer
+-[printers]
+-   comment = All Printers
+-   path = /usr/spool/samba
+-   browseable = no
++;[printers]
++;   comment = All Printers
++;   path = /usr/spool/samba
++;   browseable = no
+ # Set public = yes to allow user 'guest account' to print
+-   guest ok = no
+-   writable = no
+-   printable = yes
++;   guest ok = no
++;   writable = no
++;   printable = yes
+ 
+ # This one is useful for people to share files
+ ;[tmp]
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
index 7c76474752a..dc93bd78dfc 100644
--- a/net/samba/patches/patch-ac
+++ b/net/samba/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.13 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-ac,v 1.14 2011/12/16 11:05:24 asau Exp $
 
---- include/local.h.orig	2005-10-12 13:03:38.000000000 -0400
-+++ include/local.h
-@@ -170,10 +170,10 @@
-  * Default passwd chat script.
-  */
+--- libads/kerberos.c.orig	2010-12-05 21:57:18.000000000 +0000
++++ libads/kerberos.c
+@@ -460,7 +460,7 @@ char* kerberos_secrets_fetch_des_salt( v
  
--#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
-+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
+ 	if ( (key = des_salt_key()) == NULL ) {
+ 		DEBUG(0,("kerberos_secrets_fetch_des_salt: failed to generate key!\n"));
+-		return False;
++		return NULL;
+ 	}
  
- /* Minimum length of allowed password when changing UNIX password. */
--#define MINPASSWDLENGTH 5
-+#define MINPASSWDLENGTH 6
- 
- /* maximum ID number used for session control. This cannot be larger
-    than 62*62 for the current code */
+ 	salt = (char*)secrets_fetch( key, NULL );
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
new file mode 100644
index 00000000000..a06df65d0a3
--- /dev/null
+++ b/net/samba/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.18 2011/12/16 11:05:24 asau Exp $
+
+--- VERSION.orig	2010-01-14 10:12:10.000000000 +0000
++++ VERSION
+@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
+ #       SAMBA_VERSION_VENDOR_FUNCTION                  #
+ #                                                      #
+ ########################################################
+-SAMBA_VERSION_VENDOR_SUFFIX=
++SAMBA_VERSION_VENDOR_SUFFIX="pkgsrc"
+ SAMBA_VERSION_VENDOR_PATCH=
+ 
+ ########################################################
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
index aa6a37732e6..aee34b70b07 100644
--- a/net/samba/patches/patch-ae
+++ b/net/samba/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.9 2008/04/03 20:19:42 jlam Exp $
+$NetBSD: patch-ae,v 1.10 2011/12/16 11:05:24 asau Exp $
 
---- auth/pampass.c.orig	2005-10-12 13:03:28.000000000 -0400
+--- auth/pampass.c.orig	2010-01-14 10:12:10.000000000 +0000
 +++ auth/pampass.c
-@@ -43,6 +43,10 @@
- 
- #include <security/pam_appl.h>
+@@ -46,6 +46,10 @@
+ #include <pam/pam_appl.h>
+ #endif
  
 +#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR)
 +#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 2869209cd89..58232d59d82 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,57 +1,153 @@
-$NetBSD: patch-af,v 1.8 2007/02/11 18:39:04 tron Exp $
+$NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $
 
---- ../examples/smb.conf.default.orig	2007-02-04 18:59:31.000000000 +0000
-+++ ../examples/smb.conf.default	2007-02-11 15:22:45.000000000 +0000
-@@ -26,7 +26,7 @@
-    workgroup = MYGROUP
- 
- # server string is the equivalent of the NT Description field
--   server string = Samba Server
-+   server string = Samba %v (%h)
- 
- # Security mode. Defines in which mode Samba will operate. Possible 
- # values are share, user, server, domain and ads. Most people will want 
-@@ -63,10 +63,10 @@
- 
- # this tells Samba to use a separate log file for each machine
- # that connects
--   log file = /usr/local/samba/var/log.%m
-+;  log file = /usr/local/samba/var/log.%m
- 
- # Put a capping on the size of the log files (in Kb).
--   max log size = 50
-+;  max log size = 50
- 
- # Use password server option only with security = server
- # The argument list may include:
-@@ -145,7 +145,7 @@
- 
- # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
- # via DNS nslookups. The default is NO.
--   dns proxy = no 
-+;   dns proxy = no 
- 
- # These scripts are used on a domain controller or stand-alone 
- # machine to add or delete corresponding unix accounts
-@@ -182,14 +182,14 @@
- 
- # NOTE: If you have a BSD-style print system there is no need to 
- # specifically define each individual printer
--[printers]
--   comment = All Printers
--   path = /usr/spool/samba
--   browseable = no
-+;[printers]
-+;   comment = All Printers
-+;   path = /var/tmp
-+;   browseable = no
- # Set public = yes to allow user 'guest account' to print
--   guest ok = no
--   writable = no
--   printable = yes
-+;   guest ok = no
-+;   writable = no
-+;   printable = yes
- 
- # This one is useful for people to share files
- ;[tmp]
+--- configure.orig	2011-08-03 18:25:14.000000000 +0000
++++ configure
+@@ -18345,6 +18345,7 @@ $as_echo "#define DARWINOS 1" >>confdefs
+ 
+ 			BLDSHARED="true"
+ 			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
++			SONAMEFLAG="-install_name \$(LIBDIR)/"
+ 			CFLAGS="$CFLAGS -fno-common"
+ 			SHLD="\${CC}"
+ 			SHLIBEXT="dylib"
+@@ -18381,7 +18382,7 @@ fi
+ $as_echo "$BLDSHARED" >&6; }
+ 
+ saved_before_as_needed_ldflags="$LDFLAGS"
+-for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
++for flags in "-Wl,-z,ignore" "-z ignore" ; do
+ 	saved_ldflags="$LDFLAGS"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+@@ -25355,9 +25356,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+ 
+ 
+ 
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_set_key in -lcrypto" >&5
+-$as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
+-if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then :
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_des_cbc in -lcrypto" >&5
++$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; }
++if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -25369,31 +25370,31 @@ else
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char des_set_key ();
++char EVP_des_cbc ();
+ int
+ main ()
+ {
+-return des_set_key ();
++return EVP_des_cbc ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ext_crypto_des_set_key=yes;
++  ac_cv_lib_ext_crypto_EVP_des_cbc=yes;
+ 		  ac_cv_lib_ext_crypto=yes
+ else
+-  ac_cv_lib_ext_crypto_des_set_key=no;
++  ac_cv_lib_ext_crypto_EVP_des_cbc=no;
+ 		  ac_cv_lib_ext_crypto=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_crypto_des_set_key" >&5
+-$as_echo "$ac_cv_lib_ext_crypto_des_set_key" >&6; }
+-    if test $ac_cv_lib_ext_crypto_des_set_key = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_crypto_EVP_des_cbc" >&5
++$as_echo "$ac_cv_lib_ext_crypto_EVP_des_cbc" >&6; }
++    if test $ac_cv_lib_ext_crypto_EVP_des_cbc = yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_DES_SET_KEY 1
++#define HAVE_EVP_DES_CBC 1
+ _ACEOF
+ 
+ fi
+@@ -34506,31 +34507,39 @@ case "$host_os" in
+ 		NSSSONAMEVERSIONSUFFIX=".2"
+ 		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
+ 		;;
+-	*freebsd[5-9]*)
+-		# FreeBSD winbind client is implemented as a wrapper around
+-		# the Linux version.
+-		NSSSONAMEVERSIONSUFFIX=".1"
+-		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
+-		    ../nsswitch/winbind_nss_linux.o"
+-		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
+-		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
+-		;;
+-
+-	*netbsd*[3-9]*)
+-		# NetBSD winbind client is implemented as a wrapper
+-		# around the Linux version. It needs getpwent_r() to
+-		# indicate libc's use of the correct nsdispatch API.
+-		#
+-		if test x"$ac_cv_func_getpwent_r" = x"yes"; then
+-			WINBIND_NSS_EXTRA_OBJS="\
+-			    ../nsswitch/winbind_nss_netbsd.o \
++	*freebsd*)
++		case "$UNAME_R" in
++		[5-9]*)
++			# FreeBSD winbind client is implemented as a wrapper
++			# around the Linux version.
++			NSSSONAMEVERSIONSUFFIX=".1"
++			WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
+ 			    ../nsswitch/winbind_nss_linux.o"
+ 			WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
+ 			WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
+-		else
+-			HAVE_WINBIND=no
+-			winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
+-		fi
++			;;
++		esac
++		;;
++
++	*netbsd*)
++		case "$UNAME_R" in
++		[3-9]*)
++			# NetBSD winbind client is implemented as a wrapper
++			# around the Linux version. It needs getpwent_r() to
++			# indicate libc's use of the correct nsdispatch API.
++			#
++			if test x"$ac_cv_func_getpwent_r" = x"yes"; then
++				WINBIND_NSS_EXTRA_OBJS="\
++				    ../nsswitch/winbind_nss_netbsd.o \
++				    ../nsswitch/winbind_nss_linux.o"
++				WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
++				WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
++			else
++				HAVE_WINBIND=no
++				winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
++			fi
++			;;
++		esac
+ 		;;
+ 	*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/samba/patches/patch-ag b/net/samba/patches/patch-ag
index f34414507dd..0e9c8127c85 100644
--- a/net/samba/patches/patch-ag
+++ b/net/samba/patches/patch-ag
@@ -1,23 +1,70 @@
-$NetBSD: patch-ag,v 1.7 2007/10/28 07:28:46 taca Exp $
+$NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $
 
---- passdb/passdb.c.orig	2007-05-24 00:29:17.000000000 +0900
-+++ passdb/passdb.c
-@@ -135,6 +135,7 @@ static NTSTATUS samu_set_unix_internal(s
- 	const char *guest_account = lp_guestaccount();
- 	const char *domain = global_myname();
- 	uint32 urid;
-+	char *gecos;
- 
- 	if ( !pwd ) {
- 		return NT_STATUS_NO_SUCH_USER;
-@@ -143,7 +144,9 @@ static NTSTATUS samu_set_unix_internal(s
- 	/* Basic properties based upon the Unix account information */
+--- registry/regfio.c.orig	2010-12-05 16:01:50.000000000 +0000
++++ registry/regfio.c
+@@ -480,7 +480,7 @@ static REGF_HBIN* read_hbin_block( REGF_
+ 	/* remember that the record_size is in the 4 bytes preceeding the record itself */
+ 
+ 	if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE-sizeof(uint32) ) )
+-		return False;
++		return NULL;
+ 
+ 	record_size = 0;
+ 	header = 0;
+@@ -503,12 +503,12 @@ static REGF_HBIN* read_hbin_block( REGF_
+ 		}
+ 
+ 		if ( !prs_set_offset( &hbin->ps, curr_off) )
+-			return False;
++			return NULL;
+ 
+ 		if ( !prs_uint32( "rec_size", &hbin->ps, 0, &record_size ) )
+-			return False;
++			return NULL;
+ 		if ( !prs_uint32( "header", &hbin->ps, 0, &header ) )
+-			return False;
++			return NULL;
+ 		
+ 		SMB_ASSERT( record_size != 0 );
+ 
+@@ -532,7 +532,7 @@ static REGF_HBIN* read_hbin_block( REGF_
+ 	DEBUG(10,("read_hbin_block: free space offset == 0x%x\n", hbin->free_off));
+ 
+ 	if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE )  )
+-		return False;
++		return NULL;
  	
- 	pdb_set_username(user, pwd->pw_name, PDB_SET);
--	pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
-+	gecos = passwd_expand_gecos(pwd);
-+	pdb_set_fullname(user, gecos, PDB_SET);
-+	SAFE_FREE(gecos);
- 	pdb_set_domain (user, get_global_sam_name(), PDB_DEFAULT);
- #if 0
- 	/* This can lead to a primary group of S-1-22-2-XX which 
+ 	return hbin;
+ }
+@@ -1557,7 +1557,7 @@ done:
+ 	   for the record */
+ 
+ 	if ( !prs_uint32("allocated_size", &hbin->ps, 0, &size) )
+-		return False;
++		return NULL;
+ 
+ 	update_free_space( hbin, size );
+ 	
+@@ -1771,7 +1771,7 @@ static int hashrec_cmp( REGF_HASH_REC *h
+ 		qsort( parent->subkeys.hashes, parent->subkey_index, sizeof(REGF_HASH_REC), QSORT_CAST hashrec_cmp );
+ 
+ 		if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) )
+-			return False;
++			return NULL;
+ 	}
+ 
+ 	/* write the security descriptor */
+@@ -1923,11 +1923,11 @@ static int hashrec_cmp( REGF_HASH_REC *h
+ 	
+ 	prs_set_offset( &nk->hbin->ps, nk->hbin_off );
+ 	if ( !prs_nk_rec( "nk_rec", &nk->hbin->ps, 0, nk ) )
+-		return False;
++		return NULL;
+ 
+ 	if ( nk->num_values ) {
+ 		if ( !hbin_prs_vk_records( "vk_records", vlist_hbin, 0, nk, file ) )
+-			return False;
++			return NULL;
+ 	}
+ 
+ 
diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah
new file mode 100644
index 00000000000..7c4e0edcd6a
--- /dev/null
+++ b/net/samba/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.5 2011/12/16 11:05:24 asau Exp $
+
+--- libsmb/cliconnect.c.orig	2010-12-05 16:06:50.000000000 +0000
++++ libsmb/cliconnect.c
+@@ -2555,7 +2555,7 @@ struct cli_state *get_ipc_connect_master
+         if (!NT_STATUS_IS_OK(name_resolve_bcast(MSBROWSE, 1, &ip_list,
+ 						&count))) {
+                 DEBUG(99, ("No master browsers responded\n"));
+-                return False;
++                return NULL;
+         }
+ 
+ 	for (i = 0; i < count; i++) {
diff --git a/net/samba/patches/patch-ai b/net/samba/patches/patch-ai
new file mode 100644
index 00000000000..875216cb6e6
--- /dev/null
+++ b/net/samba/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.6 2011/12/16 11:05:24 asau Exp $
+
+--- include/local.h.orig	2010-10-07 16:41:16.000000000 +0000
++++ include/local.h
+@@ -189,10 +189,10 @@
+  * Default passwd chat script.
+  */
+ 
+-#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
++#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n"
+ 
+ /* Minimum length of allowed password when changing UNIX password. */
+-#define MINPASSWDLENGTH 5
++#define MINPASSWDLENGTH 6
+ 
+ /* maximum ID number used for session control. This cannot be larger
+    than 62*62 for the current code */
diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj
new file mode 100644
index 00000000000..d99b94acd79
--- /dev/null
+++ b/net/samba/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.5 2011/12/16 11:05:24 asau Exp $
+
+--- smbd/dir.c.orig	2010-12-05 20:59:48.000000000 +0000
++++ smbd/dir.c
+@@ -193,7 +193,7 @@ static struct dptr_struct *dptr_get(stru
+ 					      dptr->wcard, dptr->attr))) {
+ 					DEBUG(4,("dptr_get: Failed to open %s (%s)\n",dptr->path,
+ 						strerror(errno)));
+-					return False;
++					return NULL;
+ 				}
+ 			}
+ 			DLIST_PROMOTE(sconn->smb1.searches.dirptrs,dptr);
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
index 314f6e31937..e02fc1073da 100644
--- a/net/samba/patches/patch-ak
+++ b/net/samba/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-ak,v 1.5 2011/12/16 11:05:24 asau Exp $
 
---- pam_smbpass/general.h.orig	2005-10-12 13:03:29.000000000 -0400
-+++ pam_smbpass/general.h
-@@ -1,8 +1,4 @@
--#ifndef LINUX
--/* This is only needed by modules in the Sun implementation. */
- #include <security/pam_appl.h>
--#endif  /* LINUX */
--
- #include <security/pam_modules.h>
- 
- #ifndef PAM_AUTHTOK_RECOVER_ERR  
+--- intl/lang_tdb.c.orig	2010-01-14 10:12:10.000000000 +0000
++++ intl/lang_tdb.c
+@@ -139,7 +139,7 @@ bool lang_tdb_init(const char *lang)
+ 		goto done;
+ 	}
+ 	
+-	if (asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang) == -1) {
++	if (asprintf(&path, "%s%s.tdb", state_path("lang_"), lang) == -1) {
+ 		DEBUG(0, ("asprintf failed\n"));
+ 		goto done;
+ 	}
diff --git a/net/samba/patches/patch-al b/net/samba/patches/patch-al
new file mode 100644
index 00000000000..e0c0d3e1659
--- /dev/null
+++ b/net/samba/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.7 2011/12/16 11:05:24 asau Exp $
+
+--- lib/ldb/tests/test-schema.sh.orig	2010-01-14 10:12:10.000000000 +0000
++++ lib/ldb/tests/test-schema.sh
+@@ -19,12 +19,12 @@ $VALGRIND bin/ldbmodify $LDBDIR/tests/sc
+ $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-2.ldif || exit 1
+ $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-3.ldif || exit 1
+ $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-4.ldif
+-if [ "$?" == "0" ]; then
++if [ "$?" = "0" ]; then
+ 	echo "test failed!"
+ 	exit 1
+ fi
+ $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-5.ldif
+-if [ "$?" == "0" ]; then
++if [ "$?" = "0" ]; then
+ 	echo "test failed!"
+ 	exit 1
+ fi
diff --git a/net/samba/patches/patch-bv b/net/samba/patches/patch-am
index cb73a3922ba..3bc12662c6f 100644
--- a/net/samba/patches/patch-bv
+++ b/net/samba/patches/patch-am
@@ -1,7 +1,9 @@
-$NetBSD: patch-bv,v 1.2 2007/02/11 18:39:04 tron Exp $
+$NetBSD: patch-am,v 1.9 2011/12/16 11:05:24 asau Exp $
 
---- lib/util_pw.c.orig	2006-04-20 03:29:23.000000000 +0100
-+++ lib/util_pw.c	2007-02-11 17:57:22.000000000 +0000
+Add support for "passwd expand gecos".
+
+--- lib/util_pw.c.orig	2010-01-14 10:12:10.000000000 +0000
++++ lib/util_pw.c
 @@ -4,6 +4,7 @@
     Safe versions of getpw* calls
  
@@ -10,7 +12,12 @@ $NetBSD: patch-bv,v 1.2 2007/02/11 18:39:04 tron Exp $
     
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-@@ -25,6 +26,7 @@
+@@ -21,9 +22,12 @@
+ 
+ #include "includes.h"
+ 
++static char *passwd_expand_gecos(const struct passwd *);
++
  struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) 
  {
  	struct passwd *ret = TALLOC_P(mem_ctx, struct passwd);
@@ -18,7 +25,7 @@ $NetBSD: patch-bv,v 1.2 2007/02/11 18:39:04 tron Exp $
  	if (!ret) {
  		return NULL;
  	}
-@@ -32,7 +34,10 @@
+@@ -31,7 +35,10 @@ struct passwd *tcopy_passwd(TALLOC_CTX *
  	ret->pw_passwd = talloc_strdup(ret, from->pw_passwd);
  	ret->pw_uid = from->pw_uid;
  	ret->pw_gid = from->pw_gid;
@@ -30,7 +37,7 @@ $NetBSD: patch-bv,v 1.2 2007/02/11 18:39:04 tron Exp $
  	ret->pw_dir = talloc_strdup(ret, from->pw_dir);
  	ret->pw_shell = talloc_strdup(ret, from->pw_shell);
  	return ret;
-@@ -126,3 +131,38 @@
+@@ -85,3 +92,38 @@ struct passwd *getpwuid_alloc(TALLOC_CTX
  
  	return tcopy_passwd(mem_ctx, temp);
  }
@@ -40,7 +47,7 @@ $NetBSD: patch-bv,v 1.2 2007/02/11 18:39:04 tron Exp $
 + Expand any `&' characters in pw_gecos with a capitalized pw_name.
 +****************************************************************/
 +
-+char *passwd_expand_gecos(const struct passwd *pw)
++static char *passwd_expand_gecos(const struct passwd *pw)
 +{
 +	char	*p, *bp, *buf;
 +	size_t	 ac, buflen;
diff --git a/net/samba/patches/patch-an b/net/samba/patches/patch-an
new file mode 100644
index 00000000000..e75d76a0f7a
--- /dev/null
+++ b/net/samba/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.3 2011/12/16 11:05:24 asau Exp $
+
+--- smbd/ntquotas.c.orig	2010-12-05 21:00:36.000000000 +0000
++++ smbd/ntquotas.c
+@@ -234,7 +234,7 @@ void *init_quota_handle(TALLOC_CTX *mem_
+ 	SMB_NTQUOTA_HANDLE *qt_handle;
+ 
+ 	if (!mem_ctx)
+-		return False;
++		return NULL;
+ 
+ 	qt_handle = TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_HANDLE);
+ 	if (qt_handle==NULL) {
diff --git a/net/samba/patches/patch-ao b/net/samba/patches/patch-ao
new file mode 100644
index 00000000000..a756d263dc4
--- /dev/null
+++ b/net/samba/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.3 2011/12/16 11:05:24 asau Exp $
+
+--- libsmb/samlogon_cache.c.orig	2010-12-05 21:01:38.000000000 +0000
++++ libsmb/samlogon_cache.c
+@@ -217,7 +217,7 @@ struct netr_SamInfo3 *netsamlogon_cache_
+ 	if (!netsamlogon_cache_init()) {
+ 		DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n",
+ 			NETSAMLOGON_TDB));
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	/* Prepare key as DOMAIN-SID/USER-RID string */
diff --git a/net/samba/patches/patch-ap b/net/samba/patches/patch-ap
new file mode 100644
index 00000000000..f1fa5fe0d2c
--- /dev/null
+++ b/net/samba/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.3 2011/12/16 11:05:24 asau Exp $
+
+--- nmbd/nmbd.c.orig	2010-10-07 16:41:16.000000000 +0000
++++ nmbd/nmbd.c
+@@ -916,6 +916,10 @@ static bool open_sockets(bool isdaemon, 
+ 		mkdir(lp_lockdir(), 0755);
+ 	}
+ 
++	if (!directory_exist(lp_statedir())) {
++		mkdir(lp_statedir(), 0755);
++	}
++
+ 	pidfile_create("nmbd");
+ 
+ 	if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(),
diff --git a/net/samba/patches/patch-aq b/net/samba/patches/patch-aq
new file mode 100644
index 00000000000..743103e44d7
--- /dev/null
+++ b/net/samba/patches/patch-aq
@@ -0,0 +1,46 @@
+$NetBSD: patch-aq,v 1.3 2011/12/16 11:05:24 asau Exp $
+
+Add support for passwd expand gecos
+
+--- param/loadparm.c.orig	2011-06-14 11:17:28.000000000 +0000
++++ param/loadparm.c
+@@ -310,6 +310,7 @@ struct global {
+ 	bool bUnixPasswdSync;
+ 	bool bPasswdChatDebug;
+ 	int iPasswdChatTimeout;
++	bool bPasswdExpandGecos;
+ 	bool bTimestampLogs;
+ 	bool bNTSmbSupport;
+ 	bool bNTPipeSupport;
+@@ -1297,6 +1298,15 @@ static struct parm_struct parm_table[] =
+ 		.flags		= FLAG_ADVANCED,
+ 	},
+ 	{
++		.label		= "passwd expand gecos",
++		.type		= P_BOOL,
++		.p_class	= P_GLOBAL,
++		.ptr		= &Globals.bPasswdExpandGecos,
++		.special	= NULL,
++		.enum_list	= NULL,
++		.flags		= FLAG_ADVANCED,
++	}, 
++	{
+ 		.label		= "check password script",
+ 		.type		= P_STRING,
+ 		.p_class	= P_GLOBAL,
+@@ -5074,6 +5084,7 @@ static void init_globals(bool first_time
+ 	Globals.bPamPasswordChange = False;
+ 	Globals.bPasswdChatDebug = False;
+ 	Globals.iPasswdChatTimeout = 2; /* 2 second default. */
++	Globals.bPasswdExpandGecos = False;
+ 	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
+ 	Globals.bNTStatusSupport = True; /* Use NT status by default. */
+ 	Globals.bStatCache = True;	/* use stat cache by default */
+@@ -5528,6 +5539,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+ FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
+ FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
+ FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
++FN_GLOBAL_BOOL(lp_passwd_expand_gecos, &Globals.bPasswdExpandGecos)
+ FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
+ FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
+ FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
diff --git a/net/samba/patches/patch-ar b/net/samba/patches/patch-ar
new file mode 100644
index 00000000000..d1c33ad329b
--- /dev/null
+++ b/net/samba/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.4 2011/12/16 11:05:24 asau Exp $
+
+--- script/installman.sh.orig	2010-01-14 10:12:10.000000000 +0000
++++ script/installman.sh
+@@ -33,7 +33,7 @@ for lang in $langs; do
+     langdir=$MANDIR/$lang
+     for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
+ 	if [ ! -d $d ]; then
+-	    mkdir $d
++	    mkdir -p $d
+ 	    if [ ! -d $d ]; then
+ 		echo Failed to make directory $d, does $USER have privileges?
+ 		exit 1
diff --git a/net/samba/patches/patch-as b/net/samba/patches/patch-as
new file mode 100644
index 00000000000..d1faf1beb2a
--- /dev/null
+++ b/net/samba/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.3 2011/12/16 11:05:24 asau Exp $
+
+--- script/installmodules.sh.orig	2010-01-14 10:12:10.000000000 +0000
++++ script/installmodules.sh
+@@ -11,7 +11,7 @@ shift
+ 
+ for d in $prefix $LIBDIR; do
+ if [ ! -d $DESTDIR/$d ]; then
+-mkdir $DESTDIR/$d
++mkdir -p $DESTDIR/$d
+ if [ ! -d $DESTDIR/$d ]; then
+   echo Failed to make directory $DESTDIR/$d
+   exit 1
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index aef644327e7..d3f23a80433 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,298 +1,13 @@
-$NetBSD: patch-at,v 1.14 2009/10/04 16:58:38 taca Exp $
+$NetBSD: patch-at,v 1.15 2011/12/16 11:05:24 asau Exp $
 
---- configure.orig	2009-09-30 22:08:58.000000000 +0900
-+++ configure
-@@ -765,6 +765,7 @@ swatdir
- privatedir
- logfilebase
- piddir
-+statedir
- lockdir
- configdir
- target_os
-@@ -827,6 +828,7 @@ with_fhs
- with_privatedir
- with_rootsbindir
- with_lockdir
-+with_statedir
- with_piddir
- with_swatdir
- with_configdir
-@@ -1537,6 +1539,7 @@ Optional Packages:
-   --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)
-   --with-rootsbindir=DIR  Which directory to use for root sbin ($ac_default_prefix/sbin)
-   --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)
-+  --with-statedir=DIR     Where to put state files ($ac_default_prefix/var/locks)
-   --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)
-   --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)
-   --with-configdir=DIR    Where to put configuration files ($libdir)
-@@ -2296,6 +2299,7 @@ fi
- 
- rootsbindir="\${SBINDIR}"
- lockdir="\${VARDIR}/locks"
-+statedir="\${VARDIR}/locks"
- piddir="\${VARDIR}/locks"
- test "${mandir}" || mandir="\${prefix}/man"
- logfilebase="\${VARDIR}"
-@@ -2310,7 +2314,8 @@ swatdir="\${prefix}/swat"
- if test "${with_fhs+set}" = set; then
-   withval=$with_fhs;  case "$withval" in
-   yes)
--    lockdir="\${VARDIR}/lib/samba"
-+    lockdir="\${VARDIR}/run/samba"
-+    statedir="\${VARDIR}/lib/samba"
-     piddir="\${VARDIR}/run"
-     mandir="\${prefix}/share/man"
-     logfilebase="\${VARDIR}/log/samba"
-@@ -2384,6 +2389,26 @@ fi
- 
- 
- #################################################
-+# set state directory location
-+
-+# Check whether --with-statedir was given.
-+if test "${with_statedir+set}" = set; then
-+  withval=$with_statedir;  case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    { $as_echo "$as_me:$LINENO: WARNING: --with-statedir called without argument - will use default" >&5
-+$as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
-+  ;;
-+  * )
-+    statedir="$withval"
-+    ;;
-+  esac
-+fi
-+
-+
-+#################################################
- # set pid directory location
- 
- # Check whether --with-piddir was given.
-@@ -2624,6 +2649,7 @@ fi
- 
- 
- 
-+
- ## check for --enable-debug first before checking CFLAGS before
- ## so that we don't mix -O and -g
- # Check whether --enable-debug was given.
-@@ -33670,7 +33696,8 @@ done
- 
- 
- 
--for ac_func in getdents getdents64
-+
-+for ac_func in getdents getdents64 getpwent_r
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -49983,6 +50010,77 @@ done
- ##################
- # look for a method of finding the list of network interfaces
- iface=no;
-+{ $as_echo "$as_me:$LINENO: checking for iface ifaddrs" >&5
-+$as_echo_n "checking for iface ifaddrs... " >&6; }
-+if test "${samba_cv_HAVE_IFACE_IFADDRS+set}" = set; then
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
-+if test "$cross_compiling" = yes; then
-+  samba_cv_HAVE_IFACE_IFADDRS=cross
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#define HAVE_IFACE_IFADDRS 1
-+#define AUTOCONF_TEST 1
-+#include "${srcdir-.}/lib/interfaces.c"
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  samba_cv_HAVE_IFACE_IFADDRS=yes
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+samba_cv_HAVE_IFACE_IFADDRS=no
-+fi
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_IFACE_IFADDRS" >&5
-+$as_echo "$samba_cv_HAVE_IFACE_IFADDRS" >&6; }
-+CPPFLAGS="$SAVE_CPPFLAGS"
-+if test x"$samba_cv_HAVE_IFACE_IFADDRS" = x"yes"; then
-+	iface=yes;
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_IFACE_IFADDRS 1
-+_ACEOF
-+
-+fi
-+
-+if test $iface = no; then
- { $as_echo "$as_me:$LINENO: checking for iface AIX" >&5
- $as_echo_n "checking for iface AIX... " >&6; }
- if test "${samba_cv_HAVE_IFACE_AIX+set}" = set; then
-@@ -50053,6 +50151,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
- 
- fi
-+fi
- 
- if test $iface = no; then
- { $as_echo "$as_me:$LINENO: checking for iface ifconf" >&5
-@@ -53580,9 +53679,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
- 
- 
- 
--        { $as_echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
--$as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
--if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then
-+        { $as_echo "$as_me:$LINENO: checking for EVP_des_cbc in -lcrypto" >&5
-+$as_echo_n "checking for EVP_des_cbc in -lcrypto... " >&6; }
-+if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -53598,11 +53697,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char des_set_key ();
-+char EVP_des_cbc ();
- int
- main ()
- {
--return des_set_key ();
-+return EVP_des_cbc ();
-   ;
-   return 0;
- }
-@@ -53628,13 +53727,13 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_lib_ext_crypto_des_set_key=yes;
-+  ac_cv_lib_ext_crypto_EVP_des_cbc=yes;
- 		  ac_cv_lib_ext_crypto=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_ext_crypto_des_set_key=no;
-+	ac_cv_lib_ext_crypto_EVP_des_cbc=no;
- 		  ac_cv_lib_ext_crypto=no
- fi
- 
-@@ -53643,11 +53742,11 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5
--$as_echo "$ac_cv_lib_ext_crypto_des_set_key" >&6; }
--    if test $ac_cv_lib_ext_crypto_des_set_key = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_EVP_des_cbc" >&5
-+$as_echo "$ac_cv_lib_ext_crypto_EVP_des_cbc" >&6; }
-+    if test $ac_cv_lib_ext_crypto_EVP_des_cbc = yes; then
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_DES_SET_KEY 1
-+#define HAVE_EVP_DES_CBC 1
- _ACEOF
- 
- fi
-@@ -67399,31 +67498,39 @@ case "$host_os" in
- 		NSSSONAMEVERSIONSUFFIX=".2"
- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- 		;;
--	*freebsd[5-9]*)
--		# FreeBSD winbind client is implemented as a wrapper around
--		# the Linux version.
--		NSSSONAMEVERSIONSUFFIX=".1"
--		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
--		    nsswitch/winbind_nss_linux.o"
--		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
--		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
--		;;
--
--	*netbsd*[3-9]*)
--		# NetBSD winbind client is implemented as a wrapper
--		# around the Linux version. It needs getpwent_r() to
--		# indicate libc's use of the correct nsdispatch API.
--		#
--		if test x"$ac_cv_func_getpwent_r" = x"yes"; then
--			WINBIND_NSS_EXTRA_OBJS="\
--			    nsswitch/winbind_nss_netbsd.o \
-+	*freebsd*)
-+		case "$UNAME_R" in
-+		[5-9]*)
-+			# FreeBSD winbind client is implemented as a wrapper
-+			# around the Linux version.
-+			NSSSONAMEVERSIONSUFFIX=".1"
-+			WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
- 			    nsswitch/winbind_nss_linux.o"
- 			WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
- 			WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
--		else
--			HAVE_WINBIND=no
--			winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
--		fi
-+			;;
-+		esac
-+		;;
-+
-+	*netbsd*)
-+		case "$UNAME_R" in
-+		[3-9]*)
-+			# NetBSD winbind client is implemented as a wrapper
-+			# around the Linux version. It needs getpwent_r() to
-+			# indicate libc's use of the correct nsdispatch API.
-+			#
-+			if test x"$ac_cv_func_getpwent_r" = x"yes"; then
-+				WINBIND_NSS_EXTRA_OBJS="\
-+				    nsswitch/winbind_nss_netbsd.o \
-+				    nsswitch/winbind_nss_linux.o"
-+				WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
-+				WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
-+			else
-+				HAVE_WINBIND=no
-+				winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
-+			fi
-+			;;
-+		esac
- 		;;
- 	*irix*)
- 		# IRIX has differently named shared libraries
+--- script/installscripts.sh.orig	2010-01-14 10:12:10.000000000 +0000
++++ script/installscripts.sh
+@@ -12,7 +12,7 @@ echo Installing scripts in $BINDIR
+ 
+ for d in $BINDIR; do
+  if [ ! -d $d ]; then
+-  mkdir $d
++  mkdir -p $d
+   if [ ! -d $d ]; then
+     echo Failed to make directory $d
+     echo Have you run installbin first?
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index c77ac01c5a1..b4e0c522ee3 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,161 +1,13 @@
-$NetBSD: patch-au,v 1.11 2009/10/04 16:58:38 taca Exp $
---- configure.in.orig	2009-09-30 21:21:56.000000000 +0900
-+++ configure.in
-@@ -38,6 +38,7 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
- 
- rootsbindir="\${SBINDIR}"
- lockdir="\${VARDIR}/locks"
-+statedir="\${VARDIR}/locks"
- piddir="\${VARDIR}/locks"
- test "${mandir}" || mandir="\${prefix}/man"
- logfilebase="\${VARDIR}"
-@@ -51,7 +52,8 @@ AC_ARG_WITH(fhs,
- [  --with-fhs              Use FHS-compliant paths (default=no)],
- [ case "$withval" in
-   yes)
--    lockdir="\${VARDIR}/lib/samba"
-+    lockdir="\${VARDIR}/run/samba"
-+    statedir="\${VARDIR}/lib/samba"
-     piddir="\${VARDIR}/run"
-     mandir="\${prefix}/share/man"
-     logfilebase="\${VARDIR}/log/samba"
-@@ -111,6 +113,22 @@ AC_ARG_WITH(lockdir,
-   esac])
- 
- #################################################
-+# set state directory location
-+AC_ARG_WITH(statedir,
-+[  --with-statedir=DIR     Where to put state files ($ac_default_prefix/var/locks)],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-statedir called without argument - will use default])
-+  ;;
-+  * )
-+    statedir="$withval"
-+    ;;
-+  esac])
-+
-+#################################################
- # set pid directory location
- AC_ARG_WITH(piddir,
- [  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)],
-@@ -257,6 +275,7 @@ fi
- 
- AC_SUBST(configdir)
- AC_SUBST(lockdir)
-+AC_SUBST(statedir)
- AC_SUBST(piddir)
- AC_SUBST(logfilebase)
- AC_SUBST(privatedir)
-@@ -1245,7 +1264,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit gr
- AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
- AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
- AC_CHECK_FUNCS(getpwent_r)
--AC_CHECK_FUNCS(getdents getdents64)
-+AC_CHECK_FUNCS(getdents getdents64 getpwent_r)
- AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink)
- AC_CHECK_FUNCS(syslog vsyslog timegm)
- AC_CHECK_FUNCS(setlocale nl_langinfo)
-@@ -2824,6 +2843,20 @@ AC_CHECK_FUNCS(getpagesize)
- ##################
- # look for a method of finding the list of network interfaces
- iface=no;
-+AC_CACHE_CHECK([for iface ifaddrs],samba_cv_HAVE_IFACE_IFADDRS,[
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
-+AC_TRY_RUN([
-+#define HAVE_IFACE_IFADDRS 1
-+#define AUTOCONF_TEST 1
-+#include "${srcdir-.}/lib/interfaces.c"],
-+	samba_cv_HAVE_IFACE_IFADDRS=yes,samba_cv_HAVE_IFACE_IFADDRS=no,samba_cv_HAVE_IFACE_IFADDRS=cross)])
-+CPPFLAGS="$SAVE_CPPFLAGS"
-+if test x"$samba_cv_HAVE_IFACE_IFADDRS" = x"yes"; then
-+	iface=yes;AC_DEFINE(HAVE_IFACE_IFADDRS,1,[Whether iface ifaddrs is available])
-+fi
-+
-+if test $iface = no; then
- AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[
- SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
-@@ -2837,6 +2870,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then
-     iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available])
- fi
-+fi
- 
- if test $iface = no; then
- AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[
-@@ -3531,7 +3565,7 @@ if test x"$with_ads_support" != x"no"; t
-   AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
- 
-   # Heimdal checks.
--  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
-+  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, EVP_des_cbc)
-   AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
-   AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
- 
-@@ -5830,31 +5864,39 @@ case "$host_os" in
- 		NSSSONAMEVERSIONSUFFIX=".2"
- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- 		;;
--	*freebsd[[5-9]]*)
--		# FreeBSD winbind client is implemented as a wrapper around
--		# the Linux version.
--		NSSSONAMEVERSIONSUFFIX=".1"
--		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
--		    nsswitch/winbind_nss_linux.o"
--		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
--		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
--		;;
--
--	*netbsd*[[3-9]]*)
--		# NetBSD winbind client is implemented as a wrapper
--		# around the Linux version. It needs getpwent_r() to
--		# indicate libc's use of the correct nsdispatch API.
--		#
--		if test x"$ac_cv_func_getpwent_r" = x"yes"; then
--			WINBIND_NSS_EXTRA_OBJS="\
--			    nsswitch/winbind_nss_netbsd.o \
-+	*freebsd*)
-+		case "$UNAME_R" in
-+		[[5-9]]*)
-+			# FreeBSD winbind client is implemented as a wrapper
-+			# around the Linux version.
-+			NSSSONAMEVERSIONSUFFIX=".1"
-+			WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
- 			    nsswitch/winbind_nss_linux.o"
- 			WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
- 			WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
--		else
--			HAVE_WINBIND=no
--			winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
--		fi
-+			;;
-+		esac
-+		;;
-+
-+	*netbsd*)
-+		case "$UNAME_R" in
-+		[[3-9]]*)
-+			# NetBSD winbind client is implemented as a wrapper
-+			# around the Linux version. It needs getpwent_r() to
-+			# indicate libc's use of the correct nsdispatch API.
-+			#
-+			if test x"$ac_cv_func_getpwent_r" = x"yes"; then
-+				WINBIND_NSS_EXTRA_OBJS="\
-+				    nsswitch/winbind_nss_netbsd.o \
-+				    nsswitch/winbind_nss_linux.o"
-+				WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
-+				WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
-+			else
-+				HAVE_WINBIND=no
-+				winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
-+			fi
-+			;;
-+		esac
- 		;;
- 	*irix*)
- 		# IRIX has differently named shared libraries
+$NetBSD: patch-au,v 1.12 2011/12/16 11:05:24 asau Exp $
+
+--- script/installswat.sh.orig	2010-01-14 10:12:10.000000000 +0000
++++ script/installswat.sh
+@@ -140,7 +140,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
+       
+       INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`"
+       if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then
+-        mkdir "$INSTALLDIR"
++        mkdir -p "$INSTALLDIR"
+         if test ! -d "$INSTALLDIR"; then
+           echo "Failed to make directory $INSTALLDIR, does $USER have privileges? "
+           exit 1
diff --git a/net/samba/patches/patch-av b/net/samba/patches/patch-av
index ba0f05cf971..6d6e6764c42 100644
--- a/net/samba/patches/patch-av
+++ b/net/samba/patches/patch-av
@@ -1,13 +1,14 @@
-$NetBSD: patch-av,v 1.3 2007/10/28 07:28:48 taca Exp $
+$NetBSD: patch-av,v 1.4 2011/12/16 11:05:24 asau Exp $
 
---- script/installman.sh.orig	2007-03-01 13:55:02.000000000 +0900
-+++ script/installman.sh
-@@ -33,7 +33,7 @@ for lang in $langs; do
-     langdir=$MANDIR/$lang
-     for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
- 	if [ ! -d $d ]; then
--	    mkdir $d
-+	    mkdir -p $d
- 	    if [ ! -d $d ]; then
- 		echo Failed to make directory $d, does $USER have privileges?
- 		exit 1
+--- smbd/server.c.orig	2010-10-07 16:41:16.000000000 +0000
++++ smbd/server.c
+@@ -1210,6 +1210,9 @@ extern void build_options(bool screen);
+ 	if (!directory_exist(lp_lockdir()))
+ 		mkdir(lp_lockdir(), 0755);
+ 
++	if (!directory_exist(lp_statedir()))
++		mkdir(lp_statedir(), 0755);
++
+ 	if (is_daemon)
+ 		pidfile_create("smbd");
+ 
diff --git a/net/samba/patches/patch-aw b/net/samba/patches/patch-aw
index 26830949b58..2f193f451e4 100644
--- a/net/samba/patches/patch-aw
+++ b/net/samba/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.2 2007/02/11 18:39:04 tron Exp $
+$NetBSD: patch-aw,v 1.3 2011/12/16 11:05:24 asau Exp $
 
---- script/installmodules.sh.orig	2006-04-20 03:29:42.000000000 +0100
-+++ script/installmodules.sh	2007-02-11 17:24:32.000000000 +0000
-@@ -11,7 +11,7 @@
+--- winbindd/winbindd_cache.c.orig	2010-12-05 21:02:29.000000000 +0000
++++ winbindd/winbindd_cache.c
+@@ -4438,7 +4438,7 @@ struct winbindd_tdc_domain * wcache_tdc_
+ 	DEBUG(10,("wcache_tdc_fetch_domain: Searching for domain %s\n", name));
  
- for d in $prefix $LIBDIR; do
- if [ ! -d $DESTDIR/$d ]; then
--mkdir $DESTDIR/$d
-+mkdir -p $DESTDIR/$d
- if [ ! -d $DESTDIR/$d ]; then
-   echo Failed to make directory $DESTDIR/$d
-   exit 1
+ 	if ( !init_wcache() ) {
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	/* fetch the list */
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
index 099d6786a7d..fa240deacc8 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,118 +1,16 @@
-$NetBSD: patch-ba,v 1.9 2009/09/09 11:22:22 sketch Exp $
+$NetBSD: patch-ba,v 1.10 2011/12/16 11:05:24 asau Exp $
 
---- Makefile.in.orig	Mon Jan 19 10:40:09 2009
-+++ Makefile.in	Wed Sep  9 11:00:17 2009
-@@ -106,6 +106,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where persistent-state files go
-+STATEDIR = @statedir@
+--- 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>])
 +
- # the directory where pid files go
- PIDDIR = @piddir@
- 
-@@ -136,7 +139,7 @@
- PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
- PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\"
- PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
--PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
-+PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DSTATEDIR=\"$(STATEDIR)\" -DPIDDIR=\"$(PIDDIR)\"
- PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
- 	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
- PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
-@@ -1059,7 +1062,7 @@
- 
- bin/smbget@EXEEXT@: proto_exists $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(PASSDB_LIBS)
- 
- bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -1094,12 +1097,12 @@
- bin/smbcacls@EXEEXT@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \
--	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(PASSDB_LIBS)
- 
- bin/smbcquotas@EXEEXT@: proto_exists $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ \
--	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+	$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(PASSDB_LIBS)
- 
- bin/eventlogadm@EXEEXT@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
-@@ -1162,7 +1165,7 @@
- bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
- 	@echo Linking libsmbclient shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
--		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(PASSDB_LIBS) \
- 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
- 
- bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
-@@ -1534,11 +1537,11 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
- 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
--		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+		@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(PASSDB_LIBS)
- 
- bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ)
- 	@echo "Linking shared library $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(PASSDB_LIBS)
- 
- bin/tdbbackup@EXEEXT@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
- 	@echo Linking $@
-@@ -1573,7 +1576,7 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
- 
--install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
-+install: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUPCALL@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBADDNS@
- 
- install-everything: install installmodules
- 
-@@ -1586,7 +1589,7 @@
- # is not used
- 
- installdirs:
--	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(STATEDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
- 
- installservers: all installdirs
- 	@$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
-@@ -1609,7 +1612,9 @@
- 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
- 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(RPCLIBDIR) $(RPC_MODULES)
- 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
--	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
-+	@if [ -n "$(NSS_INFO_MODULES)" ]; then \
-+		$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES); \
-+	fi
- 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
- 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
- 	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@
-@@ -1617,7 +1622,9 @@
- 	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@
- 	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@
- 	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@
--	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@
-+	@if [ -n "$(NSS_INFO_MODULES)" ]; then \
-+		$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@; \
-+	fi
- 
- installscripts: installdirs
- 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
-@@ -1715,6 +1722,7 @@
- 	@echo "  privatedir:  $(PRIVATE_DIR)"
- 	@echo "  configdir:   $(CONFIGDIR)"
- 	@echo "  lockdir:     $(LOCKDIR)"
-+	@echo "  statedir:    $(STATEDIR)"
- 	@echo "  piddir:      $(PIDDIR)"
- 	@echo "  swatdir:     $(SWATDIR)"
- 
+ # 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/samba/patches/patch-bb b/net/samba/patches/patch-bb
new file mode 100644
index 00000000000..515a62e6eed
--- /dev/null
+++ b/net/samba/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.4 2011/12/16 11:05:24 asau 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/samba/patches/patch-bc b/net/samba/patches/patch-bc
index f3517e18613..e90f94d88ae 100644
--- a/net/samba/patches/patch-bc
+++ b/net/samba/patches/patch-bc
@@ -1,13 +1,25 @@
-$NetBSD: patch-bc,v 1.2 2007/10/28 07:28:48 taca Exp $
+$NetBSD: patch-bc,v 1.3 2011/12/16 11:05:24 asau Exp $
 
---- intl/lang_tdb.c.orig	2007-03-01 13:54:31.000000000 +0900
-+++ intl/lang_tdb.c
-@@ -139,7 +139,7 @@ BOOL lang_tdb_init(const char *lang)
- 		goto done;
- 	}
- 	
--	asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang);
-+	asprintf(&path, "%s%s.tdb", state_path("lang_"), lang);
- 
- 	DEBUG(10, ("lang_tdb_init: loading %s\n", path));
+--- ../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/samba/patches/patch-bd b/net/samba/patches/patch-bd
index 2c577076311..fb7b1e61c7d 100644
--- a/net/samba/patches/patch-bd
+++ b/net/samba/patches/patch-bd
@@ -1,16 +1,15 @@
-$NetBSD: patch-bd,v 1.3 2007/10/28 07:28:48 taca Exp $
+$NetBSD: patch-bd,v 1.4 2011/12/16 11:05:24 asau Exp $
 
---- lib/account_pol.c.orig	2007-03-01 13:54:30.000000000 +0900
-+++ lib/account_pol.c
-@@ -213,9 +213,9 @@ BOOL init_account_policy(void)
- 		return True;
- 	}
+--- ../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;
+ }
  
--	tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+	tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- 	if (!tdb) { /* the account policies files does not exist or open failed, try to create a new one */
--		tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+		tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 		if (!tdb) {
- 			DEBUG(0,("Failed to open account policy database\n"));
- 			return False;
diff --git a/net/samba/patches/patch-be b/net/samba/patches/patch-be
index 03222dcebd7..f69b1e7a63b 100644
--- a/net/samba/patches/patch-be
+++ b/net/samba/patches/patch-be
@@ -1,31 +1,15 @@
-$NetBSD: patch-be,v 1.4 2008/04/03 20:19:42 jlam Exp $
+$NetBSD: patch-be,v 1.5 2011/12/16 11:05:24 asau Exp $
 
---- nmbd/nmbd_winsserver.c.orig	2008-03-08 10:33:35.000000000 -0500
-+++ nmbd/nmbd_winsserver.c
-@@ -574,7 +574,7 @@ BOOL initialise_wins(void)
- 	}
- 
- 	/* Open the wins.tdb. */
--	wins_tdb = tdb_open_log(lock_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
-+	wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
- 	if (!wins_tdb) {
- 		DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
- 			strerror(errno) ));
-@@ -585,7 +585,7 @@ BOOL initialise_wins(void)
- 
- 	add_samba_names_to_subnet(wins_server_subnet);
- 
--	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
-+	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
- 		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
- 			WINS_LIST, strerror(errno) ));
- 		return True;
-@@ -2338,7 +2338,7 @@ void wins_write_database(time_t t, BOOL 
- 		}
- 	}
- 
--	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
-+	pstrcpy(fname, state_path(WINS_LIST));
- 	all_string_sub(fname,"//", "/", 0);
- 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
+--- ../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/samba/patches/patch-bf b/net/samba/patches/patch-bf
new file mode 100644
index 00000000000..b005d5ef93b
--- /dev/null
+++ b/net/samba/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.5 2011/12/16 11:05:24 asau 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:
diff --git a/net/samba/patches/patch-bg b/net/samba/patches/patch-bg
deleted file mode 100644
index a1946be3f75..00000000000
--- a/net/samba/patches/patch-bg
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-bg,v 1.3 2009/10/04 16:58:38 taca Exp $
-
---- printing/nt_printing.c.orig	2009-09-30 21:21:56.000000000 +0900
-+++ printing/nt_printing.c
-@@ -351,8 +351,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT 
- 	SEC_DESC *sec, *new_sec;
- 	TALLOC_CTX *ctx = state;
- 	int result, i;
--	uint32 sd_size;
--	size_t size_new_sec;
-+	size_t sd_size, size_new_sec;
- 	DOM_SID sid;
- 
- 	if (!data.dptr || data.dsize == 0) {
-@@ -560,28 +559,28 @@ BOOL nt_printing_init(void)
-  
- 	if (tdb_drivers)
- 		tdb_close(tdb_drivers);
--	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+	tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 	if (!tdb_drivers) {
- 		DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
--			lock_path("ntdrivers.tdb"), strerror(errno) ));
-+			state_path("ntdrivers.tdb"), strerror(errno) ));
- 		return False;
- 	}
-  
- 	if (tdb_printers)
- 		tdb_close(tdb_printers);
--	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+	tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 	if (!tdb_printers) {
- 		DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
--			lock_path("ntprinters.tdb"), strerror(errno) ));
-+			state_path("ntprinters.tdb"), strerror(errno) ));
- 		return False;
- 	}
-  
- 	if (tdb_forms)
- 		tdb_close(tdb_forms);
--	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+	tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 	if (!tdb_forms) {
- 		DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
--			lock_path("ntforms.tdb"), strerror(errno) ));
-+			state_path("ntforms.tdb"), strerror(errno) ));
- 		return False;
- 	}
-  
diff --git a/net/samba/patches/patch-bh b/net/samba/patches/patch-bh
deleted file mode 100644
index f7863e02273..00000000000
--- a/net/samba/patches/patch-bh
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2007/10/28 07:28:48 taca Exp $
-
---- registry/reg_db.c.orig	2007-03-01 13:55:05.000000000 +0900
-+++ registry/reg_db.c
-@@ -234,12 +234,12 @@ BOOL regdb_init( void )
- 	if ( tdb_reg )
- 		return True;
- 
--	if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
-+	if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
- 	{
--		tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+		tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 		if ( !tdb_reg ) {
- 			DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
--				lock_path("registry.tdb"), strerror(errno) ));
-+				state_path("registry.tdb"), strerror(errno) ));
- 			return False;
- 		}
- 		
-@@ -281,11 +281,11 @@ WERROR regdb_open( void )
- 	
- 	become_root();
- 
--	tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+	tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- 	if ( !tdb_reg ) {
- 		result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
- 		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
--			lock_path("registry.tdb"), strerror(errno) ));
-+			state_path("registry.tdb"), strerror(errno) ));
- 	}
- 
- 	unbecome_root();
diff --git a/net/samba/patches/patch-bi b/net/samba/patches/patch-bi
deleted file mode 100644
index 0b946b74add..00000000000
--- a/net/samba/patches/patch-bi
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bi,v 1.5 2007/10/28 07:28:48 taca Exp $
-
---- lib/sharesec.c.orig	2007-03-01 13:54:29.000000000 +0900
-+++ lib/sharesec.c
-@@ -47,10 +47,10 @@ BOOL share_info_db_init(void)
- 		return True;
- 	}
- 
--	share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+	share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 	if (!share_tdb) {
- 		DEBUG(0,("Failed to open share info database %s (%s)\n",
--			lock_path("share_info.tdb"), strerror(errno) ));
-+			state_path("share_info.tdb"), strerror(errno) ));
- 		return False;
- 	}
-  
diff --git a/net/samba/patches/patch-bm b/net/samba/patches/patch-bm
deleted file mode 100644
index 9ca8836ea02..00000000000
--- a/net/samba/patches/patch-bm
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bm,v 1.2 2007/02/11 18:39:04 tron Exp $
-
---- dynconfig.c.orig	2007-02-04 18:59:28.000000000 +0000
-+++ dynconfig.c	2007-02-11 17:51:32.000000000 +0000
-@@ -68,5 +68,12 @@
- pstring dyn_LOCKDIR = LOCKDIR;
- pstring dyn_PIDDIR  = PIDDIR;
- 
-+/**
-+ * @brief Directory holding persistent-state files.
-+ *
-+ * Not writable, but used to set a default in the parameter table.
-+ **/
-+pstring dyn_STATEDIR = STATEDIR;
-+
- pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
- pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
diff --git a/net/samba/patches/patch-bn b/net/samba/patches/patch-bn
deleted file mode 100644
index 604ed821876..00000000000
--- a/net/samba/patches/patch-bn
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2007/02/11 18:39:04 tron Exp $
-
---- include/dynconfig.h.orig	2007-02-04 18:59:23.000000000 +0000
-+++ include/dynconfig.h	2007-02-11 17:52:33.000000000 +0000
-@@ -34,5 +34,6 @@
- extern fstring dyn_SHLIBEXT;
- extern pstring dyn_LOCKDIR;
- extern pstring dyn_PIDDIR;
-+extern pstring dyn_STATEDIR;
- extern pstring dyn_SMB_PASSWD_FILE;
- extern pstring dyn_PRIVATE_DIR;
diff --git a/net/samba/patches/patch-bo b/net/samba/patches/patch-bo
deleted file mode 100644
index c59c5317cf5..00000000000
--- a/net/samba/patches/patch-bo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bo,v 1.6 2009/10/04 16:58:38 taca Exp $
-
---- nmbd/nmbd.c.orig	2009-09-30 21:21:56.000000000 +0900
-+++ nmbd/nmbd.c
-@@ -769,6 +769,10 @@ static BOOL open_sockets(BOOL isdaemon, 
- 		mkdir(lp_lockdir(), 0755);
- 	}
- 
-+	if (!directory_exist(lp_statedir(), NULL)) {
-+		mkdir(lp_statedir(), 0755);
-+	}
-+
- 	pidfile_create("nmbd");
- 	message_init();
- 	message_register(MSG_FORCE_ELECTION, nmbd_message_election, NULL);
diff --git a/net/samba/patches/patch-bp b/net/samba/patches/patch-bp
deleted file mode 100644
index 2a0ba0b682f..00000000000
--- a/net/samba/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.5 2009/10/04 16:58:38 taca Exp $
-
---- smbd/server.c.orig	2009-09-30 21:21:56.000000000 +0900
-+++ smbd/server.c
-@@ -1008,6 +1008,9 @@ extern void build_options(BOOL screen);
- 	if (!directory_exist(lp_lockdir(), NULL))
- 		mkdir(lp_lockdir(), 0755);
- 
-+	if (!directory_exist(lp_statedir(), NULL))
-+		mkdir(lp_statedir(), 0755);
-+
- 	if (is_daemon)
- 		pidfile_create("smbd");
- 
diff --git a/net/samba/patches/patch-bq b/net/samba/patches/patch-bq
deleted file mode 100644
index 537231fcf16..00000000000
--- a/net/samba/patches/patch-bq
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bq,v 1.1 2005/11/14 08:05:28 jlam Exp $
-
---- utils/testparm.c.orig	2005-10-12 13:03:42.000000000 -0400
-+++ utils/testparm.c
-@@ -67,6 +67,12 @@ cannot be set in the smb.conf file. nmbd
- 		ret = 1;
- 	}
- 
-+	if (!directory_exist(lp_statedir(), &st)) {
-+		fprintf(stderr, "ERROR: state directory %s does not exist\n",
-+		       lp_statedir());
-+		ret = 1;
-+	}
-+
- 	if (!directory_exist(lp_piddir(), &st)) {
- 		fprintf(stderr, "ERROR: pid directory %s does not exist\n",
- 		       lp_piddir());
diff --git a/net/samba/patches/patch-br b/net/samba/patches/patch-br
deleted file mode 100644
index bc3d1ea7b04..00000000000
--- a/net/samba/patches/patch-br
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-br,v 1.4 2008/04/03 20:19:42 jlam Exp $
-
---- lib/util.c.orig	2008-03-08 10:33:34.000000000 -0500
-+++ lib/util.c
-@@ -2598,6 +2598,26 @@ char *lock_path(const char *name)
- }
- 
- /*****************************************************************
-+ A useful function for returning a path in the Samba state directory.
-+*****************************************************************/  
-+
-+char *state_path(const char *name)
-+{
-+	static pstring fname;
-+
-+	pstrcpy(fname,lp_statedir());
-+	trim_char(fname,'\0','/');
-+	
-+	if (!directory_exist(fname,NULL))
-+		mkdir(fname,0755);
-+	
-+	pstrcat(fname,"/");
-+	pstrcat(fname,name);
-+
-+	return fname;
-+}
-+
-+/*****************************************************************
-  A useful function for returning a path in the Samba pid directory.
- *****************************************************************/
- 
diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs
deleted file mode 100644
index cf9a04a5a85..00000000000
--- a/net/samba/patches/patch-bs
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-bs,v 1.6 2010/02/09 16:08:36 drochner Exp $
-
---- param/loadparm.c.orig	2009-09-30 12:21:56.000000000 +0000
-+++ param/loadparm.c
-@@ -109,6 +109,7 @@ typedef struct {
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
- 	char *szLockDir;
-+	char *szStateDir;
- 	char *szPidDir;
- 	char *szRootdir;
- 	char *szDefaultService;
-@@ -276,6 +277,7 @@ typedef struct {
- 	BOOL bUnixPasswdSync;
- 	BOOL bPasswdChatDebug;
- 	int iPasswdChatTimeout;
-+	BOOL bPasswdExpandGecos;
- 	BOOL bTimestampLogs;
- 	BOOL bNTSmbSupport;
- 	BOOL bNTPipeSupport;
-@@ -564,7 +566,7 @@ static service sDefault = {
- 	True,			/* bLevel2OpLocks */
- 	False,			/* bOnlyUser */
- 	True,			/* bMangledNames */
--	True,			/* bWidelinks */
-+	False,			/* bWidelinks */
- 	True,			/* bSymlinks */
- 	False,			/* bSyncAlways */
- 	False,			/* bStrictAllocate */
-@@ -890,6 +892,7 @@ static struct parm_struct parm_table[] =
- 	{"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED}, 
- 	{"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED}, 
- 	{"passwd chat timeout", P_INTEGER, P_GLOBAL, &Globals.iPasswdChatTimeout, NULL, NULL, FLAG_ADVANCED}, 
-+	{"passwd expand gecos", P_BOOL, P_GLOBAL, &Globals.bPasswdExpandGecos, NULL, NULL, FLAG_ADVANCED}, 
- 	{"check password script", P_STRING, P_GLOBAL, &Globals.szCheckPasswordScript, NULL, NULL, FLAG_ADVANCED}, 
- 	{"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED}, 
- 	{"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED}, 
-@@ -1212,6 +1215,7 @@ static struct parm_struct parm_table[] =
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
- 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
-+	{"state directory", P_STRING, P_GLOBAL, &Globals.szStateDir, NULL, NULL, FLAG_ADVANCED}, 
- 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
- #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-@@ -1476,6 +1480,7 @@ static void init_globals(BOOL first_time
- 	string_set(&Globals.szPasswdProgram, "");
- 	string_set(&Globals.szPidDir, dyn_PIDDIR);
- 	string_set(&Globals.szLockDir, dyn_LOCKDIR);
-+	string_set(&Globals.szStateDir, dyn_STATEDIR);
- 	string_set(&Globals.szSocketAddress, "0.0.0.0");
- 	pstrcpy(s, "Samba ");
- 	pstrcat(s, SAMBA_VERSION_STRING);
-@@ -1559,6 +1564,7 @@ static void init_globals(BOOL first_time
- 	Globals.bPamPasswordChange = False;
- 	Globals.bPasswdChatDebug = False;
- 	Globals.iPasswdChatTimeout = 2; /* 2 second default. */
-+	Globals.bPasswdExpandGecos = False;
- 	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
- 	Globals.bNTStatusSupport = True; /* Use NT status by default. */
- 	Globals.bStatCache = True;	/* use stat cache by default */
-@@ -1806,6 +1812,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
- FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
- FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
- FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_statedir, &Globals.szStateDir)
- FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
- FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
- FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-@@ -1979,6 +1986,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
- FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
- FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
- FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
-+FN_GLOBAL_BOOL(lp_passwd_expand_gecos, &Globals.bPasswdExpandGecos)
- FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
- FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
- FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu
deleted file mode 100644
index ac4a6011231..00000000000
--- a/net/samba/patches/patch-bu
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bu,v 1.9 2009/10/04 16:58:38 taca Exp $
-
---- ../docs/manpages/smb.conf.5.orig	2009-09-30 21:28:02.000000000 +0900
-+++ ../docs/manpages/smb.conf.5
-@@ -7084,6 +7084,15 @@ Example:
- \fI\fIpasswd chat\fR\fR\fI = \fR\fI\FC"*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"\F[]\fR\fI \fR
- .RE
- 
-+passwd expand gecos (G)
-+.PP
-+.RS 4
-+This boolean specifies if ampersand characters in the GECOS field of a passwd database entry should be replaced with the capitalized login name for that entry when the information is used by various Samba programs\&. This parameter is off by default\&.
-+.sp
-+Default: \fB\fIpasswd expand gecos\fR = no \fR 
-+.TP 3n
-+.sp
-+
- passwd program (G)
- .\" passwd program
- .PP
-@@ -9199,6 +9208,15 @@ Default:
- \fI\fIstat cache\fR\fR\fI = \fR\fI\FCyes\F[]\fR\fI \fR
- .RE
- 
-+state directory (G)
-+.PP
-+.RS 4
-+This parameter defines the directory the Samba daemon processes will use for storing state files that must persist across machine reboots.
-+.sp
-+Default:
-+\fB\fIstate directory\fR = /var/db/samba \fR
-+.RE
-+
- store dos attributes (S)
- .\" store dos attributes
- .PP
diff --git a/net/samba/patches/patch-bw b/net/samba/patches/patch-bw
deleted file mode 100644
index 5f767eb973d..00000000000
--- a/net/samba/patches/patch-bw
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bw,v 1.6 2009/10/04 16:58:38 taca Exp $
-
---- include/config.h.in.orig	2009-09-30 22:08:50.000000000 +0900
-+++ include/config.h.in
-@@ -324,9 +324,6 @@
- /* Define to 1 if you have the `delproplist' function. */
- #undef HAVE_DELPROPLIST
- 
--/* Define to 1 if you have the `des_set_key' function. */
--#undef HAVE_DES_SET_KEY
--
- /* Whether the 'dev64_t' type is available */
- #undef HAVE_DEV64_T
- 
-@@ -391,6 +388,9 @@
- /* Whether the EncryptedData struct has a etype property */
- #undef HAVE_ETYPE_IN_ENCRYPTEDDATA
- 
-+/* Define to 1 if you have the `EVP_des_cbc' function. */
-+#undef HAVE_EVP_DES_CBC
-+
- /* Define to 1 if you have the <execinfo.h> header file. */
- #undef HAVE_EXECINFO_H
- 
-@@ -664,6 +664,9 @@
- /* Whether iface AIX is available */
- #undef HAVE_IFACE_AIX
- 
-+/* Whether iface ifaddrs is available */
-+#undef HAVE_IFACE_IFADDRS
-+
- /* Whether iface ifconf is available */
- #undef HAVE_IFACE_IFCONF
- 
diff --git a/net/samba/patches/patch-ca b/net/samba/patches/patch-ca
deleted file mode 100644
index eca32c9f7bb..00000000000
--- a/net/samba/patches/patch-ca
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ca,v 1.5 2008/04/03 20:19:42 jlam Exp $
-
---- VERSION.orig	2008-03-08 10:56:26.000000000 -0500
-+++ VERSION
-@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
- # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
- #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
- ########################################################
--SAMBA_VERSION_VENDOR_SUFFIX=
-+SAMBA_VERSION_VENDOR_SUFFIX="pkgsrc"
- SAMBA_VERSION_VENDOR_PATCH=
diff --git a/net/samba/patches/patch-ce b/net/samba/patches/patch-ce
deleted file mode 100644
index 3442f618a40..00000000000
--- a/net/samba/patches/patch-ce
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2007/10/28 07:28:50 taca Exp $
-
---- groupdb/mapping_tdb.c.orig	2007-04-25 18:38:59.000000000 +0900
-+++ groupdb/mapping_tdb.c
-@@ -39,7 +39,7 @@ static TDB_CONTEXT *tdb; /* used for dri
- 	if (tdb)
- 		return True;
- 		
--	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+	tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- 	if (!tdb) {
- 		DEBUG(0,("Failed to open group mapping database\n"));
- 		return False;
diff --git a/net/samba/patches/patch-cf b/net/samba/patches/patch-cf
deleted file mode 100644
index 6ddc1248794..00000000000
--- a/net/samba/patches/patch-cf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2007/10/28 07:28:50 taca Exp $
-
---- nsswitch/idmap_tdb.c.orig	2007-05-11 07:09:34.000000000 +0900
-+++ nsswitch/idmap_tdb.c
-@@ -247,7 +247,7 @@ static NTSTATUS idmap_tdb_open_db(TALLOC
- 	}
- 
- 	/* use the old database if present */
--	tdbfile = talloc_strdup(ctx, lock_path("winbindd_idmap.tdb"));
-+	tdbfile = talloc_strdup(ctx, state_path("winbindd_idmap.tdb"));
- 	if (!tdbfile) {
- 		DEBUG(0, ("Out of memory!\n"));
- 		ret = NT_STATUS_NO_MEMORY;
diff --git a/net/samba/patches/patch-cg b/net/samba/patches/patch-cg
deleted file mode 100644
index dc5fbbffe1a..00000000000
--- a/net/samba/patches/patch-cg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2007/10/28 07:28:50 taca Exp $
-
---- passdb/pdb_tdb.c.orig	2007-03-01 13:54:41.000000000 +0900
-+++ passdb/pdb_tdb.c
-@@ -1559,7 +1559,7 @@ static BOOL tdbsam_new_rid(struct pdb_me
- 	uint32 rid;
- 	BOOL ret = False;
- 
--	tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
-+	tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0,
- 			   TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
- 
- 	if (tdb == NULL) {
diff --git a/net/samba/patches/patch-ch b/net/samba/patches/patch-ch
deleted file mode 100644
index 5970a716ea6..00000000000
--- a/net/samba/patches/patch-ch
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2007/10/28 07:28:50 taca Exp $
-
---- rpc_server/srv_eventlog_lib.c.orig	2007-03-01 13:54:40.000000000 +0900
-+++ rpc_server/srv_eventlog_lib.c
-@@ -67,7 +67,7 @@ char *elog_tdbname( const char *name )
- {
- 	fstring path;
- 	char *tdb_fullpath;
--	char *eventlogdir = lock_path( "eventlog" );
-+	char *eventlogdir = state_path( "eventlog" );
- 	
- 	pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
- 	strlower_m( path );
-@@ -349,7 +349,7 @@ ELOG_TDB *elog_open_tdb( char *logname, 
- 	
- 	/* make sure that the eventlog dir exists */
- 	
--	eventlogdir = lock_path( "eventlog" );
-+	eventlogdir = state_path( "eventlog" );
- 	if ( !directory_exist( eventlogdir, NULL ) )
- 		mkdir( eventlogdir, 0755 );	
- 	
diff --git a/net/samba/patches/patch-ci b/net/samba/patches/patch-ci
deleted file mode 100644
index 35aee8e03c4..00000000000
--- a/net/samba/patches/patch-ci
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2009/10/04 16:58:38 taca Exp $
-
---- libsmb/samlogon_cache.c.orig	2009-09-30 21:21:56.000000000 +0900
-+++ libsmb/samlogon_cache.c
-@@ -34,7 +34,7 @@ static TDB_CONTEXT *netsamlogon_tdb = NU
- BOOL netsamlogon_cache_init(void)
- {
- 	if (!netsamlogon_tdb) {
--		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
-+		netsamlogon_tdb = tdb_open_log(state_path(NETSAMLOGON_TDB), 0,
- 						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
- 	}
- 
diff --git a/net/samba/patches/patch-da b/net/samba/patches/patch-da
deleted file mode 100644
index 4b112b26af5..00000000000
--- a/net/samba/patches/patch-da
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-da,v 1.1 2007/12/21 17:32:27 drochner Exp $
-
---- lib/interfaces.c.orig	2007-03-01 05:54:30.000000000 +0100
-+++ lib/interfaces.c
-@@ -343,6 +343,42 @@ static int _get_interfaces(struct iface_
- 
- #define _FOUND_IFACE_ANY
- #endif /* HAVE_IFACE_AIX */
-+#ifdef HAVE_IFACE_IFADDRS
-+
-+#include <ifaddrs.h>
-+
-+static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
-+{
-+	struct ifaddrs *ia;
-+	int total;
-+
-+	if (getifaddrs(&ia) < 0)
-+		return -1;
-+
-+	total = 0;
-+	while (ia && total < max_interfaces) {
-+		if (ia->ifa_addr->sa_family != AF_INET ||
-+		    !(ia->ifa_flags & IFF_UP)) {
-+			ia = ia->ifa_next;
-+			continue;
-+		}
-+		strncpy(ifaces[total].name, ia->ifa_name,
-+			sizeof(ifaces[total].name) - 1);
-+		ifaces[total].name[sizeof(ifaces[total].name) - 1] = 0;
-+		ifaces[total].ip = ((struct sockaddr_in *)(ia->ifa_addr))
-+					->sin_addr;
-+		ifaces[total].netmask = ((struct sockaddr_in *)(ia->ifa_netmask))
-+					->sin_addr;
-+		total++;
-+		ia = ia->ifa_next;
-+	}
-+
-+	freeifaddrs(ia);
-+	return total;
-+}
-+
-+#define _FOUND_IFACE_ANY
-+#endif /* HAVE_IFACE_IFADDRS */
- #ifndef _FOUND_IFACE_ANY
- static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
- {
diff --git a/net/samba/patches/patch-ee b/net/samba/patches/patch-ee
deleted file mode 100644
index 4c18e087c1c..00000000000
--- a/net/samba/patches/patch-ee
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ee,v 1.3 2010/06/19 14:08:56 taca Exp $
-
-Patch to fix CVE-2010-2063.
-
---- smbd/process.c.orig	2009-09-30 12:21:56.000000000 +0000
-+++ smbd/process.c
-@@ -1159,6 +1159,7 @@ int chain_reply(char *inbuf,char *outbuf
- {
- 	static char *orig_inbuf;
- 	static char *orig_outbuf;
-+	static int orig_size;
- 	int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
- 	unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
- 	char *inbuf2, *outbuf2;
-@@ -1178,6 +1179,13 @@ int chain_reply(char *inbuf,char *outbuf
- 		/* this is the first part of the chain */
- 		orig_inbuf = inbuf;
- 		orig_outbuf = outbuf;
-+		orig_size = size;
-+	}
-+
-+	/* Validate smb_off2 */
-+	if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
-+		exit_server_cleanly("Bad chained packet");
-+		return -1;
- 	}
- 
- 	/*
-@@ -1192,6 +1200,11 @@ int chain_reply(char *inbuf,char *outbuf
- 	SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
- 	SCVAL(outbuf,smb_vwv0,smb_com2);
- 
-+	if (outsize <= smb_wct) {
-+		exit_server_cleanly("Bad chained packet");
-+		return -1;
-+	}
-+
- 	/* remember how much the caller added to the chain, only counting stuff
- 		after the parameter words */
- 	chain_size += outsize - smb_wct;
diff --git a/net/samba/patches/patch-lib_replace_test_os2__delete.c b/net/samba/patches/patch-lib_replace_test_os2__delete.c
deleted file mode 100644
index 761648d215e..00000000000
--- a/net/samba/patches/patch-lib_replace_test_os2__delete.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_replace_test_os2__delete.c,v 1.1 2011/08/02 14:05:27 taca Exp $
-
-Workaround for NetBSD 5.99.54.
-
---- lib/replace/test/os2_delete.c.orig	2009-09-30 12:21:56.000000000 +0000
-+++ lib/replace/test/os2_delete.c
-@@ -103,6 +103,7 @@ int test_readdir_os2_delete(void)
- 	while (1) {
- 		int n = os2_delete(d);
- 		if (n == 0) break;
-+		if (test_readdir_os2_delete_ret != 0) break; /* if FAILED */
- 		total_deleted += n;
- 	}
- 	closedir(d);
diff --git a/net/samba/patches/patch-libsmb_clikrb5.c b/net/samba/patches/patch-libsmb_clikrb5.c
deleted file mode 100644
index 7f4c427fbd3..00000000000
--- a/net/samba/patches/patch-libsmb_clikrb5.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libsmb_clikrb5.c,v 1.1 2011/07/27 04:05:10 taca Exp $
-
-* KRB5_DEPRECATED would not be defined as boolean 0 or 1.
-
---- libsmb/clikrb5.c.orig	2009-09-30 12:21:56.000000000 +0000
-+++ libsmb/clikrb5.c
-@@ -22,7 +22,7 @@
- */
- 
- #define KRB5_PRIVATE    1       /* this file uses PRIVATE interfaces! */
--#define KRB5_DEPRECATED 1       /* this file uses DEPRECATED interfaces! */
-+#define KRB5_DEPRECATED        /* this file uses DEPRECATED interfaces! */
- 
- #include "includes.h"
-