Update ldb13 to the latest 1.3.2 version.

5 files changed, 40 insertions, 21 deletions

diff --git a/databases/ldb13/Makefile b/databases/ldb13/Makefile
index 27ee45fc79a9..37820fd9d708 100644
--- a/databases/ldb13/Makefile
+++ b/databases/ldb13/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.3.1
+PORTVERSION=		1.3.2
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
@@ -49,11 +49,15 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
-OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFINE=		MANPAGES DEBUG
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
+DEBUG_CONFIGURE_ON=	--verbose --enable-debug
+DEBUG_MAKE_ARGS=	--verbose
+DEBUG_FLAGS=		-g -ggdb3 -O0
+
 LDB_BINS=		bin/ldbedit \
 			bin/ldbmodify \
 			bin/ldbadd \
@@ -170,16 +174,18 @@ pre-build-MANPAGES-off:
 .endfor
 
 post-install:
-.for lib in ${LDB_BINS} ${LDB_LIBS}
+.if !defined(WITH_DEBUG)
+.	for lib in ${LDB_BINS} ${LDB_LIBS}
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
+.	endfor
+.	if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
-.if defined(SAMBA4_PYTHON3)
+.		if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
+.		endif
+.	endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/ldb13/distinfo b/databases/ldb13/distinfo
index be5fb872a513..609f0073b807 100644
--- a/databases/ldb13/distinfo
+++ b/databases/ldb13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516159739
-SHA256 (ldb-1.3.1.tar.gz) = b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2
-SIZE (ldb-1.3.1.tar.gz) = 1361723
+TIMESTAMP = 1520025663
+SHA256 (ldb-1.3.2.tar.gz) = ce3ef0b7358a8c5437d2cc0ba3fd6c2f2b7017bc87b09527406c8e34a82376ab
+SIZE (ldb-1.3.2.tar.gz) = 1364976
diff --git a/databases/ldb13/files/patch-common__ldb_modules.c b/databases/ldb13/files/patch-common__ldb_modules.c
deleted file mode 100644
index ed26d1c55c9e..000000000000
--- a/databases/ldb13/files/patch-common__ldb_modules.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/ldb_modules.c.orig	2018-02-14 01:18:43 UTC
-+++ common/ldb_modules.c
-@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
- */
- void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
- {
--	int ret = ldb_modules_load_path(path, LDB_VERSION);
-+	int ret = ldb_modules_load_dir(path, LDB_VERSION);
- 	if (ret != LDB_SUCCESS) {
- 		ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
- 	}
diff --git a/databases/ldb13/files/patch-ldb_cache.c b/databases/ldb13/files/patch-ldb_cache.c
new file mode 100644
index 000000000000..2af4d69800ba
--- /dev/null
+++ b/databases/ldb13/files/patch-ldb_cache.c
@@ -0,0 +1,13 @@
+--- ldb_tdb/ldb_cache.c.orig	2018-03-04 05:41:25.313506000 +0100
++++ ldb_tdb/ldb_cache.c	2018-03-04 05:46:09.353115000 +0100
+@@ -91,7 +91,9 @@ static int ldb_schema_attribute_compare(
+ {
+ 	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;
+ 	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;
+-	return ldb_attr_cmp(sa1->name, sa2->name);
++	int res = ldb_attr_cmp(sa1->name, sa2->name);
++
++	return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0;
+ }
+ 
+ /*
diff --git a/databases/ldb13/files/patch-ldb_mod_op_test.c b/databases/ldb13/files/patch-ldb_mod_op_test.c
new file mode 100644
index 000000000000..81d86f185c16
--- /dev/null
+++ b/databases/ldb13/files/patch-ldb_mod_op_test.c
@@ -0,0 +1,11 @@
+--- tests/ldb_mod_op_test.c.orig	2018-03-02 23:35:09.639709000 +0100
++++ tests/ldb_mod_op_test.c	2018-03-02 23:44:00.194683000 +0100
+@@ -3529,7 +3529,7 @@ static void test_ldb_unique_index_duplic
+ 	assert_int_equal(ret, LDB_SUCCESS);
+ 
+ 	msg02 = ldb_msg_new(tmp_ctx);
+-	assert_non_null(msg01);
++	assert_non_null(msg02);
+ 
+ 	msg02->dn = ldb_dn_new_fmt(msg02, test_ctx->ldb, "dc=test02");
+ 	assert_non_null(msg02->dn);