11 files changed, 55 insertions, 583 deletions

diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index fe2ce34211a0..4caf4ea030c1 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -16,9 +16,11 @@ LICENSE=		GPLv3
 
 CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.*
 
+SAMBA4_PORT=		${PORTNAME}
+
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.1.6
+SAMBA4_VERSION=		4.1.7
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -63,7 +65,7 @@ CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 
 USE_PYTHON=		2
-USES=			compiler perl5 pkgconfig iconv
+USES=			shebangfix compiler perl5 pkgconfig iconv readline
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 WAF_TOOL=		buildtools/bin/waf
@@ -90,8 +92,8 @@ LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
 # IDL compiler
 BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
 # talloc
-BUILD_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
-RUN_DEPENDS+=		talloc>=2.0.8:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.0:${PORTSDIR}/devel/talloc
+RUN_DEPENDS+=		talloc>=2.1.0:${PORTSDIR}/devel/talloc
 SAMBA4_BUNDLED_LIBS+=	!talloc
 # tevent
 BUILD_DEPENDS+=		tevent>=0.9.18:${PORTSDIR}/devel/tevent
@@ -101,6 +103,10 @@ SAMBA4_BUNDLED_LIBS+=	!tevent
 BUILD_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
 RUN_DEPENDS+=		tdb>=1.2.11:${PORTSDIR}/databases/tdb
 SAMBA4_BUNDLED_LIBS+=	!tdb
+# ntdb
+BUILD_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
+RUN_DEPENDS+=		ntdb>=1.0:${PORTSDIR}/databases/ntdb
+SAMBA4_BUNDLED_LIBS+=	!ntdb
 # ldb
 BUILD_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
 RUN_DEPENDS+=		ldb>=1.1.15:${PORTSDIR}/databases/ldb
@@ -324,6 +330,7 @@ CONFIGURE_ARGS+=	--without-ads
 
 .if defined(SAMBA4_WANT_LDAP)
 USE_OPENLDAP=		yes
+WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
 .else
@@ -373,7 +380,11 @@ SUB_LIST+=		${SAMBA4_SUB}
 
 USE_RC_SUBR=		samba_server
 SUB_FILES=		pkg-message README.FreeBSD
-
+# Make sure that the right version of Python is used by the tools
+# https://bugzilla.samba.org/show_bug.cgi?id=7305
+python_CMD=		${PYTHON_CMD}
+python_OLD_CMD=		${SETENV} python
+SHEBANG_FILES=		${PATCH_WRKSRC}/source4/scripting/bin/*
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
@@ -395,8 +406,6 @@ SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
 			smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \
 			testparm.1 vfstest.1 wbinfo.1
 
-SAMBA_MAN3+=		ntdb.3
-
 SAMBA_MAN5+=		lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \
 			smb.conf.5
 
@@ -418,14 +427,13 @@ SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
 			vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
 			vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
 			vfs_tsmsm.8 vfs_xattr_tdb.8 winbindd.8 \
-			vfs_linux_xfs_sgid.8 vfs_btrfs.8 \
-			ntdbbackup.8 ntdbdump.8 ntdbrestore.8 ntdbtool.8
+			vfs_linux_xfs_sgid.8 vfs_btrfs.8
 
 PORTDOCS=		README.FreeBSD
 
+CONFIGURE_TARGET=	configure
 ALL_TARGET=		build
 INSTALL_TARGET=		install
-CONFIGURE_TARGET=	configure
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
@@ -442,11 +450,6 @@ post-patch:
 				${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
 			@${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \
 				${PATCH_WRKSRC}/dynconfig/wscript
-# 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
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
@@ -474,6 +477,13 @@ do-configure:
 						${FALSE}; \
 				fi)
 
+# XXX: Gross hack to allow build newer Samba while old one is installed.
+# This implies that LINKFLAGS_PYEMBED contains flags which are already
+# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
+post-configure:
+	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
+		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
+
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 .	for man in	libcli/nbt/man/nmblookup4.1 \
@@ -487,17 +497,12 @@ pre-build:
 			source4/torture/man/masktest.1 \
 			source4/torture/man/smbtorture.1 \
 			source4/utils/man/ntlm_auth4.1 \
-			source4/utils/man/oLschema2ldif.1 \
-			lib/ntdb/man/ntdb.3 \
-			lib/ntdb/man/ntdbbackup.8 \
-			lib/ntdb/man/ntdbdump.8 \
-			lib/ntdb/man/ntdbrestore.8 \
-			lib/ntdb/man/ntdbtool.8
+			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 ${SAMBA_MAN1} ${SAMBA_MAN3} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
+.	for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
 			-@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	endfor
 .endif
@@ -516,12 +521,12 @@ do-install:
 			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
 
 post-install:
-			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
 			@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for doc in ${PORTDOCS}
 			@${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .	endfor
+			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .endif
 # Run post-install script
 .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${STAGEDIR}${SAMBA4_MODULEDIR} ${SAMBA4_PRIVATEDIR}
diff --git a/net/samba41/distinfo b/net/samba41/distinfo
index 7b8a1829a7b1..ac2ffec13cb4 100644
--- a/net/samba41/distinfo
+++ b/net/samba41/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.1.6.tar.gz) = 6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b
-SIZE (samba-4.1.6.tar.gz) = 23177462
+SHA256 (samba-4.1.7.tar.gz) = 15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89
+SIZE (samba-4.1.7.tar.gz) = 23187644
diff --git a/net/samba41/files/README.FreeBSD.in b/net/samba41/files/README.FreeBSD.in
index b97ed8e37fd6..b40faa7ceed2 100644
--- a/net/samba41/files/README.FreeBSD.in
+++ b/net/samba41/files/README.FreeBSD.in
@@ -68,12 +68,12 @@ option would be to start from scratch.
 %%NSUPDATE%%
 %%NSUPDATE%%      nsupdate command = %%PREFIX%%/bin/samba-nsupdate -g
 %%NSUPDATE%%
-2. Put string 'samba4_enable="YES"' into your /etc/rc.conf.
+2. Put string 'samba_server_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.
+4. Run '%%PREFIX%%/etc/rc.d/samba_server 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.
diff --git a/net/samba41/files/man/ntdb.3 b/net/samba41/files/man/ntdb.3
deleted file mode 100644
index f6ef6d81c860..000000000000
--- a/net/samba41/files/man/ntdb.3
+++ /dev/null
@@ -1,115 +0,0 @@
-'\" t
-.\"     Title: ntdb
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.1
-.\"  Language: English
-.\"
-.TH "NTDB" "3" "10/15/2013" "Samba 4\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * 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"
-ntdb \- A not\-so trivial keyword/data database system
-.SH "SYNOPSIS"
-.sp
-.nf
-#include <ntdb\&.h>
-.fi
-.SH "DESCRIPTION"
-.PP
-If you have previously used the tdb library from Samba, much of this will seem familiar, but there are some API changes which a compiler will warn you about if you simply replace \*(Aqtdb\*(Aq with \*(Aqntdb\*(Aq in your code! The on\-disk format for ntdb is incompatible with tdb\&.
-.PP
-tdb\*(Aqs API was based on gdbm, and ntdb continues this tradition, with enhancements\&. A differences guide is available in the text file
-lib/ntdb/doc/TDB_porting\&.txt
-in the SAMBA source tree\&.
-.SH "NTDB API OVERVIEW"
-.PP
-The complete API is documented in the ntdb\&.h header, which is kept up\-to\-date and recommended reading\&.
-.PP
-Normal usage is to call ntdb_open() to create or open an ntdb file\&. ntdb_store() is used to add records, ntdb_fetch() is used to fetch them\&. Traversals are supported via callback (ntdb_traverse()) or iteration (ntdb_firstkey() and ntdb_nextkey())\&. Transactions are supported for batching updates or reads atomically, using ntdb_transaction_start() and ntdb_transaction_commit()\&.
-.SS "Use With Talloc"
-.PP
-ntdb_open() takes an optional linked list of attributes: in particular you can specify an alternate allocator (such as talloc):
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-#include <talloc\&.h>
-#include <ntdb\&.h>
-
-static void *my_alloc(const void *owner, size_t len, void *priv)
-{
-    return talloc_size(owner, len);
-}
-
-static void *my_expand(void *old, size_t newlen, void *priv)
-{
-    return talloc_realloc_size(NULL, old, newlen);
-}
-
-static void my_free(void *old, void *priv)
-{
-    talloc_free(old);
-}
-
-/* This opens an ntdb file as a talloc object with given parent\&. */
-struct ntdb_context *ntdb_open_talloc(const void *parent,
-                                      const char *filename)
-{
-     struct ntdb_context *ntdb;
-     union ntdb_attribute alloc;
-
-     alloc\&.base\&.attr = NTDB_ATTRIBUTE_ALLOCATOR;
-     alloc\&.base\&.next = NULL;
-     alloc\&.alloc\&.alloc = my_alloc;
-     alloc\&.alloc\&.expand = my_expand;
-     alloc\&.alloc\&.free = my_free;
-
-     ntdb = ntdb_open(filename, NTDB_DEFAULT, O_RDWR|O_CREAT, 0600,
-                      &alloc);
-     if (ntdb) {
-         talloc_steal(parent, ntdb);
-         talloc_set_name(ntdb, "%s", filename);
-     }
-     return ntdb;
-}
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\m[blue]\fB\%http://tdb.samba.org/\fR\m[]
-.SH "AUTHOR"
-.PP
-The original tdb software was created by Andrew Tridgell, and is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. ntdb was derived from tdb, but mostly rewritten by Rusty Russell\&.
-.SH "COPYRIGHT/LICENSE"
-.PP
-Copyright (C) Rusty Russell 2013, IBM Corporation
-.PP
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&.
-.PP
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License for more details\&.
-.PP
-You should have received a copy of the GNU General Public License along with this program; if not, see http://www\&.gnu\&.org/licenses/\&.
diff --git a/net/samba41/files/man/ntdbbackup.8 b/net/samba41/files/man/ntdbbackup.8
deleted file mode 100644
index feb3143622b3..000000000000
--- a/net/samba41/files/man/ntdbbackup.8
+++ /dev/null
@@ -1,133 +0,0 @@
-'\" t
-.\"     Title: ntdbbackup
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.1
-.\"  Language: English
-.\"
-.TH "NTDBBACKUP" "8" "10/15/2013" "Samba 4\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * 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"
-ntdbbackup \- tool for backing up and for validating the integrity of samba \&.ntdb files
-.SH "SYNOPSIS"
-.HP \w'\fBntdbbackup\fR\ 'u
-\fBntdbbackup\fR [\-s\ suffix] [\-v] [\-h]
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBntdbbackup\fR
-is a tool that may be used to backup samba \&.ntdb files\&. This tool may also be used to verify the integrity of the \&.ntdb files prior to samba startup or during normal operation\&. If it finds file damage and it finds a prior backup the backup file will be restored\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Get help information\&.
-.RE
-.PP
-\-s suffix
-.RS 4
-The
-\fB\-s\fR
-option allows the administrator to specify a file backup extension\&. This way it is possible to keep a history of ntdb backup files by using a new suffix for each backup\&.
-.RE
-.PP
-\-v
-.RS 4
-The
-\fB\-v\fR
-will check the database for damages (corrupt data) which if detected causes the backup to be restored\&.
-.RE
-.SH "COMMANDS"
-.PP
-\fIGENERAL INFORMATION\fR
-.PP
-The
-\fBntdbbackup\fR
-utility can safely be run at any time\&. It was designed so that it can be used at any time to validate the integrity of ntdb files, even during Samba operation\&. Typical usage for the command will be:
-.PP
-ntdbbackup [\-s suffix] *\&.ntdb
-.PP
-Before restarting samba the following command may be run to validate \&.ntdb files:
-.PP
-ntdbbackup \-v [\-s suffix] *\&.ntdb
-.PP
-Note that Samba 4 can use \&.tdb files instead, so you should use
-\fBtdbbackup\fR
-on those files\&.
-.PP
-Samba \&.tdb and \&.ntdb files are stored in various locations, be sure to run backup all \&.(n)tdb files on the system\&. Important files includes:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBsecrets\&.(n)tdb\fR
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fBpassdb\&.(n)tdb\fR
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-\fB*\&.tdb\fR
-and
-\fB*\&.ntdb\fR
-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
-.RE
-.SH "VERSION"
-.PP
-This man page is correct for version 4 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-tdbbackup(8), ntdbrestore(8)
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The ntdbbackup man page was written by Rusty Russell, based on the tdbbackup man page by John H Terpstra\&.
diff --git a/net/samba41/files/man/ntdbdump.8 b/net/samba41/files/man/ntdbdump.8
deleted file mode 100644
index a0557d51f047..000000000000
--- a/net/samba41/files/man/ntdbdump.8
+++ /dev/null
@@ -1,68 +0,0 @@
-'\" t
-.\"     Title: ntdbdump
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.1
-.\"  Language: English
-.\"
-.TH "NTDBDUMP" "8" "10/15/2013" "Samba 4\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * 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"
-ntdbdump \- tool for printing the contents of an NTDB file
-.SH "SYNOPSIS"
-.HP \w'\fBntdbdump\fR\ 'u
-\fBntdbdump\fR [\-k\ \fIkeyname\fR] [\-e] [\-h] {filename}
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBntdbdump\fR
-is a very simple utility that \*(Aqdumps\*(Aq the contents of a NTDB (New Trivial DataBase) file to standard output in a human\-readable format\&.
-.PP
-This tool can be used when debugging problems with NTDB files\&. It is intended for those who are somewhat familiar with Samba internals\&.
-.SH "OPTIONS"
-.PP
-\-h
-.RS 4
-Get help information\&.
-.RE
-.PP
-\-k \fIkeyname\fR
-.RS 4
-The
-\fB\-k\fR
-option restricts dumping to a single key, if found\&.
-.RE
-.SH "SEE ALSO"
-.PP
-tdbdump(8), ntdbtool(8)
-.SH "VERSION"
-.PP
-This man page is correct for version 4 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
-.PP
-The ntdbdump man page was written by Rusty Russell, base on the tdbdump man page by Jelmer Vernooij\&.
diff --git a/net/samba41/files/man/ntdbrestore.8 b/net/samba41/files/man/ntdbrestore.8
deleted file mode 100644
index 7b48f38afcf8..000000000000
--- a/net/samba41/files/man/ntdbrestore.8
+++ /dev/null
@@ -1,57 +0,0 @@
-'\" t
-.\"     Title: ntdbrestore
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.1
-.\"  Language: English
-.\"
-.TH "NTDBRESTORE" "8" "10/15/2013" "Samba 4\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * 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"
-ntdbrestore \- tool for creating a NTDB file out of a ntdbdump output
-.SH "SYNOPSIS"
-.HP \w'\fBntdbrestore\fR\ 'u
-\fBntdbrestore\fR {ntdbfilename}
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBntdbrestore\fR
-is a very simple utility that \*(Aqrestores\*(Aq the contents of dump file into NTDB (New Trivial DataBase) file\&. The dump file is obtained from the ntdbdump or tdbdump commands\&.
-.PP
-This tool wait on the standard input for the content of the dump and will write the ntdb in the ntdbfilename parameter\&.
-.PP
-This tool can be used to translate between ntdb and tdb files by dumping and restoring\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 4 of the Samba suite\&.
-.SH "SEE ALSO"
-.PP
-ntdbdump(8), tdbrestore(8)
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. ntdbrestore was written by Rusty Russell based on tdbrestore, which was initially written by Volker Lendecke based on an idea by Simon McVittie\&.
-.PP
-The ntdbrestore man page was written by Rusty Russell, based on the tdbrestore man page by Matthieu Patou\&.
diff --git a/net/samba41/files/man/ntdbtool.8 b/net/samba41/files/man/ntdbtool.8
deleted file mode 100644
index 40a0a7c0003e..000000000000
--- a/net/samba41/files/man/ntdbtool.8
+++ /dev/null
@@ -1,167 +0,0 @@
-'\" t
-.\"     Title: ntdbtool
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/15/2013
-.\"    Manual: System Administration tools
-.\"    Source: Samba 4.1
-.\"  Language: English
-.\"
-.TH "NTDBTOOL" "8" "10/15/2013" "Samba 4\&.1" "System Administration tools"
-.\" -----------------------------------------------------------------
-.\" * 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"
-ntdbtool \- manipulate the contents NTDB files
-.SH "SYNOPSIS"
-.HP \w'\fBntdbtool\fR\ 'u
-\fBntdbtool\fR
-.HP \w'\fBntdbtool\fR\ 'u
-\fBntdbtool\fR \fINTDBFILE\fR [\fICOMMANDS\fR...]
-.SH "DESCRIPTION"
-.PP
-This tool is part of the
-\fBsamba\fR(1)
-suite\&.
-.PP
-\fBntdbtool\fR
-a tool for displaying and altering the contents of Samba NTDB (New Trivial DataBase) files\&. Each of the commands listed below can be entered interactively or provided on the command line\&.
-.SH "COMMANDS"
-.PP
-\fBcreate\fR \fINTDBFILE\fR
-.RS 4
-Create a new database named
-\fINTDBFILE\fR\&.
-.RE
-.PP
-\fBopen\fR \fINTDBFILE\fR
-.RS 4
-Open an existing database named
-\fINTDBFILE\fR\&.
-.RE
-.PP
-\fBerase\fR
-.RS 4
-Erase the current database\&.
-.RE
-.PP
-\fBdump\fR
-.RS 4
-Dump the current database as strings\&.
-.RE
-.PP
-\fBcdump\fR
-.RS 4
-Dump the current database as connection records\&.
-.RE
-.PP
-\fBkeys\fR
-.RS 4
-Dump the current database keys as strings\&.
-.RE
-.PP
-\fBhexkeys\fR
-.RS 4
-Dump the current database keys as hex values\&.
-.RE
-.PP
-\fBinfo\fR
-.RS 4
-Print summary information about the current database\&.
-.RE
-.PP
-\fBinsert\fR \fIKEY\fR \fIDATA\fR
-.RS 4
-Insert a record into the current database\&.
-.RE
-.PP
-\fBmove\fR \fIKEY\fR \fINTDBFILE\fR
-.RS 4
-Move a record from the current database into
-\fINTDBFILE\fR\&.
-.RE
-.PP
-\fBstore\fR \fIKEY\fR \fIDATA\fR
-.RS 4
-Store (replace) a record in the current database\&.
-.RE
-.PP
-\fBshow\fR \fIKEY\fR
-.RS 4
-Show a record by key\&.
-.RE
-.PP
-\fBdelete\fR \fIKEY\fR
-.RS 4
-Delete a record by key\&.
-.RE
-.PP
-\fBlist\fR
-.RS 4
-Print the current database hash table and free list\&.
-.RE
-.PP
-\fBfree\fR
-.RS 4
-Print the current database and free list\&.
-.RE
-.PP
-\fB!\fR \fICOMMAND\fR
-.RS 4
-Execute the given system command\&.
-.RE
-.PP
-\fBfirst\fR
-.RS 4
-Print the first record in the current database\&.
-.RE
-.PP
-\fBnext\fR
-.RS 4
-Print the next record in the current database\&.
-.RE
-.PP
-\fBcheck\fR
-.RS 4
-Check the integrity of the current database\&.
-.RE
-.PP
-\fBrepack\fR
-.RS 4
-Repack a database using a temporary file to remove fragmentation\&.
-.RE
-.PP
-\fBquit\fR
-.RS 4
-Exit
-\fBntdbtool\fR\&.
-.RE
-.SH "SEE ALSO"
-.PP
-tdbtool(8)
-.SH "CAVEATS"
-.PP
-The contents of the Samba NTDB files are private to the implementation and should not be altered with
-\fBntdbtool\fR\&.
-.SH "VERSION"
-.PP
-This man page is correct for version 4\&.0 of the Samba suite\&.
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
diff --git a/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py b/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
new file mode 100644
index 000000000000..3015402eace6
--- /dev/null
+++ b/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
@@ -0,0 +1,22 @@
+--- buildtools/wafadmin/Tools/config_c.py.orig	2013-06-13 09:21:02.000000000 +0000
++++ buildtools/wafadmin/Tools/config_c.py	2014-03-27 11:46:02.381178536 +0000
+@@ -73,6 +73,19 @@
+ 			app('CCFLAGS_' + uselib, x)
+ 			app('CXXFLAGS_' + uselib, x)
+ 			app('LINKFLAGS_' + uselib, x)
++		#
++		# NOTE on special treatment of -Wl,-R and -Wl,-rpath:
++		#
++		# It is important to not put a library provided RPATH
++		# into the LINKFLAGS but in the RPATH instead, since
++		# the provided LINKFLAGS get prepended to our own internal
++		# RPATH later, and hence can potentially lead to linking
++		# in too old versions of our internal libs.
++		#
++		elif x.startswith('-Wl,-R'):
++			app('RPATH_' + uselib, x[6:])
++		elif x.startswith('-Wl,-rpath,'):
++			app('RPATH_' + uselib, x[11:])
+ 		elif x.startswith('-Wl'):
+ 			app('LINKFLAGS_' + uselib, x)
+ 		elif x.startswith('-m') or x.startswith('-f'):
diff --git a/net/samba41/files/pkg-message.in b/net/samba41/files/pkg-message.in
index 19d1d66110b0..6cdc13d1753d 100644
--- a/net/samba41/files/pkg-message.in
+++ b/net/samba41/files/pkg-message.in
@@ -1,7 +1,5 @@
 ===============================================================================
 
-This port is *STILL* experimental, use it at your own risk.
-
 How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
 
 * Your configuration is: %%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%
diff --git a/net/samba41/pkg-plist b/net/samba41/pkg-plist
index 8eec047c9da3..8a2e6f81c1a4 100644
--- a/net/samba41/pkg-plist
+++ b/net/samba41/pkg-plist
@@ -1,12 +1,3 @@
-@comment ntdb begin
-bin/ntdbbackup
-bin/ntdbdump
-bin/ntdbrestore
-bin/ntdbtool
-lib/samba/libntdb.so.0
-lib/samba/libutil_ntdb.so
-%%PYTHON_SITELIBDIR%%/ntdb.so
-@comment ntdb end
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
@@ -315,6 +306,7 @@ lib/samba/libtdb-wrap.so
 lib/samba/libtdb_compat.so
 lib/samba/libtrusts_util.so
 lib/samba/libutil_cmdline.so
+lib/samba/libutil_ntdb.so
 lib/samba/libutil_reg.so
 lib/samba/libutil_setid.so
 lib/samba/libutil_tdb.so
@@ -964,7 +956,6 @@ man/man1/smbtree.1.gz
 man/man1/testparm.1.gz
 man/man1/vfstest.1.gz
 man/man1/wbinfo.1.gz
-man/man3/ntdb.3.gz
 man/man5/lmhosts.5.gz
 man/man5/pam_winbind.conf.5.gz
 man/man5/smb.conf.5.gz
@@ -985,10 +976,6 @@ man/man8/idmap_tdb.8.gz
 man/man8/idmap_tdb2.8.gz
 man/man8/net.8.gz
 man/man8/nmbd.8.gz
-man/man8/ntdbbackup.8.gz
-man/man8/ntdbdump.8.gz
-man/man8/ntdbrestore.8.gz
-man/man8/ntdbtool.8.gz
 man/man8/pam_winbind.8.gz
 man/man8/pdbedit.8.gz
 man/man8/samba-regedit.8.gz