svn commit: r487215 - in head/databases/ldb14: . files
Timur I. Bakeyev
timur at FreeBSD.org
Tue Dec 11 00:45:37 UTC 2018
Author: timur
Date: Tue Dec 11 00:45:34 2018
New Revision: 487215
URL: https://svnweb.freebsd.org/changeset/ports/487215
Log:
Add new ldb 1.4 port, required by Samba 4.9
Added:
head/databases/ldb14/files/patch-mdb_ldb__mdb.c (contents, props changed)
Deleted:
head/databases/ldb14/files/0001-bug-13362.patch
head/databases/ldb14/files/patch-wscript
Modified:
head/databases/ldb14/Makefile
head/databases/ldb14/distinfo
head/databases/ldb14/files/ldb.3
head/databases/ldb14/files/ldbadd.1
head/databases/ldb14/files/ldbdel.1
head/databases/ldb14/files/ldbedit.1
head/databases/ldb14/files/ldbmodify.1
head/databases/ldb14/files/ldbrename.1
head/databases/ldb14/files/ldbsearch.1
Modified: head/databases/ldb14/Makefile
==============================================================================
--- head/databases/ldb14/Makefile Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/Makefile Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,12 +1,12 @@
# $FreeBSD$
PORTNAME= ldb
-PORTVERSION= 1.3.6
+PORTVERSION= 1.4.3
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= databases
MASTER_SITES= SAMBA
-PKGNAMESUFFIX= 13
+PKGNAMESUFFIX= 14
MAINTAINER= timur at FreeBSD.org
COMMENT= LDAP-like embedded database
@@ -21,13 +21,12 @@ RUN_DEPENDS= ${LDB_DEPENDS}
LDB_DEPENDS= talloc>=2.1.14:devel/talloc \
tevent>=0.9.37:devel/tevent \
tdb>=1.3.16:databases/tdb \
+ lmdb>=0.9.16:databases/lmdb \
cmocka>=1.1.1:sysutils/cmocka \
popt>=0:devel/popt
-CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.*
+CONFLICTS_INSTALL= ldb-1.1.* ldb1[23]-1.*
-EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13362.patch:-p3
-
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
#nopython_CONFLICTS= ldb
@@ -68,15 +67,19 @@ LDB_BINS= bin/ldbedit \
LDB_LIBS= lib/libldb.so \
lib/libldb.so.1 \
+ lib/ldb/libldb-mdb-int.so \
+ lib/ldb/libldb-key-value.so \
lib/ldb/libldb-cmdline.so \
- lib/shared-modules/ldb/asq.so \
- lib/shared-modules/ldb/ldap.so \
- lib/shared-modules/ldb/paged_results.so \
- lib/shared-modules/ldb/paged_searches.so \
- lib/shared-modules/ldb/rdn_name.so \
- lib/shared-modules/ldb/sample.so \
- lib/shared-modules/ldb/server_sort.so \
lib/shared-modules/ldb/skel.so \
+ lib/shared-modules/ldb/server_sort.so \
+ lib/shared-modules/ldb/sample.so \
+ lib/shared-modules/ldb/rdn_name.so \
+ lib/shared-modules/ldb/paged_searches.so \
+ lib/shared-modules/ldb/paged_results.so \
+ lib/shared-modules/ldb/mdb.so \
+ lib/shared-modules/ldb/ldb.so \
+ lib/shared-modules/ldb/ldap.so \
+ lib/shared-modules/ldb/asq.so \
lib/shared-modules/ldb/tdb.so
PLIST_FILES= include/ldb_version.h \
Modified: head/databases/ldb14/distinfo
==============================================================================
--- head/databases/ldb14/distinfo Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/distinfo Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535926436
-SHA256 (ldb-1.3.6.tar.gz) = 51d23134b356490e75258518dfc5c994c1710ad5357a1e3455a9eaeddff8939a
-SIZE (ldb-1.3.6.tar.gz) = 1374574
+TIMESTAMP = 1544404358
+SHA256 (ldb-1.4.3.tar.gz) = aca09389eff859bfb4d10defa5f02ddfb99b45d67626eac3e8c2079232676a1f
+SIZE (ldb-1.4.3.tar.gz) = 1428730
Modified: head/databases/ldb14/files/ldb.3
==============================================================================
--- head/databases/ldb14/files/ldb.3 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldb.3 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldb
.\" Author: [see the "Author" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDB" "3" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDB" "3" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -57,7 +57,6 @@ If you are new to ldb, then I suggest starting with th
.sp -1
.IP \(bu 2.3
.\}
-
ldbsearch(1)
\- command line ldb search utility
.RE
@@ -70,7 +69,6 @@ ldbsearch(1)
.sp -1
.IP \(bu 2.3
.\}
-
ldbedit(1)
\- edit all or part of a ldb database using your favourite editor
.RE
@@ -83,7 +81,6 @@ ldbedit(1)
.sp -1
.IP \(bu 2.3
.\}
-
ldbadd(1)
\- add records to a ldb database using LDIF formatted input
.RE
@@ -96,7 +93,6 @@ ldbadd(1)
.sp -1
.IP \(bu 2.3
.\}
-
ldbdel(1)
\- delete records from a ldb database
.RE
@@ -109,7 +105,6 @@ ldbdel(1)
.sp -1
.IP \(bu 2.3
.\}
-
ldbmodify(1)
\- modify records in a ldb database using LDIF formatted input
.RE
@@ -123,7 +118,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_connect(3)\fR
\- connect to a ldb backend
.RE
@@ -136,7 +130,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_search(3)\fR
\- perform a database search
.RE
@@ -149,7 +142,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_add(3)\fR
\- add a record to the database
.RE
@@ -162,7 +154,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_delete(3)\fR
\- delete a record from the database
.RE
@@ -175,7 +166,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_modify(3)\fR
\- modify a record in the database
.RE
@@ -188,7 +178,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_errstring(3)\fR
\- retrieve extended error information from the last operation
.RE
@@ -201,7 +190,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_write(3)\fR
\- write a LDIF formatted message
.RE
@@ -214,7 +202,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_write_file(3)\fR
\- write a LDIF formatted message to a file
.RE
@@ -227,7 +214,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_read(3)\fR
\- read a LDIF formatted message
.RE
@@ -240,7 +226,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_read_free(3)\fR
\- free the result of a ldb_ldif_read()
.RE
@@ -253,7 +238,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_read_file(3)\fR
\- read a LDIF message from a file
.RE
@@ -266,7 +250,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_ldif_read_string(3)\fR
\- read a LDIF message from a string
.RE
@@ -279,7 +262,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_element(3)\fR
\- find an element in a ldb_message
.RE
@@ -292,7 +274,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_val_equal_exact(3)\fR
\- compare two ldb_val structures
.RE
@@ -305,7 +286,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_val(3)\fR
\- find an element by value
.RE
@@ -318,7 +298,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_add_empty(3)\fR
\- add an empty message element to a ldb_message
.RE
@@ -331,7 +310,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_add(3)\fR
\- add a non\-empty message element to a ldb_message
.RE
@@ -344,7 +322,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_element_compare(3)\fR
\- compare two ldb_message_element structures
.RE
@@ -357,7 +334,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_int(3)\fR
\- return an integer value from a ldb_message
.RE
@@ -370,7 +346,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_uint(3)\fR
\- return an unsigned integer value from a ldb_message
.RE
@@ -383,7 +358,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_double(3)\fR
\- return a double value from a ldb_message
.RE
@@ -396,7 +370,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_msg_find_string(3)\fR
\- return a string value from a ldb_message
.RE
@@ -409,7 +382,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_set_alloc(3)\fR
\- set the memory allocation function to be used by ldb
.RE
@@ -422,7 +394,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_set_debug(3)\fR
\- set a debug handler to be used by ldb
.RE
@@ -435,7 +406,6 @@ ldbmodify(1)
.sp -1
.IP \(bu 2.3
.\}
-
\fBldb_set_debug_stderr(3)\fR
\- set a debug handler for stderr output
.RE
Modified: head/databases/ldb14/files/ldbadd.1
==============================================================================
--- head/databases/ldb14/files/ldbadd.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbadd.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbadd
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBADD" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: head/databases/ldb14/files/ldbdel.1
==============================================================================
--- head/databases/ldb14/files/ldbdel.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbdel.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbdel
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBDEL" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBDEL" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: head/databases/ldb14/files/ldbedit.1
==============================================================================
--- head/databases/ldb14/files/ldbedit.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbedit.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbedit
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBEDIT" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBEDIT" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: head/databases/ldb14/files/ldbmodify.1
==============================================================================
--- head/databases/ldb14/files/ldbmodify.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbmodify.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbmodify
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBMODIFY" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBMODIFY" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: head/databases/ldb14/files/ldbrename.1
==============================================================================
--- head/databases/ldb14/files/ldbrename.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbrename.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbrename
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBRENAME" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBRENAME" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: head/databases/ldb14/files/ldbsearch.1
==============================================================================
--- head/databases/ldb14/files/ldbsearch.1 Tue Dec 11 00:19:42 2018 (r487214)
+++ head/databases/ldb14/files/ldbsearch.1 Tue Dec 11 00:45:34 2018 (r487215)
@@ -1,13 +1,13 @@
'\" t
.\" Title: ldbsearch
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 11/05/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/11/2018
.\" Manual: System Administration tools
.\" Source: LDB 1.1
.\" Language: English
.\"
-.TH "LDBSEARCH" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools"
+.TH "LDBSEARCH" "1" "12/11/2018" "LDB 1\&.1" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Added: head/databases/ldb14/files/patch-mdb_ldb__mdb.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/ldb14/files/patch-mdb_ldb__mdb.c Tue Dec 11 00:45:34 2018 (r487215)
@@ -0,0 +1,21 @@
+--- ldb_mdb/ldb_mdb.c.orig 2018-07-12 08:23:36 UTC
++++ ldb_mdb/ldb_mdb.c
+@@ -40,7 +40,9 @@ int ldb_mdb_err_map(int lmdb_err)
+ return LDB_SUCCESS;
+ case EIO:
+ return LDB_ERR_OPERATIONS_ERROR;
++#ifdef EBADE
+ case EBADE:
++#endif
+ case MDB_INCOMPATIBLE:
+ case MDB_CORRUPTED:
+ case MDB_INVALID:
+@@ -181,7 +183,7 @@ static int lmdb_store(struct ltdb_privat
+
+ if (flags == TDB_INSERT) {
+ mdb_flags = MDB_NOOVERWRITE;
+- } else if ((flags == TDB_MODIFY)) {
++ } else if (flags == TDB_MODIFY) {
+ /*
+ * Modifying a record, ensure that it exists.
+ * This mimics the TDB semantics
More information about the svn-ports-head
mailing list