Update Samba4* supplimentary libraries to the newer versions.

Made databases/ldb to depend on openldap-sasl-client, so it won't conflict with the corresponding requirement of net/samba4* ports.

8 files changed, 111 insertions, 27 deletions

diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index e7f004854951..68c3e5c52d49 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		tdb
-PORTVERSION=		1.3.9
+PORTVERSION=		1.3.12
 PORTREVISION=		0
 PORTEPOCH=		1
 CATEGORIES=		databases
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index c9e48d3208c2..3c934cc6839f 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tdb-1.3.9.tar.gz) = 7101f726e6d5c70f14e577b01c133e2e6059c4455239115e56a12ba64fc084d2
-SIZE (tdb-1.3.9.tar.gz) = 493585
+TIMESTAMP = 1483301977
+SHA256 (tdb-1.3.12.tar.gz) = 60134e32253cac8e2efe5e0185d20123c208bcf6ad15edf2f50d80daadf8c348
+SIZE (tdb-1.3.12.tar.gz) = 495520
diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e97..95f250a86218 100644
--- a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
+++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
@@ -1,6 +1,6 @@
---- ./buildtools/wafsamba/samba_install.py.orig	2015-08-09 19:55:47.819170736 +0000
-+++ ./buildtools/wafsamba/samba_install.py	2015-08-09 19:56:18.727356203 +0000
-@@ -116,7 +116,7 @@
+--- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
                  inst_name    = bld.make_libname(t.target)
          elif self.vnum:
              vnum_base    = self.vnum.split('.')[0]
diff --git a/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 000000000000..5695f3e03841
--- /dev/null
+++ b/databases/tdb/files/patch-third_party__waf__wafadmin__Tools__cc.py
@@ -0,0 +1,11 @@
+--- third_party/waf/wafadmin/Tools/cc.py.orig	2015-11-06 13:25:52 UTC
++++ third_party/waf/wafadmin/Tools/cc.py
+@@ -88,7 +88,7 @@ def c_hook(self, node):
+ 		raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
+ 	return task
+ 
+-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+ cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
+ cls.scan = ccroot.scan
+ cls.vars.append('CCDEPS')
diff --git a/databases/tdb/files/tdbbackup.8 b/databases/tdb/files/tdbbackup.8
index c378bb1288d9..92f510aecccf 100644
--- a/databases/tdb/files/tdbbackup.8
+++ b/databases/tdb/files/tdbbackup.8
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 2015-04-25
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "2015\-04\-25" "Samba 3\&.6" "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
 .\" -----------------------------------------------------------------
@@ -22,7 +31,7 @@
 tdbbackup \- tool for backing up and for validating the integrity of samba \&.tdb files
 .SH "SYNOPSIS"
 .HP \w'\fBtdbbackup\fR\ 'u
-\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h]
+\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h] [\-l]
 .SH "DESCRIPTION"
 .PP
 This tool is part of the
@@ -42,14 +51,19 @@ Get help information\&.
 .RS 4
 The
 \fB\-s\fR
-option allows the adminisistrator to specify a file backup extension\&. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup\&.
+option allows the administrator to specify a file backup extension\&. This way it is possible to keep a history of tdb 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 (currupt data) which if detected causes the backup to be restored\&.
+will check the database for damages (corrupt data) which if detected causes the backup to be restored\&.
+.RE
+.PP
+\-l
+.RS 4
+This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
 .RE
 .SH "COMMANDS"
 .PP
diff --git a/databases/tdb/files/tdbdump.8 b/databases/tdb/files/tdbdump.8
index e62e261b88cd..86d9e2c67556 100644
--- a/databases/tdb/files/tdbdump.8
+++ b/databases/tdb/files/tdbdump.8
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 2015-04-25
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "2015\-04\-25" "Samba 3\&.6" "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
 .\" -----------------------------------------------------------------
@@ -22,7 +31,7 @@
 tdbdump \- tool for printing the contents of a TDB file
 .SH "SYNOPSIS"
 .HP \w'\fBtdbdump\fR\ 'u
-\fBtdbdump\fR {filename}
+\fBtdbdump\fR [\-k\ \fIkeyname\fR] [\-e] [\-h] {filename}
 .SH "DESCRIPTION"
 .PP
 This tool is part of the
@@ -30,9 +39,29 @@ This tool is part of the
 suite\&.
 .PP
 \fBtdbdump\fR
-is a very simple utility that \'dumps\' the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
+is a very simple utility that \*(Aqdumps\*(Aq the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&.
 .PP
 This tool can be used when debugging problems with TDB 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
+.PP
+\-e
+.RS 4
+The
+\fB\-e\fR
+tries to dump out from a corrupt database\&. Naturally, such a dump is unreliable, at best\&.
+.RE
 .SH "VERSION"
 .PP
 This man page is correct for version 3 of the Samba suite\&.
diff --git a/databases/tdb/files/tdbrestore.8 b/databases/tdb/files/tdbrestore.8
index 152172482509..28632ac094c5 100644
--- a/databases/tdb/files/tdbrestore.8
+++ b/databases/tdb/files/tdbrestore.8
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: tdbrestore
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 2015-04-25
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBRESTORE" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBRESTORE" "8" "2015\-04\-25" "Samba 3\&.6" "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
 .\" -----------------------------------------------------------------
@@ -30,7 +39,7 @@ This tool is part of the
 suite\&.
 .PP
 \fBtdbrestore\fR
-is a very simple utility that \'restores\' the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&.
+is a very simple utility that \*(Aqrestores\*(Aq the contents of dump file into TDB (Trivial DataBase) file\&. The dump file is obtained from the tdbdump command\&.
 .PP
 This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename parameter\&.
 .PP
diff --git a/databases/tdb/files/tdbtool.8 b/databases/tdb/files/tdbtool.8
index dcb40fcf52c5..04ed76594c19 100644
--- a/databases/tdb/files/tdbtool.8
+++ b/databases/tdb/files/tdbtool.8
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 2015-04-25
 .\"    Manual: System Administration tools
-.\"    Source: Samba 3.6
+.\"    Source: Samba 4.0
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "03/29/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "2015\-04\-25" "Samba 4\&.0" "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
 .\" -----------------------------------------------------------------
@@ -24,7 +33,7 @@ tdbtool \- manipulate the contents TDB files
 .HP \w'\fBtdbtool\fR\ 'u
 \fBtdbtool\fR
 .HP \w'\fBtdbtool\fR\ 'u
-\fBtdbtool\fR \fITDBFILE\fR [\fICOMMANDS\fR...]
+\fBtdbtool\fR [\-l] \fITDBFILE\fR [\fICOMMANDS\fR...]
 .SH "DESCRIPTION"
 .PP
 This tool is part of the
@@ -33,6 +42,12 @@ suite\&.
 .PP
 \fBtdbtool\fR
 a tool for displaying and altering the contents of Samba TDB (Trivial DataBase) files\&. Each of the commands listed below can be entered interactively or provided on the command line\&.
+.SH "OPTIONS"
+.PP
+\-l
+.RS 4
+This options disables any locking, by passing TDB_NOLOCK to tdb_open_ex()\&. Only use this for database files which are not used by any other process! And also only if it is otherwise not possible to open the database, e\&.g\&. databases which were created with mutex locking\&.
+.RE
 .SH "COMMANDS"
 .PP
 \fBcreate\fR \fITDBFILE\fR
@@ -133,6 +148,11 @@ Print the next record in the current database\&.
 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
@@ -144,7 +164,7 @@ The contents of the Samba TDB files are private to the implementation and should
 \fBtdbtool\fR\&.
 .SH "VERSION"
 .PP
-This man page is correct for version 3\&.0\&.25 of the Samba suite\&.
+This man page is correct for version 3\&.6 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\&.