CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 20 19:06:17 UTC 2019

Modified Files:
        pkgsrc/databases: Makefile
Added Files:
        pkgsrc/databases/ldb/patches:
            patch-buildtools_wafsamba_samba__conftests.py
            patch-buildtools_wafsamba_samba__install.py

Log Message:
ldb: added version 1.5.4

ldb is a LDAP-like embedded database. It is not at all LDAP standards
compliant, so if you want a standards compliant database then please see the
excellent OpenLDAP project.

What ldb does is provide a fast database with an LDAP-like API designed to be
used within an application. In some ways it can be seen as a intermediate
solution between key-value pair databases and a real LDAP database.

ldb is the database engine used in Samba4.

Features:
* The main features that separate ldb from other solutions are:
* Safe multi-reader, multi-writer, using byte range locking
* LDAP-like API
* fast operation
* choice of local tdb or remote LDAP backends
* integration with talloc
* schema-less operation, for trivial setup
* modules for extensions (such as schema support)
* easy setup of indexes and attribute properties
* LDIF for import/export
* ldbedit tool for database (via LDIF) editing (reminiscent of 'vipw')


To generate a diff of this commit:
cvs rdiff -u -r1.576 -r1.577 pkgsrc/databases/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__conftests.py \
    pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__install.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/Makefile
diff -u pkgsrc/databases/Makefile:1.576 pkgsrc/databases/Makefile:1.577
--- pkgsrc/databases/Makefile:1.576     Sun Mar 17 12:55:13 2019
+++ pkgsrc/databases/Makefile   Wed Mar 20 19:06:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.576 2019/03/17 12:55:13 tm Exp $
+# $NetBSD: Makefile,v 1.577 2019/03/20 19:06:17 adam Exp $
 
 COMMENT=       Databases
 
@@ -62,6 +62,7 @@ SUBDIR+=      jdbc-postgresql94
 SUBDIR+=       kyotocabinet
 SUBDIR+=       lbdb
 SUBDIR+=       ldapvi
+SUBDIR+=       ldb
 SUBDIR+=       leveldb
 SUBDIR+=       libcassandra
 SUBDIR+=       libdbh2

Added files:

Index: pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__conftests.py
diff -u /dev/null pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__conftests.py:1.1
--- /dev/null   Wed Mar 20 19:06:17 2019
+++ pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__conftests.py  Wed Mar 20 19:06:17 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.1 2019/03/20 19:06:17 adam Exp $
+
+Ensure defines are strings to avoid assertion failure, some
+returned values are unicode.
+
+--- buildtools/wafsamba/samba_conftests.py.orig        2019-02-26 15:12:23.000000000 +0000
++++ buildtools/wafsamba/samba_conftests.py
+@@ -97,9 +97,9 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+                 if flag[:2] == "-D":
+                     flag_split = flag[2:].split('=')
+                     if len(flag_split) == 1:
+-                        conf.DEFINE(flag_split[0], '1')
++                        conf.DEFINE(str(flag_split[0]), '1')
+                     else:
+-                        conf.DEFINE(flag_split[0], flag_split[1])
++                        conf.DEFINE(str(flag_split[0]), str(flag_split[1]))
+ 
+     if conf.CHECK_CODE('return !(sizeof(off_t) >= 8)',
+                        define,
Index: pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__install.py
diff -u /dev/null pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__install.py:1.1
--- /dev/null   Wed Mar 20 19:06:17 2019
+++ pkgsrc/databases/ldb/patches/patch-buildtools_wafsamba_samba__install.py    Wed Mar 20 19:06:17 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2019/03/20 19:06:17 adam Exp $
+
+Apply correct install_name on Darwin.
+
+--- buildtools/wafsamba/samba_install.py.orig  2019-01-14 22:24:44.000000000 +0000
++++ buildtools/wafsamba/samba_install.py
+@@ -151,6 +151,8 @@ def install_library(self):
+             bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
+         if dev_link:
+             bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and self.env.MACOSX_DEPLOYMENT_TARGET:
++            self.env.append_value('LINKFLAGS', ['-install_name', os.path.join(install_path, install_name)])
+     finally:
+         bld.all_envs['default'] = default_env
+