Upgrade Samba4 to the 4.0.0.alpha11 version.

23 files changed, 230 insertions, 420 deletions

diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile
index fcfc1a7bb067..61f3fa53e892 100644
--- a/net/samba4-devel/Makefile
+++ b/net/samba4-devel/Makefile
@@ -4,10 +4,9 @@
 #
 # $FreeBSD$
 #
-
 PORTNAME?=		${SAMBA_PORTNAME}
 PORTVERSION?=		${SAMBA_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba4
@@ -17,28 +16,22 @@ DISTNAME=		${SAMBA_DISTNAME}
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		*samba-3.*
+CONFLICTS?=
 
 SAMBA_PORTNAME=		samba4
-SAMBA_VERSION=		4.0.0.a8
+SAMBA_VERSION=		4.0.0.a11
 SAMBA_DISTNAME=		${SAMBA_PORTNAME:S|4$||}-${SAMBA_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
+OPTIONSFILE=		${PORT_DBDIR}/${SAMBA_PORTNAME}/options
 
 LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-#PATCHDIR=		${.CURDIR}/../samba34/files
-#MD5_FILE=		${.CURDIR}/../samba34/distinfo
 PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
 WRKSRC?=		${WRKDIR}/${DISTNAME}/source4
-IPATHS=			-I${WRKDIR}/${DISTNAME}/lib/replace
+IPATHS=			-I${WRKDIR}/${DISTNAME}/lib/replace -I${WRKDIR}/${DISTNAME}/source4
 AUTOHEADER_ARGS=	${IPATHS}
 AUTOCONF_ARGS=		${IPATHS}
 
 .if !defined(SAMBA_SUBPORT)
-
-CONFLICTS?=		ja-samba-[23].* samba-[2-9].* sharity-light-1.*
-
-IPATHS+=		-I${WRKDIR}/${DISTNAME}/source4
-
 USE_PERL5=		yes
 USE_PYTHON=		yes
 USE_GMAKE=		yes
@@ -47,7 +40,11 @@ GNU_CONFIGURE=		yes
 USE_GNOME=		pkgconfig
 USE_LDCONFIG=		${SAMBA_LIBDIR}
 USE_AUTOTOOLS=		autoconf:262 autoheader:262
-# directories
+# Flags
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+# Directories
 VARDIR=			/var
 SAMBA_LOGDIR=		${VARDIR}/log/${PORTNAME}
 SAMBA_RUNDIR=		${VARDIR}/run/${PORTNAME}
@@ -57,7 +54,7 @@ SAMBA_CONFDIR?=		${PREFIX}/etc
 SAMBA_LIBDIR=		${PREFIX}/lib/${PORTNAME}
 SAMBA_INCLUDEDIR=	${PREFIX}/include/${PORTNAME}
 RC_DIR=			${PREFIX}/etc/rc.d
-SAMBA_CONFIG=		smb.conf
+SAMBA_CONFIG=		smb4.conf
 
 CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--sysconfdir="${SAMBA_CONFDIR}" \
@@ -67,35 +64,14 @@ CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--with-modulesdir="${SAMBA_LIBDIR}/modules" \
 			--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}"
-
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-OPTIONS=	\
-		DEBUG		"With debug info" off \
-		THREADS		"With pthreads" on \
-		GNUTLS 		"With SSL (via GnuTLS) for SWAT support" off \
-		EXT_TDB		"With external libtdb" on \
-		EXT_TALLOC	"With external libtalloc" on \
-		EXT_TEVENT	"With external libtevent" on \
-		POPT		"With system-wide POPT library" on \
-		PCH		"With precompiled headers" off
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(SAMBA_SUBPORT)
-#
-USE_RC_SUBR=		${SAMBA_PORTNAME}
-SUB_FILES=		pkg-message
-
+# Default options
 CONFIGURE_ARGS+=	\
 			--disable-external-heimdal \
 			--with-setproctitle \
@@ -107,6 +83,29 @@ LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
 LIB_DEPENDS+=		blkid.1:${PORTSDIR}/misc/e2fsprogs-libblkid
 # SASL
 LIB_DEPENDS=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+# tdb
+LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
+CONFIGURE_ARGS+=	--enable-external-libtdb
+# talloc
+LIB_DEPENDS+=		talloc.2:${PORTSDIR}/devel/talloc
+CONFIGURE_ARGS+=	--enable-external-libtalloc
+# tevent
+LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
+CONFIGURE_ARGS+=	--enable-external-libtevent
+
+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
+
+.include <bsd.port.options.mk>
+
+INSTALL_TARGET=		showlayout everything installsbin installdat \
+			installmisc installlib installheader installpc \
+			installplugins installpython
 
 .if defined(WITH_DSO)
 CONFIGURE_ARGS+=	--enable-dso
@@ -114,6 +113,14 @@ CONFIGURE_ARGS+=	--enable-dso
 CONFIGURE_ARGS+=	--disable-dso
 .endif
 
+.if !defined(WITHOUT_UTILS)
+INSTALL_TARGET+=	installbin
+PLIST_SUB+=		UTILS=""
+CONFLICTS+=		ja-samba-[23].* samba-[2-9].*
+.else
+PLIST_SUB+=		UTILS="@comment "
+.endif
+
 .if !defined(WITHOUT_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug --enable-developer \
 			--enable-socket-wrapper --enable-nss-wrapper
@@ -153,34 +160,6 @@ CONFIGURE_ARGS+=	--with-sqlite3
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
-.if defined(WITH_EXT_TDB)
-LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
-CONFIGURE_ARGS+=	--enable-external-libtdb
-PLIST_SUB+=		TDB="@comment "
-.else
-CONFLICTS+=		tdb-1*
-CONFIGURE_ARGS+=	--disable-external-libtdb
-PLIST_SUB+=		TDB=""
-.endif
-
-.if defined(WITH_EXT_TALLOC)
-LIB_DEPENDS+=		talloc.1:${PORTSDIR}/devel/talloc
-CONFIGURE_ARGS+=	--enable-external-libtalloc
-.else
-CONFLICTS+=		talloc-1*
-CONFIGURE_ARGS+=	--disable-external-libtalloc
-.endif
-
-.if defined(WITH_EXT_TEVENT)
-LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
-CONFIGURE_ARGS+=	--enable-external-libtevent
-PLIST_SUB+=		TEVENT="@comment "
-.else
-CONFLICTS+=		tevent-0*
-CONFIGURE_ARGS+=	--disable-external-libtevent
-PLIST_SUB+=		TEVENT=""
-.endif
-
 .if defined(SAMBA_DISABLE_EXT) && !empty(SAMBA_DISABLE_EXT)
 CONFIGURE_ARGS+=	--with-disable-ext-lib="${SAMBA_DISABLE_EXT:Q:C/(\\\\ )+/,/g}"
 .endif
@@ -195,24 +174,21 @@ SAMBA_SUB=		SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 PLIST_SUB+=		${SAMBA_SUB}
 SUB_LIST+=		${SAMBA_SUB}
 
+post-patch:
+			@${REINPLACE_CMD} -i '' -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|' \
+				${WRKSRC}/dynconfig/config.mk
+
 .if defined(WITH_PCH)
 pre-build:
 	(cd ${BUILD_WRKSRC} && ${GMAKE} pch)
 .endif
 
-post-build:
-.for f in autoidl epdump fullschema get-descriptors minschema mymachinepw rpcclient samba3dump smbstatus subunitrun
-	@${REINPLACE_CMD} -i '' -e '1,1 s|#!.*python.*|#!${PYTHON_CMD}|' \
-		${WRKSRC}/scripting/bin/${f}
-.endfor
-.for f in enableaccount newuser provision provision-backend setexpiry setpassword upgrade
-	@${REINPLACE_CMD} -i '' -e '1,1 s|#!.*python.*|#!${PYTHON_CMD}|' \
-		${WRKSRC}/setup/${f}
-.endfor
+USE_RC_SUBR=		${SAMBA_PORTNAME}
+SUB_FILES=		pkg-message
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
+			@${CAT} ${PKGMESSAGE}
 # !SAMBA_SUBPORT
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/samba4-devel/distinfo b/net/samba4-devel/distinfo
index 6fb8b2c58278..8496c3660614 100644
--- a/net/samba4-devel/distinfo
+++ b/net/samba4-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-4.0.0alpha8.tar.gz) = 9ed6588e1e77f7a3f1a6c9fe3ebcefa3
-SHA256 (samba-4.0.0alpha8.tar.gz) = b907d249c57f75ab7959d987dd9bd59b6865e6bd7ec33e719e0a5660aa53e3bd
-SIZE (samba-4.0.0alpha8.tar.gz) = 12119314
+MD5 (samba-4.0.0alpha11.tar.gz) = dac98184a01e7e0c171302e3b78bf507
+SHA256 (samba-4.0.0alpha11.tar.gz) = ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
+SIZE (samba-4.0.0alpha11.tar.gz) = 13917363
diff --git a/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD b/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD
deleted file mode 100644
index d4bb4016c29b..000000000000
--- a/net/samba4-devel/files/patch-0001-s4-provision-Fix-provision-on-FreeBSD
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1887ad0a26cca026c3503f0ef4e40f8eff42a121 Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet@samba.org>
-Date: Wed, 22 Jul 2009 18:04:58 +1000
-Subject: [PATCH] s4:provision Fix provision on FreeBSD
-
-We were missing the 'cn' attribute, which we then prepare a sorted
-list based on.  On Linux, strcmp(NULL, NULL) does not segfault, where
-it does on FreeBSD.
-
-Reported by Timur I. Bakeyev <timur@com.bat.ru>
-
-Andrew Bartlett
----
- source4/scripting/python/samba/ms_schema.py |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/source4/scripting/python/samba/ms_schema.py b/source4/scripting/python/samba/ms_schema.py
-index 2e8050e..a0abc33 100644
---- source4/scripting/python/samba/ms_schema.py
-+++ source4/scripting/python/samba/ms_schema.py
-@@ -226,6 +226,7 @@ def __transform_entry(entry, objectClass):
-     assert(cn)
-     entry.insert(0, ["dn", "CN=%s,${SCHEMADN}" % cn])
-     entry.insert(1, ["objectClass", ["top", objectClass]])
-+    entry.insert(2, ["cn", cn])
-     
-     for l in entry:
-         key = l[0].lower()
--- 
-1.6.3.1
-
diff --git a/net/samba4-devel/files/patch-lib__replace__system__filesys.h b/net/samba4-devel/files/patch-lib__replace__system__filesys.h
index 304c3c3c1243..3b7bd28f7566 100644
--- a/net/samba4-devel/files/patch-lib__replace__system__filesys.h
+++ b/net/samba4-devel/files/patch-lib__replace__system__filesys.h
@@ -1,33 +1,5 @@
---- ./lib/replace/system/filesys.h.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/replace/system/filesys.h	2009-07-12 02:39:36.000000000 +0000
-@@ -53,23 +53,23 @@
- #include <acl/libacl.h>
- #endif
- 
--#ifdef HAVE_SYS_FS_S5PARAM_H 
-+#ifdef HAVE_SYS_FS_S5PARAM_H
- #include <sys/fs/s5param.h>
- #endif
- 
- #if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
--#include <sys/filsys.h> 
-+#include <sys/filsys.h>
- #endif
- 
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
--#ifdef HAVE_DUSTAT_H              
-+#ifdef HAVE_DUSTAT_H
- #include <sys/dustat.h>
- #endif
- 
--#ifdef HAVE_SYS_STATVFS_H          
-+#ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #endif
- 
+--- ./lib/replace/system/filesys.h.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./lib/replace/system/filesys.h	2010-01-24 21:49:26.000000000 +0000
 @@ -117,6 +117,13 @@
  #include <sys/xattr.h>
  #endif
diff --git a/net/samba4-devel/files/patch-lib__talloc__talloc.mk b/net/samba4-devel/files/patch-lib__talloc__talloc.mk
deleted file mode 100644
index f580e841b7f9..000000000000
--- a/net/samba4-devel/files/patch-lib__talloc__talloc.mk
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./lib/talloc/talloc.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/talloc/talloc.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -1,6 +1,6 @@
- TALLOC_OBJ = $(tallocdir)/talloc.o 
- 
--TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
-+TALLOC_SOLIB = libtalloc.$(SHLIBEXT).1
- TALLOC_SONAME = libtalloc.$(SHLIBEXT).1
- TALLOC_STLIB = libtalloc.a
- 
-@@ -15,16 +15,14 @@
- 
- install:: all 
- 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
--	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
-+	${INSTALLCMD} -d $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	${INSTALLCMD} -m 755 $(TALLOC_STLIB) $(DESTDIR)$(libdir)
- 	${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(DESTDIR)$(libdir)
- 	${INSTALLCMD} -d $(DESTDIR)${includedir}
- 	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
--	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
-+	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi
- 	if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi
--	which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
--	which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
- 
- doc:: talloc.3 talloc.3.html
- 
diff --git a/net/samba4-devel/files/patch-lib__tdb__config.mk b/net/samba4-devel/files/patch-lib__tdb__config.mk
deleted file mode 100644
index 242518f3c5cc..000000000000
--- a/net/samba4-devel/files/patch-lib__tdb__config.mk
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./lib/tdb/config.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/tdb/config.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -14,44 +14,44 @@
- 
- ################################################
- # Start BINARY tdbtool
--[BINARY::tdbtool]
-+[BINARY::tdbtool4]
- INSTALLDIR = BINDIR
- PRIVATE_DEPENDENCIES = \
- 		LIBTDB
- # End BINARY tdbtool
- ################################################
- 
--tdbtool_OBJ_FILES = $(tdbsrcdir)/tools/tdbtool.o
-+tdbtool4_OBJ_FILES = $(tdbsrcdir)/tools/tdbtool.o
- 
- ################################################
- # Start BINARY tdbtorture
--[BINARY::tdbtorture]
-+[BINARY::tdbtorture4]
- INSTALLDIR = BINDIR
- PRIVATE_DEPENDENCIES = \
- 		LIBTDB
- # End BINARY tdbtorture
- ################################################
- 
--tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
-+tdbtorture4_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
- 
- ################################################
- # Start BINARY tdbdump
--[BINARY::tdbdump]
-+[BINARY::tdbdump4]
- INSTALLDIR = BINDIR
- PRIVATE_DEPENDENCIES = \
- 		LIBTDB
- # End BINARY tdbdump
- ################################################
- 
--tdbdump_OBJ_FILES = $(tdbsrcdir)/tools/tdbdump.o
-+tdbdump4_OBJ_FILES = $(tdbsrcdir)/tools/tdbdump.o
- 
- ################################################
- # Start BINARY tdbbackup
--[BINARY::tdbbackup]
-+[BINARY::tdbbackup4]
- INSTALLDIR = BINDIR
- PRIVATE_DEPENDENCIES = \
- 		LIBTDB
- # End BINARY tdbbackup
- ################################################
- 
--tdbbackup_OBJ_FILES = $(tdbsrcdir)/tools/tdbbackup.o
-+tdbbackup4_OBJ_FILES = $(tdbsrcdir)/tools/tdbbackup.o
diff --git a/net/samba4-devel/files/patch-lib__tdb__tdb.mk b/net/samba4-devel/files/patch-lib__tdb__tdb.mk
deleted file mode 100644
index 3be5b819dff3..000000000000
--- a/net/samba4-devel/files/patch-lib__tdb__tdb.mk
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./lib/tdb/tdb.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/tdb/tdb.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -6,7 +6,7 @@
- ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
- 
- TDB_SONAME = libtdb.$(SHLIBEXT).1
--TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
-+TDB_SOLIB = libtdb.$(SHLIBEXT).1
- TDB_STLIB = libtdb.a
- 
- TDB_LIB = $(TDB_STLIB) 
-@@ -58,8 +58,6 @@
- installdirs::
- 	mkdir -p $(DESTDIR)$(bindir)
- 	mkdir -p $(DESTDIR)$(includedir)
--	mkdir -p $(DESTDIR)$(libdir) 
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
- 
- installbin:: all installdirs
- 	cp $(PROGS) $(DESTDIR)$(bindir)
-@@ -68,7 +66,7 @@
- 	cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir)
- 
- installlibs:: all installdirs
--	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp tdb.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
- 
- $(TDB_STLIB): $(TDB_OBJ)
-@@ -76,6 +74,3 @@
- 
- libtdb.$(SHLIBEXT): $(TDB_SOLIB)
- 	ln -fs $< $@
--
--$(TDB_SONAME): $(TDB_SOLIB)
--	ln -fs $< $@
diff --git a/net/samba4-devel/files/patch-lib__tevent__tevent.mk b/net/samba4-devel/files/patch-lib__tevent__tevent.mk
deleted file mode 100644
index 5c838116a029..000000000000
--- a/net/samba4-devel/files/patch-lib__tevent__tevent.mk
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./lib/tevent/tevent.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/tevent/tevent.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -1,6 +1,6 @@
- TEVENT_SOBASE = libtevent.$(SHLIBEXT)
- TEVENT_SONAME = $(TEVENT_SOBASE).0
--TEVENT_SOLIB = $(TEVENT_SOBASE).$(PACKAGE_VERSION)
-+TEVENT_SOLIB = $(TEVENT_SOBASE).0
- TEVENT_STLIB = libtevent.a
- 
- $(TEVENT_STLIB): $(TEVENT_OBJ)
-@@ -9,23 +9,20 @@
- $(TEVENT_SOBASE): $(TEVENT_SOLIB)
- 	ln -fs $< $@
- 
--$(TEVENT_SONAME): $(TEVENT_SOLIB)
--	ln -fs $< $@
--
- dirs::
- 	@mkdir -p lib
- 
- installdirs::
- 	mkdir -p $(DESTDIR)$(includedir)
--	mkdir -p $(DESTDIR)$(libdir)
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-+	mkdir -p $(DESTDIR)$(prefix)/libdata
-+	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
- 
- installheaders:: installdirs
- 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
- 	cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
- 
- installlibs:: installdirs
--	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp tevent.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
- 
- install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
diff --git a/net/samba4-devel/files/patch-lib__util__xattr.m4 b/net/samba4-devel/files/patch-lib__util__xattr.m4
index b089db9bff3c..480a2098c277 100644
--- a/net/samba4-devel/files/patch-lib__util__xattr.m4
+++ b/net/samba4-devel/files/patch-lib__util__xattr.m4
@@ -1,5 +1,5 @@
---- ./lib/util/xattr.m4.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./lib/util/xattr.m4	2009-07-12 02:39:36.000000000 +0000
+--- ./lib/util/xattr.m4.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./lib/util/xattr.m4	2010-01-24 21:49:26.000000000 +0000
 @@ -1,14 +1,30 @@
  dnl ############################################
  dnl use flistxattr as the key function for having 
diff --git a/net/samba4-devel/files/patch-librpc__ndr__libndr.h b/net/samba4-devel/files/patch-librpc__ndr__libndr.h
deleted file mode 100644
index 16db57dc1648..000000000000
--- a/net/samba4-devel/files/patch-librpc__ndr__libndr.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./librpc/ndr/libndr.h.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./librpc/ndr/libndr.h	2009-07-12 03:24:17.000000000 +0000
-@@ -419,7 +419,7 @@
- 			 struct ndr_token_list **list, 
- 			 const void *key, 
- 			 uint32_t value);
--enum ndr_err_code ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v, comparison_fn_t _cmp_fn, bool _remove_tok);
-+enum ndr_err_code ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v, int (*_cmp_fn)(const void *, const void *), bool _remove_tok);
- enum ndr_err_code ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v);
- uint32_t ndr_token_peek(struct ndr_token_list **list, const void *key);
- enum ndr_err_code ndr_pull_array_size(struct ndr_pull *ndr, const void *p);
diff --git a/net/samba4-devel/files/patch-pidl__config.mk b/net/samba4-devel/files/patch-pidl__config.mk
index 63ce6be8d2c4..d4e8288d70e1 100644
--- a/net/samba4-devel/files/patch-pidl__config.mk
+++ b/net/samba4-devel/files/patch-pidl__config.mk
@@ -1,5 +1,5 @@
---- ./pidl/config.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./pidl/config.mk	2009-07-12 02:39:36.000000000 +0000
+--- ./pidl/config.mk.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./pidl/config.mk	2010-01-24 21:49:26.000000000 +0000
 @@ -6,18 +6,6 @@
  pidl-testcov: $(pidldir)/Makefile
  	cd $(pidldir) && cover -test
diff --git a/net/samba4-devel/files/patch-source4__Makefile b/net/samba4-devel/files/patch-source4__Makefile
new file mode 100644
index 000000000000..4070cc1e452c
--- /dev/null
+++ b/net/samba4-devel/files/patch-source4__Makefile
@@ -0,0 +1,18 @@
+--- ./source4/Makefile.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/Makefile	2010-01-24 21:49:26.000000000 +0000
+@@ -13,7 +13,6 @@
+ basedir = $(prefix)
+ swatdir = $(datadir)/swat
+ setupdir = $(datadir)/setup
+-ncalrpcdir = $(localstatedir)/ncalrpc
+ shliboutputdir = $(builddir)/bin/shared
+ 
+ BNLD = $(LD)
+@@ -182,6 +181,7 @@
+ 	@echo '  swatdir:     $(swatdir)'
+ 	@echo '  mandir:      $(mandir)'
+ 	@echo '  datadir:     $(datadir)'
++	@echo '  ncalrpcdir:  $(ncalrpcdir)'
+ 	@echo '  winbindd_socket_dir:  $(winbindd_socket_dir)'
+ 	@echo '  ntp_signd_socket_dir:  $(ntp_signd_socket_dir)'
+ 
diff --git a/net/samba4-devel/files/patch-source4__build__m4__check_path.m4 b/net/samba4-devel/files/patch-source4__build__m4__check_path.m4
index 5bb53cdcbd8c..e91d3cc793ed 100644
--- a/net/samba4-devel/files/patch-source4__build__m4__check_path.m4
+++ b/net/samba4-devel/files/patch-source4__build__m4__check_path.m4
@@ -1,6 +1,14 @@
---- ./source4/build/m4/check_path.m4.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/build/m4/check_path.m4	2009-07-12 02:39:36.000000000 +0000
-@@ -41,11 +41,6 @@
+--- ./source4/build/m4/check_path.m4.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/build/m4/check_path.m4	2010-01-24 21:49:26.000000000 +0000
+@@ -19,6 +19,7 @@
+ piddir="${localstatedir}/run"
+ privatedir="\${prefix}/private"
+ modulesdir="\${prefix}/modules"
++ncalrpcdir ="\${localstatedir}/ncalrpc"
+ winbindd_socket_dir="${localstatedir}/run/winbindd"
+ winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged"
+ ntp_signd_socket_dir="${localstatedir}/run/ntp_signd"
+@@ -41,11 +42,6 @@
      ntp_signd_socket_dir="${localstatedir}/run/samba/ntp_signd"
      winbindd_socket_dir="${localstatedir}/run/samba/winbindd"
      winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged"
@@ -12,3 +20,34 @@
  fi
  
  #################################################
+@@ -81,6 +77,22 @@
+   esac])
+ 
+ #################################################
++# set where the ncalrpc sockets should be put
++AC_ARG_WITH(ncalrpcdir,
++[AS_HELP_STRING([--with-ncalrpcdir=DIR],[Where to put the ncalrpc sockets ($ncalrpcdir)])],
++[ case "$withval" in
++  yes|no)
++  #
++  # Just in case anybody calls it without argument
++  #
++    AC_MSG_WARN([--with-ncalrpcdir called without argument - will use default])
++  ;;
++  * )
++    ncalrpcdir="$withval"
++    ;;
++  esac])
++
++#################################################
+ # set where the winbindd socket should be put
+ AC_ARG_WITH(winbindd-socket-dir,
+ [AS_HELP_STRING([--with-winbindd-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_socket_dir)])],
+@@ -187,6 +199,7 @@
+ AC_SUBST(winbindd_privileged_socket_dir)
+ AC_SUBST(ntp_signd_socket_dir)
+ AC_SUBST(modulesdir)
++AC_SUBST(ncalrpcdir)
+ 
+ #################################################
+ # set prefix for 'make test'
diff --git a/net/samba4-devel/files/patch-source4__build__smb_build__output.pm b/net/samba4-devel/files/patch-source4__build__smb_build__output.pm
index fe55156914bb..03fbf1508ca5 100644
--- a/net/samba4-devel/files/patch-source4__build__smb_build__output.pm
+++ b/net/samba4-devel/files/patch-source4__build__smb_build__output.pm
@@ -1,5 +1,5 @@
---- ./source4/build/smb_build/output.pm.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/build/smb_build/output.pm	2009-07-12 02:39:36.000000000 +0000
+--- ./source4/build/smb_build/output.pm.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/build/smb_build/output.pm	2010-01-24 21:49:26.000000000 +0000
 @@ -48,7 +48,7 @@
  	$lib->{LIBRARY_DEBUGNAME} = $lib->{LIBRARY_REALNAME};
  
diff --git a/net/samba4-devel/files/patch-source4__dynconfig__config.mk b/net/samba4-devel/files/patch-source4__dynconfig__config.mk
index 250124e09e83..2cf5d8c73664 100644
--- a/net/samba4-devel/files/patch-source4__dynconfig__config.mk
+++ b/net/samba4-devel/files/patch-source4__dynconfig__config.mk
@@ -1,10 +1,12 @@
---- ./source4/dynconfig/config.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/dynconfig/config.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -6,7 +6,7 @@
+--- ./source4/dynconfig/config.mk.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/dynconfig/config.mk	2010-01-24 02:32:34.000000000 +0000
+@@ -5,8 +5,8 @@
+ # set these to where to find various files
  # These can be overridden by command line switches (see samba(8))
  # or in smb.conf (see smb.conf(5))
- CONFIG4FILE = $(sysconfdir)/smb.conf
+-CONFIG4FILE = $(sysconfdir)/smb.conf
 -pkgconfigdir = $(libdir)/pkgconfig
++CONFIG4FILE = $(sysconfdir)/%%SAMBA_CONFIG%%
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  LMHOSTSFILE4 = $(sysconfdir)/lmhosts
  
diff --git a/net/samba4-devel/files/patch-source4__heimdal_build__internal.m4 b/net/samba4-devel/files/patch-source4__heimdal_build__internal.m4
index 57415ebea896..13c8471e89cb 100644
--- a/net/samba4-devel/files/patch-source4__heimdal_build__internal.m4
+++ b/net/samba4-devel/files/patch-source4__heimdal_build__internal.m4
@@ -1,6 +1,6 @@
---- ./source4/heimdal_build/internal.m4.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/heimdal_build/internal.m4	2009-07-12 02:39:36.000000000 +0000
-@@ -68,8 +68,7 @@
+--- ./source4/heimdal_build/internal.m4.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/heimdal_build/internal.m4	2010-01-24 21:49:26.000000000 +0000
+@@ -77,8 +77,7 @@
  	ttyname.h				\
  	netinet/in.h				\
  	netinet/in6.h				\
@@ -10,7 +10,7 @@
  ])
  
  AC_CHECK_FUNCS([				\
-@@ -171,12 +170,6 @@
+@@ -180,12 +179,6 @@
  
  SMB_EXT_LIB(OPENPTY,[${OPENPTY_LIBS}],[${OPENPTY_CFLAGS}],[${OPENPTY_CPPFLAGS}],[${OPENPTY_LDFLAGS}])
  
diff --git a/net/samba4-devel/files/patch-source4__heimdal_build__roken.h b/net/samba4-devel/files/patch-source4__heimdal_build__roken.h
index 58204b6f80e9..610aea181174 100644
--- a/net/samba4-devel/files/patch-source4__heimdal_build__roken.h
+++ b/net/samba4-devel/files/patch-source4__heimdal_build__roken.h
@@ -1,6 +1,6 @@
---- ./source4/heimdal_build/roken.h.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/heimdal_build/roken.h	2009-07-12 02:39:36.000000000 +0000
-@@ -41,6 +41,10 @@
+--- ./source4/heimdal_build/roken.h.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/heimdal_build/roken.h	2010-01-24 21:49:26.000000000 +0000
+@@ -49,6 +49,10 @@
  #define HAVE_STRNDUP
  #endif
  
diff --git a/net/samba4-devel/files/patch-source4__lib__tls__config.m4 b/net/samba4-devel/files/patch-source4__lib__tls__config.m4
deleted file mode 100644
index 2b15c432c770..000000000000
--- a/net/samba4-devel/files/patch-source4__lib__tls__config.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./source4/lib/tls/config.m4.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/lib/tls/config.m4	2009-07-12 02:39:36.000000000 +0000
-@@ -10,8 +10,8 @@
-     fi])
- 
- 
--if test x$use_gnutls = xauto && pkg-config --exists gnutls; then
--	SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls < 2.6.0, 
-+if test x$use_gnutls = xauto && $PKG_CONFIG --exists gnutls; then
-+	SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls, 
- 							   [use_gnutls=yes], 
- 							   [use_gnutls=no])
- fi
diff --git a/net/samba4-devel/files/patch-source4__script__installmisc.sh b/net/samba4-devel/files/patch-source4__script__installmisc.sh
index d38a05d64bc7..ed6b527f2e65 100644
--- a/net/samba4-devel/files/patch-source4__script__installmisc.sh
+++ b/net/samba4-devel/files/patch-source4__script__installmisc.sh
@@ -1,20 +1,15 @@
---- ./source4/script/installmisc.sh.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/script/installmisc.sh	2009-07-12 02:39:36.000000000 +0000
-@@ -8,11 +8,14 @@
- 
- echo "Installing setup templates"
- mkdir -p $SETUPDIR || exit 1
-+for p in enableaccount newuser provision provision-backend setexpiry setpassword upgrade
-+do
-+	chmod 0555 setup/$p
-+	cp setup/$p $SETUPDIR || exit 1
-+done
-+cp -R setup/ad-schema $SETUPDIR || exit 1
- cp setup/schema-map-* $SETUPDIR || exit 1
- cp setup/DB_CONFIG $SETUPDIR || exit 1
--cp setup/provision-backend $SETUPDIR || exit 1
--cp setup/provision $SETUPDIR || exit 1
--cp setup/newuser $SETUPDIR || exit 1
- cp setup/*.inf $SETUPDIR || exit 1
- cp setup/*.ldif $SETUPDIR || exit 1
- cp setup/*.reg $SETUPDIR || exit 1
+--- ./source4/script/installmisc.sh.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/script/installmisc.sh	2010-01-24 21:49:26.000000000 +0000
+@@ -29,10 +29,10 @@
+     if egrep 'sys.path.insert.*bin/python' $f > /dev/null; then
+         if [ "$PYTHON_PATH_NEEDS_FIXING" = "yes" ]; then
+             # old systems don't have sed -i :-(
+-            sed "s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" < $f > $f.$$ || exit 1
++            sed "1,1 s|#!.*python.*|#!$PYTHON|; s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" < $f > $f.$$ || exit 1
+         else
+             # old systems don't have sed -i :-(
+-            sed "s|\(sys.path.insert.*\)bin/python\(.*\)$||g" < $f > $f.$$ || exit 1
++            sed "1,1 s|#!.*python.*|#!$PYTHON|; s|\(sys.path.insert.*\)bin/python\(.*\)$||g" < $f > $f.$$ || exit 1
+         fi
+         mv -f $f.$$ $f || exit 1
+         chmod +x $f
diff --git a/net/samba4-devel/files/patch-source4__scripting__python__samba__provision.py b/net/samba4-devel/files/patch-source4__scripting__python__samba__provision.py
index 8cec1b5b714e..687ccaae98c7 100644
--- a/net/samba4-devel/files/patch-source4__scripting__python__samba__provision.py
+++ b/net/samba4-devel/files/patch-source4__scripting__python__samba__provision.py
@@ -1,6 +1,6 @@
---- ./source4/scripting/python/samba/provision.py.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/scripting/python/samba/provision.py	2009-07-12 02:39:36.000000000 +0000
-@@ -54,7 +54,7 @@
+--- ./source4/scripting/python/samba/provision.py.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/scripting/python/samba/provision.py	2010-01-24 21:49:26.000000000 +0000
+@@ -64,7 +64,7 @@
      dirname = os.path.dirname(__file__)
      if "/site-packages/" in dirname:
          prefix = "/".join(dirname[:dirname.index("/site-packages/")].split("/")[:-2])
diff --git a/net/samba4-devel/files/patch-source4__smbd__config.mk b/net/samba4-devel/files/patch-source4__smbd__config.mk
index efe36fe4f132..b47255eadb3b 100644
--- a/net/samba4-devel/files/patch-source4__smbd__config.mk
+++ b/net/samba4-devel/files/patch-source4__smbd__config.mk
@@ -1,6 +1,6 @@
---- ./source4/smbd/config.mk.orig	2009-06-19 04:36:48.000000000 +0000
-+++ ./source4/smbd/config.mk	2009-07-12 02:39:36.000000000 +0000
-@@ -18,7 +18,7 @@
+--- ./source4/smbd/config.mk.orig	2010-01-11 05:35:28.000000000 +0000
++++ ./source4/smbd/config.mk	2010-01-24 21:49:26.000000000 +0000
+@@ -20,7 +20,7 @@
  
  $(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)))
  
@@ -9,7 +9,7 @@
  INSTALLDIR = SBINDIR
  PRIVATE_DEPENDENCIES = \
  		LIBEVENTS \
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
  		share \
  		CLUSTER
  
diff --git a/net/samba4-devel/files/pkg-message.in b/net/samba4-devel/files/pkg-message.in
index 161ad9f3f245..ab8352e14c75 100644
--- a/net/samba4-devel/files/pkg-message.in
+++ b/net/samba4-devel/files/pkg-message.in
@@ -1,14 +1,14 @@
 ===============================================================================
 
 This port is *HIGHLY* experimental, lacks documentation and, in general,
-unsupported. It solely purpose is to give you a grasp of upcoming Samba4
+unsupported. Its solely purpose is to give you a grasp of upcoming Samba4
 and try it.
 
 This *IS NOT* production ready code. Use at your own risk.
 
 How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
 
-Provisioning script: %%DATADIR%%/setup/provision
+Provisioning script: %%PREFIX%%/sbin/provision
 
 For additional documentation check: http://wiki.samba.org/index.php/Samba4
 
diff --git a/net/samba4-devel/pkg-plist b/net/samba4-devel/pkg-plist
index 05034c3f9b1a..d1c9cb027c4c 100644
--- a/net/samba4-devel/pkg-plist
+++ b/net/samba4-devel/pkg-plist
@@ -1,38 +1,31 @@
-bin/autoidl
-bin/cifsdd
-bin/epdump
-bin/gentest
-bin/getntacl
-bin/ldbadd
-bin/ldbdel
-bin/ldbedit
-bin/ldbmodify
-bin/ldbrename
-bin/ldbsearch
-bin/locktest
-bin/masktest
-bin/ndrdump
-bin/net
-bin/nmblookup
-bin/ntlm_auth
-bin/oLschema2ldif
-bin/regdiff
-bin/regpatch
-bin/regshell
-bin/regtree
-bin/rpcclient
-bin/samba3dump
-bin/setnttoken
-bin/smbclient
-bin/smbstatus
-bin/smbtorture
-bin/testparm
-bin/wbinfo
-%%TDB%%bin/tdbbackup4
-%%TDB%%bin/tdbdump4
-%%TDB%%bin/tdbtool4
-%%TDB%%bin/tdbtorture4
+%%UTILS%%bin/cifsdd
+%%UTILS%%bin/gentest
+%%UTILS%%bin/getntacl
+%%UTILS%%bin/ldbadd
+%%UTILS%%bin/ldbdel
+%%UTILS%%bin/ldbedit
+%%UTILS%%bin/ldbmodify
+%%UTILS%%bin/ldbrename
+%%UTILS%%bin/ldbsearch
+%%UTILS%%bin/locktest
+%%UTILS%%bin/masktest
+%%UTILS%%bin/ndrdump
+%%UTILS%%bin/net
+%%UTILS%%bin/nmblookup
+%%UTILS%%bin/ntlm_auth
+%%UTILS%%bin/oLschema2ldif
+%%UTILS%%bin/regdiff
+%%UTILS%%bin/regpatch
+%%UTILS%%bin/regshell
+%%UTILS%%bin/regtree
+%%UTILS%%bin/setnttoken
+%%UTILS%%bin/smbclient
+%%UTILS%%bin/smbtorture
+%%UTILS%%bin/testparm
+%%UTILS%%bin/wbinfo
+sbin/provision
 sbin/samba4
+sbin/upgradeprovision
 include/samba4/charset.h
 include/samba4/core/doserr.h
 include/samba4/core/error.h
@@ -101,7 +94,6 @@ include/samba4/util/talloc_stack.h
 include/samba4/util/time.h
 include/samba4/util/xfile.h
 include/samba4/util_ldb.h
-%%TDB%%%%PYTHON_SITELIBDIR%%/tdb.so
 %%PYTHON_SITELIBDIR%%/ldb.so
 %%PYTHON_SITELIBDIR%%/samba/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/auth.so
@@ -126,20 +118,32 @@ include/samba4/util_ldb.h
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
+%%PYTHON_SITELIBDIR%%/samba/gensec.so
 %%PYTHON_SITELIBDIR%%/samba/getopt.py
 %%PYTHON_SITELIBDIR%%/samba/glue.so
 %%PYTHON_SITELIBDIR%%/samba/hostconfig.py
 %%PYTHON_SITELIBDIR%%/samba/idmap.py
 %%PYTHON_SITELIBDIR%%/samba/messaging.so
+%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
 %%PYTHON_SITELIBDIR%%/samba/ms_schema.py
 %%PYTHON_SITELIBDIR%%/samba/ndr.py
 %%PYTHON_SITELIBDIR%%/samba/net.so
 %%PYTHON_SITELIBDIR%%/samba/netbios.so
+%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/domainlevel.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/enableaccount.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/newuser.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/pwsettings.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/setexpiry.py
+%%PYTHON_SITELIBDIR%%/samba/netcmd/setpassword.py
 %%PYTHON_SITELIBDIR%%/samba/param.so
 %%PYTHON_SITELIBDIR%%/samba/provision.py
+%%PYTHON_SITELIBDIR%%/samba/provisionbackend.py
+%%PYTHON_SITELIBDIR%%/samba/provisionexceptions.py
 %%PYTHON_SITELIBDIR%%/samba/registry.so
 %%PYTHON_SITELIBDIR%%/samba/samba3.py
 %%PYTHON_SITELIBDIR%%/samba/samdb.py
+%%PYTHON_SITELIBDIR%%/samba/schema.py
 %%PYTHON_SITELIBDIR%%/samba/shares.py
 %%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
@@ -149,9 +153,11 @@ include/samba4/util_ldb.h
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
 %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
+%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
 %%PYTHON_SITELIBDIR%%/samba/tests/provision.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samba3.py
 %%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
+%%PYTHON_SITELIBDIR%%/samba/tests/shares.py
 %%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
 %%PYTHON_SITELIBDIR%%/samba/torture/spoolss.py
 %%PYTHON_SITELIBDIR%%/samba/torture/torture_samr.py
@@ -177,6 +183,8 @@ lib/samba4/libldb.so
 lib/samba4/libldb.so.0
 lib/samba4/libndr.so
 lib/samba4/libndr.so.0
+lib/samba4/libndr_standard.so
+lib/samba4/libndr_standard.so.0
 lib/samba4/libregistry.so
 lib/samba4/libregistry.so.0
 lib/samba4/libsamba-hostconfig.so
@@ -191,21 +199,35 @@ libdata/pkgconfig/dcerpc_samr.pc
 libdata/pkgconfig/gensec.pc
 libdata/pkgconfig/ldb.pc
 libdata/pkgconfig/ndr.pc
+libdata/pkgconfig/ndr_standard.pc
 libdata/pkgconfig/registry.pc
 libdata/pkgconfig/samba-hostconfig.pc
 libdata/pkgconfig/torture.pc
+%%DATADIR%%/setup/DB_CONFIG
 %%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
 %%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
+%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
+%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
 %%DATADIR%%/setup/ad-schema/licence.txt
-%%DATADIR%%/setup/DB_CONFIG
 %%DATADIR%%/setup/aggregate_schema.ldif
 %%DATADIR%%/setup/cn=replicator.ldif
 %%DATADIR%%/setup/cn=samba-admin.ldif
 %%DATADIR%%/setup/cn=samba.ldif
-%%DATADIR%%/setup/display_specifiers.ldif
-%%DATADIR%%/setup/enableaccount
+%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
+%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
+%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
+%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
+%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 %%DATADIR%%/setup/fedora-ds-init.ldif
+%%DATADIR%%/setup/fedorads-dna.ldif
+%%DATADIR%%/setup/fedorads-index.ldif
+%%DATADIR%%/setup/fedorads-linked-attributes.ldif
+%%DATADIR%%/setup/fedorads-pam.ldif
 %%DATADIR%%/setup/fedorads-partitions.ldif
+%%DATADIR%%/setup/fedorads-refint-add.ldif
+%%DATADIR%%/setup/fedorads-refint-delete.ldif
+%%DATADIR%%/setup/fedorads-samba.ldif
+%%DATADIR%%/setup/fedorads-sasl.ldif
 %%DATADIR%%/setup/fedorads.inf
 %%DATADIR%%/setup/idmap_init.ldif
 %%DATADIR%%/setup/krb5.conf
@@ -215,18 +237,13 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/modules.conf
 %%DATADIR%%/setup/named.conf
 %%DATADIR%%/setup/named.txt
-%%DATADIR%%/setup/newuser
-%%DATADIR%%/setup/olc_acl.conf
 %%DATADIR%%/setup/olc_mmr.conf
-%%DATADIR%%/setup/olc_pass.conf
 %%DATADIR%%/setup/olc_seed.ldif
 %%DATADIR%%/setup/olc_serverid.conf
 %%DATADIR%%/setup/olc_syncrepl.conf
 %%DATADIR%%/setup/olc_syncrepl_seed.conf
 %%DATADIR%%/setup/phpldapadmin-config.php
 %%DATADIR%%/setup/prefixMap.txt
-%%DATADIR%%/setup/provision
-%%DATADIR%%/setup/provision-backend
 %%DATADIR%%/setup/provision.ldif
 %%DATADIR%%/setup/provision.reg
 %%DATADIR%%/setup/provision.smb.conf.dc
@@ -235,21 +252,22 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/provision.zone
 %%DATADIR%%/setup/provision_basedn.ldif
 %%DATADIR%%/setup/provision_basedn_modify.ldif
+%%DATADIR%%/setup/provision_basedn_references.ldif
 %%DATADIR%%/setup/provision_computers_add.ldif
 %%DATADIR%%/setup/provision_computers_modify.ldif
 %%DATADIR%%/setup/provision_configuration.ldif
 %%DATADIR%%/setup/provision_configuration_basedn.ldif
-%%DATADIR%%/setup/provision_configuration_basedn_modify.ldif
+%%DATADIR%%/setup/provision_configuration_references.ldif
 %%DATADIR%%/setup/provision_group_policy.ldif
 %%DATADIR%%/setup/provision_init.ldif
 %%DATADIR%%/setup/provision_partitions.ldif
+%%DATADIR%%/setup/provision_privilege.ldif
 %%DATADIR%%/setup/provision_rootdse_add.ldif
 %%DATADIR%%/setup/provision_rootdse_modify.ldif
 %%DATADIR%%/setup/provision_schema_basedn.ldif
 %%DATADIR%%/setup/provision_schema_basedn_modify.ldif
 %%DATADIR%%/setup/provision_self_join.ldif
-%%DATADIR%%/setup/provision_templates.ldif
-%%DATADIR%%/setup/provision_templates_init.ldif
+%%DATADIR%%/setup/provision_self_join_modify.ldif
 %%DATADIR%%/setup/provision_users.ldif
 %%DATADIR%%/setup/provision_users_add.ldif
 %%DATADIR%%/setup/provision_users_modify.ldif
@@ -258,28 +276,30 @@ libdata/pkgconfig/torture.pc
 %%DATADIR%%/setup/schema-map-openldap-2.3
 %%DATADIR%%/setup/schema_samba4.ldif
 %%DATADIR%%/setup/secrets.ldif
-%%DATADIR%%/setup/secrets_dc.ldif
+%%DATADIR%%/setup/secrets_dns.ldif
 %%DATADIR%%/setup/secrets_init.ldif
 %%DATADIR%%/setup/secrets_sasl_ldap.ldif
+%%DATADIR%%/setup/secrets_self_join.ldif
 %%DATADIR%%/setup/secrets_simple_ldap.ldif
-%%DATADIR%%/setup/setexpiry
-%%DATADIR%%/setup/setpassword
 %%DATADIR%%/setup/share.ldif
 %%DATADIR%%/setup/slapd.conf
-%%DATADIR%%/setup/upgrade
 %%DATADIR%%/lowcase.dat
 %%DATADIR%%/upcase.dat
 %%DATADIR%%/valid.dat
+@dirrm %%DATADIR%%/setup/display-specifiers
 @dirrm %%DATADIR%%/setup/ad-schema
 @dirrm %%DATADIR%%/setup
 @dirrm %%DATADIR%%
+@dirrm lib/samba4/modules/ldb
 @dirrm lib/samba4/modules
 @dirrm lib/samba4
+@unexec find %D/%%PYTHON_SITELIBDIR%%/subunit %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[oc]' -print0 | xargs -0 rm -f
 @dirrm %%PYTHON_SITELIBDIR%%/subunit/tests
 @dirrm %%PYTHON_SITELIBDIR%%/subunit
 @dirrm %%PYTHON_SITELIBDIR%%/samba/torture
 @dirrm %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
 @dirrm %%PYTHON_SITELIBDIR%%/samba/tests
+@dirrm %%PYTHON_SITELIBDIR%%/samba/netcmd
 @dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
 @dirrm %%PYTHON_SITELIBDIR%%/samba
 @dirrmtry %%PYTHON_SITELIBDIR%%