diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index ce79e1bb899e..c51186a683a3 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ldb
-PORTVERSION= 1.1.26
+PORTVERSION= 1.1.29
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= databases
@@ -20,6 +20,7 @@ WAF_CMD= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
USE_OPENLDAP= yes
+WANT_OPENLDAP_SASL= yes
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
@@ -32,9 +33,9 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
OPTIONS_DEFINE= MANPAGES
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
-BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc \
- tevent>=0.9.27:devel/tevent \
- tdb>=1.3.8,1:databases/tdb \
+BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc \
+ tevent>=0.9.31:devel/tevent \
+ tdb>=1.3.12,1:databases/tdb \
popt>=0:devel/popt
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
index 4ba8bb0b11b5..6dd5bc450d13 100644
--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ldb-1.1.26.tar.gz) = 8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6
-SIZE (ldb-1.1.26.tar.gz) = 1262660
+TIMESTAMP = 1483326847
+SHA256 (ldb-1.1.29.tar.gz) = 59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97
+SIZE (ldb-1.1.29.tar.gz) = 1277551
diff --git a/databases/ldb/files/ldb.3 b/databases/ldb/files/ldb.3
index 4c594a9c8669..4dcdb734f67f 100644
--- a/databases/ldb/files/ldb.3
+++ b/databases/ldb/files/ldb.3
@@ -2,12 +2,12 @@
.\" Title: ldb
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDB" "3" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDB" "3" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbadd.1 b/databases/ldb/files/ldbadd.1
index c92ecd0719c2..4e8a29148786 100644
--- a/databases/ldb/files/ldbadd.1
+++ b/databases/ldb/files/ldbadd.1
@@ -2,12 +2,12 @@
.\" Title: ldbadd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBADD" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBADD" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbdel.1 b/databases/ldb/files/ldbdel.1
index 57f153762184..082b49d72617 100644
--- a/databases/ldb/files/ldbdel.1
+++ b/databases/ldb/files/ldbdel.1
@@ -2,12 +2,12 @@
.\" Title: ldbdel
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBDEL" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBDEL" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbedit.1 b/databases/ldb/files/ldbedit.1
index e21b3e89535b..af36f14dce51 100644
--- a/databases/ldb/files/ldbedit.1
+++ b/databases/ldb/files/ldbedit.1
@@ -2,12 +2,12 @@
.\" Title: ldbedit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBEDIT" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBEDIT" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbmodify.1 b/databases/ldb/files/ldbmodify.1
index d75e217ce25f..7da4ca9c2c90 100644
--- a/databases/ldb/files/ldbmodify.1
+++ b/databases/ldb/files/ldbmodify.1
@@ -2,12 +2,12 @@
.\" Title: ldbmodify
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBMODIFY" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBMODIFY" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/ldbrename.1 b/databases/ldb/files/ldbrename.1
index fc0506aae3ce..7aa030952773 100644
--- a/databases/ldb/files/ldbrename.1
+++ b/databases/ldb/files/ldbrename.1
@@ -2,12 +2,12 @@
.\" Title: ldbrename
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBRENAME" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBRENAME" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
ldbrename \- Edit LDB databases using your favorite editor
.SH "SYNOPSIS"
.HP \w'\fBldbrename\fR\ 'u
-\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdb}
+\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
.SH "DESCRIPTION"
.PP
ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
diff --git a/databases/ldb/files/ldbsearch.1 b/databases/ldb/files/ldbsearch.1
index 772fad30c7e8..a13f6a449187 100644
--- a/databases/ldb/files/ldbsearch.1
+++ b/databases/ldb/files/ldbsearch.1
@@ -2,12 +2,12 @@
.\" Title: ldbsearch
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 01/29/2013
+.\" Date: 01/02/2017
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBSEARCH" "1" "01/29/2013" "LDB 1\&.1" "System Administration tools"
+.TH "LDBSEARCH" "1" "01/02/2017" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py b/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e97..95f250a86218 100644
--- a/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py
+++ b/databases/ldb/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/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py b/databases/ldb/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 000000000000..5695f3e03841
--- /dev/null
+++ b/databases/ldb/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/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
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" 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
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" 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
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" 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
-.\" Date: 03/29/2011
+.\" Generator: DocBook XSL Stylesheets v1.76.1
+.\" 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\&.
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index fc13c3cdf63a..cb832e6dee52 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= talloc
-PORTVERSION= 2.1.6
+PORTVERSION= 2.1.8
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
diff --git a/devel/talloc/distinfo b/devel/talloc/distinfo
index 071fe9d760c1..0fa166f43835 100644
--- a/devel/talloc/distinfo
+++ b/devel/talloc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (talloc-2.1.6.tar.gz) = 3b8e1a50bacb359d99942e0dd9941cef779ae4b5eb20f138873bd8270cb1d47b
-SIZE (talloc-2.1.6.tar.gz) = 436983
+TIMESTAMP = 1483289848
+SHA256 (talloc-2.1.8.tar.gz) = 22d14911164d4de67ff76b5269fa5250d01f78c955bc77e28615350996877130
+SIZE (talloc-2.1.8.tar.gz) = 438490
diff --git a/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py b/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e97..95f250a86218 100644
--- a/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
+++ b/devel/talloc/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/devel/talloc/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/talloc/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 000000000000..5695f3e03841
--- /dev/null
+++ b/devel/talloc/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/devel/talloc/files/patch-wscript b/devel/talloc/files/patch-wscript
index 045e1dd088ab..cfb1d228adb6 100644
--- a/devel/talloc/files/patch-wscript
+++ b/devel/talloc/files/patch-wscript
@@ -1,11 +1,11 @@
---- wscript.orig 2011-01-08 01:43:04.000000000 +0100
-+++ wscript 2011-07-29 23:55:08.000000000 +0200
-@@ -71,7 +71,7 @@
+--- wscript.orig 2016-07-28 07:19:25 UTC
++++ wscript
+@@ -78,7 +78,7 @@ def build(bld):
bld.RECURSE('lib/replace')
if bld.env.standalone_talloc:
- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
bld.env.TALLOC_VERSION = VERSION
- bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
- bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
+ private_library = False
+
diff --git a/devel/talloc/files/talloc.3 b/devel/talloc/files/talloc.3
index 9b3a4ef4e33c..6a10b4990c2e 100644
--- a/devel/talloc/files/talloc.3
+++ b/devel/talloc/files/talloc.3
@@ -2,12 +2,12 @@
.\" Title: talloc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1
-.\" Date: 05/13/2015
+.\" Date: 2015-04-10
.\" Manual: System Administration tools
.\" Source: Samba 4.0
.\" Language: English
.\"
-.TH "TALLOC" "3" "05/13/2015" "Samba 4\&.0" "System Administration tools"
+.TH "TALLOC" "3" "2015\-04\-10" "Samba 4\&.0" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -184,12 +184,12 @@ you can talloc_free() any parent of the original pointer\&. That will reduce the
.sp -1
.IP \(bu 2.3
.\}
-you can talloc_free() the pointer itself\&. That will destroy the most recently established parent to the pointer and leave the pointer as a child of its current parent\&.
+you can talloc_free() the pointer itself if it has at maximum one parent\&. This behaviour has been changed since the release of version 2\&.0\&. Further informations in the description of "talloc_free"\&.
.RE
.PP
For more control on which parent to remove, see
\(lqtalloc_unlink()\(rq\&.
-.SS "int talloc_unlink(const void *ctx, const void *ptr);"
+.SS "int talloc_unlink(const void *ctx, void *ptr);"
.PP
The talloc_unlink() function removes a specific parent from
\fIptr\fR\&. The
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 58446df57a59..00214e0f55d5 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tevent
-PORTVERSION= 0.9.28
+PORTVERSION= 0.9.31
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
OPTIONS_DEFINE= MANPAGES
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
-BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc
+BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc
RUN_DEPENDS:= ${BUILD_DEPENDS}
.include
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo
index c53cc11cbcc7..9af200481e9c 100644
--- a/devel/tevent/distinfo
+++ b/devel/tevent/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tevent-0.9.28.tar.gz) = 04d953379025b1560af5c4ffcce58a3ee84db7aaa09c9f1e3eff5b2945a13529
-SIZE (tevent-0.9.28.tar.gz) = 581522
+TIMESTAMP = 1483301477
+SHA256 (tevent-0.9.31.tar.gz) = 4a13f2256ad804c860e84068258bd0f8be31cf0c79aa8f3019fa32f6928c2bfc
+SIZE (tevent-0.9.31.tar.gz) = 587784
diff --git a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
index 994ee3637e97..95f250a86218 100644
--- a/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
+++ b/devel/tevent/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/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py
new file mode 100644
index 000000000000..5695f3e03841
--- /dev/null
+++ b/devel/tevent/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')