Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Feb 2013 14:24:57 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r312507 - in head/net: . samba4 samba4/files samba4/files/man
Message-ID:  <201302181424.r1IEOvaf094582@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Mon Feb 18 14:24:56 2013
New Revision: 312507
URL: http://svnweb.freebsd.org/changeset/ports/312507

Log:
  New 4.0.3 revision of the net/samba4 port. Now we have our own AD!

Added:
  head/net/samba4/files/README.FreeBSD.in   (contents, props changed)
  head/net/samba4/files/man/
  head/net/samba4/files/man/gentest.1   (contents, props changed)
  head/net/samba4/files/man/locktest.1   (contents, props changed)
  head/net/samba4/files/man/masktest.1   (contents, props changed)
  head/net/samba4/files/man/ndrdump.1   (contents, props changed)
  head/net/samba4/files/man/nmblookup4.1   (contents, props changed)
  head/net/samba4/files/man/ntlm_auth4.1   (contents, props changed)
  head/net/samba4/files/man/oLschema2ldif.1   (contents, props changed)
  head/net/samba4/files/man/regdiff.1   (contents, props changed)
  head/net/samba4/files/man/regpatch.1   (contents, props changed)
  head/net/samba4/files/man/regshell.1   (contents, props changed)
  head/net/samba4/files/man/regtree.1   (contents, props changed)
  head/net/samba4/files/man/smbtorture.1   (contents, props changed)
  head/net/samba4/files/patch-buildtools__scripts__abi_gen.sh   (contents, props changed)
  head/net/samba4/files/patch-buildtools__wafsamba__samba_install.py   (contents, props changed)
  head/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py   (contents, props changed)
  head/net/samba4/files/patch-buildtools__wafsamba__wafsamba.py   (contents, props changed)
  head/net/samba4/files/patch-docs-xml__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-dynconfig__config.m4   (contents, props changed)
  head/net/samba4/files/patch-dynconfig__wscript   (contents, props changed)
  head/net/samba4/files/patch-lib__replace__wscript   (contents, props changed)
  head/net/samba4/files/patch-lib__socket__interfaces.c   (contents, props changed)
  head/net/samba4/files/patch-nsswitch__wins_freebsd.c   (contents, props changed)
  head/net/samba4/files/patch-nsswitch__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-source3__modules__vfs_zfsacl.c   (contents, props changed)
  head/net/samba4/files/patch-source3__smbd__quotas.c   (contents, props changed)
  head/net/samba4/files/patch-source3__utils__net.c   (contents, props changed)
  head/net/samba4/files/patch-source3__utils__net_time.c   (contents, props changed)
  head/net/samba4/files/patch-source3__winbindd__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-source3__wscript   (contents, props changed)
  head/net/samba4/files/patch-source3__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-source4__dns_server__dns_crypto.c   (contents, props changed)
  head/net/samba4/files/patch-source4__lib__cmdline__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-source4__libcli__resolve__dns_ex.c   (contents, props changed)
  head/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-source4__ntvfs__sysdep__wscript_configure   (contents, props changed)
  head/net/samba4/files/patch-source4__smbd__wscript_build   (contents, props changed)
  head/net/samba4/files/patch-wscript   (contents, props changed)
  head/net/samba4/files/patch-wscript_build   (contents, props changed)
  head/net/samba4/files/pkg-install.in   (contents, props changed)
Modified:
  head/net/Makefile
  head/net/samba4/Makefile
  head/net/samba4/distinfo
  head/net/samba4/files/pkg-message.in
  head/net/samba4/files/samba4.in
  head/net/samba4/pkg-plist

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Mon Feb 18 14:10:45 2013	(r312506)
+++ head/net/Makefile	Mon Feb 18 14:24:56 2013	(r312507)
@@ -1048,6 +1048,7 @@
     SUBDIR += samba-smbclient
     SUBDIR += samba34
     SUBDIR += samba36
+    SUBDIR += samba4
     SUBDIR += samba4-devel
     SUBDIR += samba4wins
     SUBDIR += samplicator

Modified: head/net/samba4/Makefile
==============================================================================
--- head/net/samba4/Makefile	Mon Feb 18 14:10:45 2013	(r312506)
+++ head/net/samba4/Makefile	Mon Feb 18 14:24:56 2013	(r312507)
@@ -3,190 +3,520 @@
 
 PORTNAME?=		${SAMBA4_PORTNAME}
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		5
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	samba/samba4
-PKGNAMESUFFIX?=		-devel
-DISTNAME=		${SAMBA_DISTNAME}
+MASTER_SITE_SUBDIR=	samba/stable samba/rc
+DISTNAME=		${SAMBA4_DISTNAME}
 
 MAINTAINER?=		timur@FreeBSD.org
-COMMENT?=		A free SMB and CIFS client and server for UNIX
+COMMENT?=		A free SMB/CIFS and AD/DC server and client for UNIX
 
-CONFLICTS?=		ldb-1.*
+LICENSE=		GPLv3
 
-SAMBA4_PORTNAME=	samba4
-SAMBA4_VERSION=		4.0.0.a11
-SAMBA_DISTNAME=		${SAMBA4_PORTNAME:S|4$||}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-OPTIONSFILE=		${PORT_DBDIR}/${SAMBA4_PORTNAME}/options
-
-LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
-WRKSRC?=		${WRKDIR}/${DISTNAME}/source4
-IPATHS=			-I${WRKDIR}/${DISTNAME}/lib/replace -I${WRKDIR}/${DISTNAME}/source4
-AUTOHEADER_ARGS=	${IPATHS}
-AUTOCONF_ARGS=		${IPATHS}
+CONFLICTS?=		*samba3[2-6]-3.*
+
+MAKE_JOBS_SAFE=		yes
+
+SAMBA4_BASENAME=	samba
+SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
+SAMBA4_VERSION=		4.0.3
+SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
+
+WRKSRC?=		${WRKDIR}/${DISTNAME}
 
 .if !defined(SAMBA4_SUBPORT)
-USE_PERL5=		yes
-USE_PYTHON=		yes
-USE_GMAKE=		yes
-USE_ICONV=		yes
-GNU_CONFIGURE=		yes
-USE_PKGCONFIG=		build
-USE_LDCONFIG=		${SAMBA_LIBDIR}
-USE_AUTOTOOLS=		autoconf autoheader
-# Flags
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
 # Directories
-VARDIR=			/var
-SAMBA_LOGDIR=		${VARDIR}/log/${PORTNAME}
-SAMBA_RUNDIR=		${VARDIR}/run/${PORTNAME}
-SAMBA_LOCKDIR=		${VARDIR}/db/${PORTNAME}
-SAMBA_PRIVATEDIR?=	${SAMBA_LOCKDIR}/private
-SAMBA_CONFDIR?=		${PREFIX}/etc
-SAMBA_LIBDIR=		${PREFIX}/lib/${PORTNAME}
-SAMBA_INCLUDEDIR=	${PREFIX}/include/${PORTNAME}
-RC_DIR=			${PREFIX}/etc/rc.d
-SAMBA_CONFIG=		smb4.conf
-
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
-			--sysconfdir="${SAMBA_CONFDIR}" \
-			--includedir="${SAMBA_INCLUDEDIR}" \
+VARDIR=			${DESTDIR}/var
+SAMBA4_RUNDIR=		${VARDIR}/run/${SAMBA4_PORTNAME}
+SAMBA4_LOGDIR=		${VARDIR}/log/${SAMBA4_PORTNAME}
+SAMBA4_LOCKDIR=		${VARDIR}/db/${SAMBA4_PORTNAME}
+SAMBA4_PRIVATEDIR=	${SAMBA4_LOCKDIR}/private
+SAMBA4_LIBDIR=		${PREFIX}/lib
+SAMBA4_MODULEDIR=	${SAMBA4_LIBDIR}/shared-modules
+SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
+SAMBA4_CONFDIR=		${PREFIX}/etc
+SAMBA4_CONFIG=		smb4.conf
+
+CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
+			--exec-prefix="${PREFIX}" \
+			--mandir="${MANPREFIX}/man" \
+			--sysconfdir="${SAMBA4_CONFDIR}" \
+			--includedir="${SAMBA4_INCLUDEDIR}" \
 			--datadir="${DATADIR}" \
-			--libdir="${SAMBA_LIBDIR}" \
-			--with-modulesdir="${SAMBA_LIBDIR}/modules" \
+			--libdir="${SAMBA4_LIBDIR}" \
+			--with-pammodulesdir="${SAMBA4_LIBDIR}" \
+			--with-privatelibdir="${SAMBA4_LIBDIR}/samba" \
+			--with-modulesdir="${SAMBA4_MODULEDIR}" \
+			--with-pkgconfigdir="${PKGCONFIGDIR}" \
 			--localstatedir="${VARDIR}" \
-			--with-piddir="${SAMBA_RUNDIR}" \
-			--with-ncalrpcdir="${SAMBA_RUNDIR}/ncalrpc" \
-			--with-winbindd-socket-dir="${SAMBA_RUNDIR}/winbindd" \
-			--with-winbindd-privileged-socket-dir="${SAMBA_RUNDIR}/winbindd_privileged" \
-			--with-ntp-signd-socket-dir="${SAMBA_RUNDIR}/ntp_signd" \
-			--with-lockdir="${SAMBA_LOCKDIR}" \
-			--with-privatedir="${SAMBA_PRIVATEDIR}" \
-			--with-logfilebase="${SAMBA_LOGDIR}"
-# Default options
-CONFIGURE_ARGS+=	\
-			--disable-external-heimdal \
-			--with-setproctitle \
-			--with-readline=/usr \
-			--with-libiconv=${LOCALBASE}
+			--with-piddir="${SAMBA4_RUNDIR}" \
+			--with-sockets-dir="${SAMBA4_RUNDIR}" \
+			--with-privileged-socket-dir="${SAMBA4_RUNDIR}" \
+			--with-lockdir="${SAMBA4_LOCKDIR}" \
+			--with-statedir="${SAMBA4_LOCKDIR}" \
+			--with-cachedir="${SAMBA4_LOCKDIR}" \
+			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
+			--with-logfilebase="${SAMBA4_LOGDIR}"
+
+WAF_TOOL=		buildtools/bin/waf
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	${WAF_TOOL} configure
+CONFIGURE_LOG=		bin/config.log
+# Flags
+CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
+
+USE_PYTHON_BUILD=	-2.7
+USE_PERL5_BUILD=	yes
+
+USE_PYTHON=		yes
+USE_ICONV=		yes
+USE_GETTEXT=		yes
+USE_PKGCONFIG=		build
+USE_LDCONFIG=		${SAMBA4_LIBDIR}
+
+PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
+PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
+# XXX: Unconditional dependencies which can't be switched off(if present in the system)
+# popt
+LIB_DEPENDS+=		popt:${PORTSDIR}/devel/popt
+# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
 # backtrace
-LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
-# BLKID
-LIB_DEPENDS+=		blkid.1:${PORTSDIR}/misc/e2fsprogs-libblkid
+LIB_DEPENDS+=		execinfo:${PORTSDIR}/devel/libexecinfo
+# inotify
+LIB_DEPENDS+=		inotify:${PORTSDIR}/devel/libinotify
 # SASL
-LIB_DEPENDS=		sasl2:${PORTSDIR}/security/cyrus-sasl2
-# tdb
-LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
-CONFIGURE_ARGS+=	--enable-external-libtdb
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+# GNUTLS
+LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+# NFS4 ACL glue
+LIB_DEPENDS+=		sunacl:${PORTSDIR}/sysutils/libsunacl
+# External Samba dependencies
+# IDL compiler
+BUILD_DEPENDS+=		p5-Parse-Pidl>=${SAMBA4_VERSION}:${PORTSDIR}/devel/p5-Parse-Pidl
 # talloc
-LIB_DEPENDS+=		talloc.2:${PORTSDIR}/devel/talloc
-CONFIGURE_ARGS+=	--enable-external-libtalloc
+BUILD_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
+RUN_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
+SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
-#LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
-#CONFIGURE_ARGS+=	--enable-external-libtevent
-# tevent - use internal libtevent since FreeBSD's port is at
-# 0.9.15 and samba4.alpha11 claims to want exactly 0.9.8
-
-OPTIONS=	\
-		DEBUG		"With debug info" off \
-		UTILS		"Build userland utils(conflicts with Samba3)" off \
-		THREADS		"With pthreads" on \
-		GNUTLS 		"With SSL (via GnuTLS) for SWAT support" off \
-		POPT		"With system-wide POPT library" on \
-		PCH		"With precompiled headers" off
+BUILD_DEPENDS+=		tevent>=0.9.17:${PORTSDIR}/devel/tevent
+RUN_DEPENDS+=		tevent>=0.9.17:${PORTSDIR}/devel/tevent
+SAMBA4_BUNDLED_LIBS+=	!tevent
+# tdb
+BUILD_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
+RUN_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
+SAMBA4_BUNDLED_LIBS+=	!tdb
+# ldb
+BUILD_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
+RUN_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
+SAMBA4_BUNDLED_LIBS+=	!ldb
+##############################################################################
+# Options
+OPTIONS_DEFINE=		ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DEBUG \
+			DNSUPDATE FAM_SUPPORT LDAP PAM_SMBPASS \
+			PTHREADPOOL QUOTAS SWAT SYSLOG UTMP WINBIND
+
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
+
+ACL_SUPPORT_DESC=	File system ACL support
+ADS_DESC=		Active Directory support
+AIO_SUPPORT_DESC=	Asyncronous IO support
+DNSUPDATE_DESC=		Dynamic DNS update(require ADS)
+EXP_MODULES_DESC=	Experimental modules
+FAM_SUPPORT_DESC=	File Alteration Monitor support
+DEBUG_DESC=		With debug information in the binaries
+PAM_SMBPASS_DESC=	PAM authentication via passdb backends
+PTHREADPOOL_DESC=	Pthread pool
+QUOTAS_DESC=		Disk quota support
+SWAT_DESC=		SWAT WebGUI
+UTMP_DESC=		UTMP accounting support
+WINBIND_DESC=		WinBIND support
+##############################################################################
+OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
+
+DEVELOPER_DESC=		With development support
+
+OPTIONS_SINGLE=		DNS
+OPTIONS_SINGLE_DNS=	NSUPDATE BIND98 BIND99
+
+BIND98_DESC=		Use bind98 as a DNS server frontend
+BIND99_DESC=		Use bind99 as a DNS server frontend
+NSUPDATE_DESC=		Use internal DNS with NSUPDATE utility
+
+OPTIONS_DEFAULT+=	NSUPDATE
 
 .include <bsd.port.options.mk>
 
-INSTALL_TARGET=		showlayout everything installsbin installdat \
-			installmisc installlib installheader installpc \
-			installplugins installpython
+# !SAMBA4_SUBPORT
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(SAMBA4_SUBPORT)
+
+CONFIGURE_ARGS+=	\
+			--with-pam \
+			--with-iconv \
+			--with-sendfile-support \
+			--builtin-libraries=smbclient \
+			--with-libiconv="${LOCALBASE}" \
+			--with-gettext="${LOCALBASE}"
+
+# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
+.if ${ARCH} == "amd64"
+CFLAGS+=		-fno-omit-frame-pointer
+.endif
+
+.if ${PORT_OPTIONS:MBIND98}
+RUN_DEPENDS+=		bind98>=9.8.0.0:${PORTSDIR}/dns/bind98
+SUB_LIST+=		NSUPDATE="@comment "
+.elif ${PORT_OPTIONS:MBIND99}
+RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
+SUB_LIST+=		NSUPDATE="@comment "
+.else
+RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
+SUB_LIST+=		NSUPDATE=""
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--verbose
+_MAKE_JOBS+=		--verbose
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
-.if defined(WITH_DSO)
-CONFIGURE_ARGS+=	--enable-dso
+# https://bugzilla.samba.org/show_bug.cgi?id=8969
+.if ${PORT_OPTIONS:MDEVELOPER}
+GDB_CMD=		gdb751
+BUILD_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+RUN_DEPENDS+=		${GDB_CMD}:${PORTSDIR}/devel/gdb
+SAMBA4_MODULES+=	auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
+CONFIGURE_ARGS+=	--enable-developer --enable-socket-wrapper --enable-nss-wrapper --enable-selftest
+PLIST_SUB+=		DEVELOPER=""
 .else
-CONFIGURE_ARGS+=	--disable-dso
+GDB_CMD=		/usr/bin/true
+PLIST_SUB+=		DEVELOPER="@comment "
+.endif
+##############################################################################
+# XXX: That will blow up your installation
+# https://bugzilla.samba.org/show_bug.cgi?id=9302
+.if defined(CRAZY)
+WANT_EXP_MODULES=	auth_samba4 auth_script auth_skel auth_unix auth_wbc \
+			gpext_registry gpext_scripts gpext_security idmap_ad \
+			idmap_autorid idmap_hash idmap_ldap idmap_passdb \
+			idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \
+			pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \
+			pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \
+			vfs_acl_xattr vfs_aio_fork vfs_aio_posix \
+			vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \
+			vfs_catia vfs_commit vfs_crossrename vfs_default_quota \
+			vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \
+			vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \
+			vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \
+			vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \
+			vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \
+			vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \
+			vfs_streams_xattr vfs_syncops vfs_time_audit \
+			vfs_xattr_tdb vfs_zfsacl
+.endif
+
+.if ${PORT_OPTIONS:MEXP_MODULES}
+.	if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
+WANT_EXP_MODULES=	idmap_ad vfs_cacheprime gpext_scripts gpext_security gpext_registry
+.	endif
 .endif
 
-.if !defined(WITHOUT_UTILS)
-INSTALL_TARGET+=	installbin
-PLIST_SUB+=		UTILS=""
-CONFLICTS+=		ja-samba-[23].* samba-[2-9].*
+.if ${PORT_OPTIONS:MACL_SUPPORT}
+.	if ${OSVERSION} > 800000
+LIB_DEPENDS+=		sunacl:${PORTSDIR}/sysutils/libsunacl
+WANT_EXP_MODULES+=	vfs_zfsacl
+SAMBA4_MODULES+=	vfs_zfsacl
+.	endif
+CONFIGURE_ARGS+=	--with-acl-support
 .else
-PLIST_SUB+=		UTILS="@comment "
+CONFIGURE_ARGS+=	--without-acl-support
 .endif
 
-.if !defined(WITHOUT_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug --enable-developer \
-			--enable-socket-wrapper --enable-nss-wrapper
+.if ${PORT_OPTIONS:MADS}
+SAMBA4_WANT_ADS=	yes
+SAMBA4_WANT_LDAP=	yes
+.endif
+
+.if ${PORT_OPTIONS:MAIO_SUPPORT}
+CONFIGURE_ARGS+=	--with-aio-support
+SAMBA4_MODULES+=	vfs_aio_posix
 .else
-CONFIGURE_ARGS+=	--disable-debug --disable-developer \
-			--disable-socket-wrapper --disable-nss-wrapper
+CONFIGURE_ARGS+=	--without-aio-support
 .endif
 
-.if !defined(WITHOUT_THREADS)
-CPPFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LIBS}
-CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--with-pthreads
+.if ${PORT_OPTIONS:MAVAHI}
+LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
+CONFIGURE_ARGS+=	--enable-avahi
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=		cups:${PORTSDIR}/print/cups-client
+CONFIGURE_ARGS+=	--enable-cups --enable-iprint
+.else
+CONFIGURE_ARGS+=	--disable-cups --disable-iprint
+.endif
+
+.if ${PORT_OPTIONS:MDNSUPDATE}
+SAMBA_WANT_ADS=		yes
+CONFIGURE_ARGS+=	--with-dnsupdate
+.else
+CONFIGURE_ARGS+=	--without-dnsupdate
+.endif
+
+.if 0
+.if ${PORT_OPTIONS:MFAM_SUPPORT}
+USE_FAM=		yes
+CONFIGURE_ARGS+=	--enable-fam
+WANT_EXP_MODULES+=	vfs_notify_fam
+SAMBA4_MODULES+=	vfs_notify_fam
+.else
+CONFIGURE_ARGS+=	--disable-fam
+.endif
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+SAMBA4_WANT_LDAP=	yes
+.endif
+
+.if ${PORT_OPTIONS:MPAM_SMBPASS}
+CONFIGURE_ARGS+=	--with-pam_smbpass
+PLIST_SUB+=		SMBPASS=""
+.else
+CONFIGURE_ARGS+=	--without-pam_smbpass
+PLIST_SUB+=		SMBPASS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPTHREADPOOL}
+CONFIGURE_ARGS+=	--enable-pthreadpool
+SAMBA4_MODULES+=	vfs_aio_pthread
+.else
+CONFIGURE_ARGS+=	--disable-pthreadpool
+.endif
+
+.if ${PORT_OPTIONS:MQUOTAS}
+CONFIGURE_ARGS+=	--with-quotas
+.else
+CONFIGURE_ARGS+=	--without-quotas
+.endif
+
+.if ${PORT_OPTIONS:MSYSLOG}
+CONFIGURE_ARGS+=	--with-syslog
+.else
+CONFIGURE_ARGS+=	--without-syslog
+.endif
+
+.if ${PORT_OPTIONS:MSWAT}
+CONFIGURE_ARGS+=	--with-swat
+PLIST_SUB+=		SWAT=""
 .else
-CONFIGURE_ARGS+=	--without-pthreads
+CONFIGURE_ARGS+=	--without-swat
+PLIST_SUB+=		SWAT="@comment "
 .endif
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=		gnutls.26:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls
+.if ${PORT_OPTIONS:MUTMP}
+CONFIGURE_ARGS+=	--with-utmp
 .else
-CONFIGURE_ARGS+=	--disable-gnutls
+CONFIGURE_ARGS+=	--without-utmp
 .endif
 
-.if !defined(WITHOUT_POPT)
-LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ARGS+=	--without-included-popt
+.if ${PORT_OPTIONS:MWINBIND}
+CONFIGURE_ARGS+=	--with-winbind
+PLIST_SUB+=		WINBIND=""
 .else
-CONFIGURE_ARGS+=	--with-included-popt
+CONFIGURE_ARGS+=	--without-winbind
+PLIST_SUB+=		WINBIND="@comment "
 .endif
 
-.if defined(WITH_SQLITE3)
-USE_SQLITE=		3
-CONFIGURE_ARGS+=	--with-sqlite3
+.if defined(SAMBA4_WANT_ADS)
+CONFIGURE_ARGS+=	--with-ads
 .else
-CONFIGURE_ARGS+=	--without-sqlite3
+CONFIGURE_ARGS+=	--without-ads
+.endif
+
+.if defined(SAMBA4_WANT_LDAP)
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+PLIST_SUB+=		LDAP=""
+.else
+CONFIGURE_ARGS+=	--without-ldap
+PLIST_SUB+=		LDAP="@comment "
+.endif
+
+.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
+SAMBA4_MODULES+=	${WANT_EXP_MODULES}
+CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
 .endif
 
-.if defined(SAMBA_DISABLE_EXT) && !empty(SAMBA_DISABLE_EXT)
-CONFIGURE_ARGS+=	--with-disable-ext-lib="${SAMBA_DISABLE_EXT:Q:C/(\\\\ )+/,/g}"
+.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
+CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C/(\\\\ )+/,/g}"
 .endif
 
-SAMBA_SUB=		SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
-			SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
-			SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
-			SAMBA_CONFIG="${SAMBA_CONFIG}" \
-			SAMBA_RUNDIR="${SAMBA_RUNDIR}" \
-			SAMBA_PRIVATEDIR="${SAMBA_PRIVATEDIR}"
+# XXX
+.for m in ${SAMBA4_MODULES}
+PLIST_REINPLACE+=	${m}
+PLIST_REINPLACE_${m:U}=	s|^@comment ${m} ||g
+.endfor
+##############################################################################
+.if ! ${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ENV+=		XSLTPROC="/usr/bin/true"
+.else
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+			xsltproc:${PORTSDIR}/textproc/libxslt
+.endif
+
+SAMBA4_SUB=		SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
+			SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
+			SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
+			SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \
+			SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \
+			SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \
+			SAMBA4_CONFIG="${SAMBA4_CONFIG}"
+
+PLIST_SUB+=		${SAMBA4_SUB}
+SUB_LIST+=		${SAMBA4_SUB}
+
+USE_RC_SUBR=		${SAMBA4_PORTNAME}
+SUB_FILES=		pkg-install pkg-message README.FreeBSD
+
+CONFIGURE_ENV+=		NOCOLOR=yes
+MAKE_ENV+=		NOCOLOR=yes
+
+.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
+.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
+CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
+_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
+.endif
+.endif
 
-PLIST_SUB+=		${SAMBA_SUB}
-SUB_LIST+=		${SAMBA_SUB}
+MAN1+=			dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
+			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
+			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
+			profiles.1 regdiff.1 regpatch.1 regshell.1 \
+			regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \
+			smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \
+			smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \
+			testparm.1 vfstest.1 wbinfo.1
+
+MAN5+=			lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
+			smb.conf.5
+
+MAN7+=			samba.7 winbind_krb5_locator.7
+
+MAN8+=			eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
+			idmap_ldap.8 idmap_nss.8 idmap_rid.8 idmap_tdb.8 \
+			idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
+			samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool.8 \
+			smbta-util.8 swat.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \
+			vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \
+			vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 \
+			vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \
+			vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \
+			vfs_full_audit.8 vfs_gpfs.8 vfs_media_harmony.8 \
+			vfs_netatalk.8 vfs_notify_fam.8 vfs_prealloc.8 \
+			vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \
+			vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \
+			vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
+			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_time_audit.8 \
+			vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8
+
+MLINKS=			smb.conf.5 smb4.conf.5 samba.8 samba4.8
+
+PORTDOCS=		README.FreeBSD
+
+ALL_TARGET=		build
+INSTALL_TARGET=		install
+
+IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
+
+post-extract:
+			@${RM} -rf ${WRKSRC}/pidl
+
+# Use threading (or multiprocessing) but not thread (renamed in python 3+).
+pre-configure:
+			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
+				${ECHO_CMD}; \
+				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
+				${ECHO_CMD}; \
+				${FALSE}; \
+			fi
 
 post-patch:
-			@${REINPLACE_CMD} -i '' -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|' \
-				${WRKSRC}/dynconfig/config.mk
+			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
+				${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
+			@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+				${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \
+				${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
+			@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
+				${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
+			@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
+				${PATCH_WRKSRC}/dynconfig/wscript \
+				${PATCH_WRKSRC}/dynconfig/config.m4
+# Make sure that the right version of Python is used by the tools
+# https://bugzilla.samba.org/show_bug.cgi?id=7305
+			@for f in ${PATCH_WRKSRC}/source4/scripting/bin/*; do \
+				${REINPLACE_CMD} -e '1,1 s|.*python.*|#!${PYTHON_CMD}|' $${f}; \
+			done
 
-.if defined(WITH_PCH)
 pre-build:
-	(cd ${BUILD_WRKSRC} && ${GMAKE} pch)
+.if ! ${PORT_OPTIONS:MMANPAGES}
+.	for man in	libcli/nbt/man/nmblookup4.1 \
+			librpc/tools/ndrdump.1 \
+			source4/lib/registry/man/regdiff.1 \
+			source4/lib/registry/man/regpatch.1 \
+			source4/lib/registry/man/regshell.1 \
+			source4/lib/registry/man/regtree.1 \
+			source4/torture/man/gentest.1 \
+			source4/torture/man/locktest.1 \
+			source4/torture/man/masktest.1 \
+			source4/torture/man/smbtorture.1 \
+			source4/utils/man/ntlm_auth4.1 \
+			source4/utils/man/oLschema2ldif.1
+			-@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
+			@${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
+.	endfor
+			-@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
+.	for man in ${MAN1} ${MAN5} ${MAN7} ${MAN8}
+			-@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
+.	endfor
 .endif
 
-USE_RC_SUBR=		${SAMBA_PORTNAME}
-SUB_FILES=		pkg-message
+do-build:
+			@(cd ${BUILD_WRKSRC}; \
+			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
+				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+				fi; \
+			${FALSE}; \
+			fi)
+
+do-install:
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
+			@${MKDIR} ${DOCSDIR}
+.	for doc in ${PORTDOCS}
+			@${INSTALL_DATA} ${WRKDIR}/${doc} ${DOCSDIR}
+.	endfor
+.endif
+			@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 			@${CAT} ${PKGMESSAGE}
+
+.if ${PORT_OPTIONS:MDEVELOPER}
+test: build
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} $@)
+.endif
+
 # !SAMBA4_SUBPORT
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/net/samba4/distinfo
==============================================================================
--- head/net/samba4/distinfo	Mon Feb 18 14:10:45 2013	(r312506)
+++ head/net/samba4/distinfo	Mon Feb 18 14:24:56 2013	(r312507)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.0alpha11.tar.gz) = ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
-SIZE (samba-4.0.0alpha11.tar.gz) = 13917363
+SHA256 (samba-4.0.3.tar.gz) = ab5d3618632f8869c838c0b2994b3f169da6824885710aad1146738172e44a4b
+SIZE (samba-4.0.3.tar.gz) = 22051995

Added: head/net/samba4/files/README.FreeBSD.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba4/files/README.FreeBSD.in	Mon Feb 18 14:24:56 2013	(r312507)
@@ -0,0 +1,99 @@
+
+              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+              !!! Please read before runing any tools !!!
+              !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Documentation
+=============
+
+    o https://wiki.samba.org/index.php/Samba4/HOWTO
+
+    o https://wiki.samba.org/index.php/Samba_AD_DC_HOWTO
+
+    o https://wiki.samba.org/index.php/Samba4/samba-tool/domain/classicupgrade/HOWTO
+
+FreeBSD specific information
+============================
+
+* Your configuration is in: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
+
+* All the logs are under: %%SAMBA4_LOGDIR%%
+
+* All the relevant databases are under: %%SAMBA4_LOCKDIR%%
+
+* Provisioning script is: %%PREFIX%%/bin/samba-tool
+
+Samba4 provisioning requires file system(s) with POSIX ACLs support. At
+the moment that is UFS2 only. You have to add 'acls' option to the mount
+flags to get things working.
+
+It is known that ZFS-only installations don't work out of the box with
+Samba4. In partucular, s3fs service requires POSIX ACLs during provi-
+sioning. It is possible to work around that requirement by specifying:
+
+    # samba-tool domain provision --interactive --use-xattrs=no --use-ntvfs
+
+And removing later in '%%SAMBA4_CONFIG%%' options like:
+
+    'server services', 'dcerpc endpoint servers', 'posix:eadb'
+
+and adding 'vfs objects = zfsacl' as well. Still this isn't supported
+and tested configuration, so use it at your own risk.
+
+You may find this tutorial useful, if you happen to run Samba4 on
+ZFS-root:
+
+    o http://glsan.com/community/samba4
+
+To run this port you need to perform the following steps:
+---------------------------------------------------------
+
+0. If you had Samba3 port installed before, please, *take backups* of
+all the relevant files. That includes 'smb.conf' file and all the
+content of the '/var/db/samba/' directory.
+
+If you had Samba4-devel installation before to my knowledge the best
+option would be to start from scratch.
+
+1a. Create new '%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%' file by running:
+
+    # samba-tool domain provision
+
+1b. Or upgrade from the Samba3 'smb.conf' file by running:
+
+    # samba-tool domain classicupgrade
+
+%%NSUPDATE%%1c. You will need to specify location of the 'nsupdate' command in the
+%%NSUPDATE%%'%%SAMBA4_CONFIG%%' file:
+%%NSUPDATE%%
+%%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
+%%NSUPDATE%%
+2. Put string 'samba4_enable="YES"' into your /etc/rc.conf.
+
+3. Make sure that your server doesn't run Samba3, OpenLDAP and named.
+Stop them, if necessary.
+
+4. Run '%%PREFIX%%/etc/rc.d/samba4 start' or reboot.
+
+WARNING! This port is still experimental and if you need any asistance,
+please, check archives of samba@lists.samba.org and ask there for help.
+
+    https://lists.samba.org/archive/samba/
+
+In case you found a bug which is clearly not related to the port build
+process itself, plese file a bug report at:
+
+    https://bugzilla.samba.org/
+
+And add me to CC list.
+
+You may find those tools helpful:
+---------------------------------
+
+Microsoft Remote Server Administration Tools (RSAT) for:
+
+* Vista: http://www.microsoft.com/en-us/download/details.aspx?id=21090
+* Windows 7: http://www.microsoft.com/en-us/download/details.aspx?id=7887
+
+
+FreeBSD Samba4 port maintainer: Timur I. Bakeyev <timur@FreeBSD.org>

Added: head/net/samba4/files/man/gentest.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba4/files/man/gentest.1	Mon Feb 18 14:24:56 2013	(r312507)
@@ -0,0 +1,133 @@
+'\" t
+.\"     Title: gentest
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "GENTEST" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+gentest \- Run random generic SMB operations against two SMB servers and show the differences in behavior
+.SH "SYNOPSIS"
+.HP \w'\fBgentest\fR\ 'u
+\fBgentest\fR {//server1/share1} {//server2/share2} {\-U\ user%pass} {\-U\ user%pass} [\-s\ seed] [\-o\ numops] [\-a] [\-A] [\-i\ FILE] [\-O] [\-S\ FILE] [\-L] [\-F] [\-C] [\-X]
+.SH "DESCRIPTION"
+.PP
+gentest
+is a utility for detecting differences in behaviour between SMB servers\&. It will run a random set of generic operations against
+\fI//server1/share1\fR
+and then the same random set against
+\fI//server2/share2\fR
+and display the differences in the responses it gets\&.
+.PP
+This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
+.SH "OPTIONS"
+.PP
+\-U user%pass
+.RS 4
+Specify the user and password to use when logging on on the shares\&. This parameter is mandatory and has to be specified twice\&.
+.RE
+.PP
+\-s seed
+.RS 4
+Seed the random number generator with the specified value\&.
+.RE
+.PP
+\-o numops
+.RS 4
+Set the number of operations to perform\&.
+.RE
+.PP
+\-a
+.RS 4
+Print the operations that are performed\&.
+.RE
+.PP
+\-A
+.RS 4
+Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
+.RE
+.PP
+\-i FILE
+.RS 4
+Specify a file containing the names of fields that have to be ignored (such as time fields)\&. See below for a description of the file format\&.
+.RE
+.PP
+\-O
+.RS 4
+Enable oplocks\&.
+.RE
+.PP
+\-S FILE
+.RS 4
+Set preset seeds file\&. The default is
+gentest_seeds\&.dat\&.
+.RE
+.PP
+\-L
+.RS 4
+Use preset seeds
+.RE
+.PP
+\-F
+.RS 4
+Fast reconnect (just close files)
+.RE
+.PP
+\-C
+.RS 4
+Continuous analysis mode
+.RE
+.PP
+\-X
+.RS 4
+Analyse even when the test succeeded\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 4\&.0 of the Samba suite\&.
+.SH "SEE ALSO"
+.PP
+Samba
+.SH "AUTHOR"
+.PP
+This utility is part of the
+\m[blue]\fBSamba\fR\m[]\&\s-2\u[1]\d\s+2
+suite, which is developed by the global
+\m[blue]\fBSamba Team\fR\m[]\&\s-2\u[2]\d\s+2\&.
+.PP
+gentest was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Samba
+.RS 4
+\%http://www.samba.org/
+.RE
+.IP " 2." 4
+Samba Team
+.RS 4
+\%http://www.samba.org/samba/team/
+.RE

Added: head/net/samba4/files/man/locktest.1
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba4/files/man/locktest.1	Mon Feb 18 14:24:56 2013	(r312507)
@@ -0,0 +1,137 @@
+'\" t
+.\"     Title: locktest
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
+.\"      Date: 02/03/2013
+.\"    Manual: Test Suite
+.\"    Source: Samba 4.0
+.\"  Language: English
+.\"
+.TH "LOCKTEST" "1" "02/03/2013" "Samba 4\&.0" "Test Suite"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+locktest \- Find differences in locking between two SMB servers
+.SH "SYNOPSIS"
+.HP \w'\fBlocktest\fR\ 'u
+\fBlocktest\fR {//server1/share1} {//server2/share2} [\-U\ user%pass] [\-U\ user%pass] [\-s\ seed] [\-o\ numops] [\-a] [\-O] [\-E] [\-Z] [\-R\ range] [\-B\ base] [\-M\ min]
+.SH "DESCRIPTION"
+.PP
+locktest
+is a utility for detecting differences in behaviour in locking between SMB servers\&. It will run a random set of locking operations against
+\fI//server1/share1\fR
+and then the same random set against
+\fI//server2/share2\fR
+and display the differences in the responses it gets\&.
+.PP
+This utility is used by the Samba team to find differences in behaviour between Samba and Windows servers\&.
+.SH "OPTIONS"
+.PP
+\-U user%pass
+.RS 4
+Specify the user and password to use when logging on on the shares\&. This parameter can be specified twice (once for the first server, once for the second)\&.
+.RE
+.PP
+\-s seed
+.RS 4
+Seed the random number generator with the specified value\&.
+.RE
+.PP
+\-o numops
+.RS 4
+Set the number of operations to perform\&.
+.RE
+.PP
+\-a
+.RS 4
+Print the operations that are performed\&.
+.RE
+.PP
+\-A
+.RS 4
+Backtrack to find minimal number of operations required to make the response to a certain call differ\&.
+.RE
+.PP
+\-O
+.RS 4
+Enable oplocks\&.
+.RE
+.PP
+\-u
+.RS 4
+Hide unlock fails\&.
+.RE
+.PP
+\-E
+.RS 4
+enable exact error code checking
+.RE
+.PP
+\-Z

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302181424.r1IEOvaf094582>