3 files changed, 8 insertions, 75 deletions

diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index 166f0e48ec76..69c5ae960057 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.1.21
-PORTREVISION=		1
+PORTVERSION=		1.1.23
+PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -32,9 +32,9 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-BUILD_DEPENDS+=		talloc>=2.1.1:${PORTSDIR}/devel/talloc \
-			tevent>=0.9.22:${PORTSDIR}/devel/tevent \
-			tdb>=1.3.4,1:${PORTSDIR}/databases/tdb \
+BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc \
+			tevent>=0.9.26:${PORTSDIR}/devel/tevent \
+			tdb>=1.3.8,1:${PORTSDIR}/databases/tdb \
 			popt>=0:${PORTSDIR}/devel/popt
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
@@ -87,6 +87,7 @@ PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			%%PYTHON_SITELIBDIR%%/ldb.so \
+			%%PYTHON_SITELIBDIR%%/_ldb_text.py \
 			%%PKGCONFIGDIR%%/pyldb-util.pc
 
 LDB_MAN1=		man/man1/ldbadd.1.gz \
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
index 2f238d37365c..cc4d12737f0b 100644
--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldb-1.1.21.tar.gz) = 267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1
-SIZE (ldb-1.1.21.tar.gz) = 1244825
+SHA256 (ldb-1.1.23.tar.gz) = 8f8b2f7f04b24c847d088a091e6a2261ac6c7810fc711f553d3b61a3dee39559
+SIZE (ldb-1.1.23.tar.gz) = 1258249
diff --git a/databases/ldb/files/patch-lib_replace_replace.c b/databases/ldb/files/patch-lib_replace_replace.c
deleted file mode 100644
index ec08fd5e8169..000000000000
--- a/databases/ldb/files/patch-lib_replace_replace.c
+++ /dev/null
@@ -1,68 +0,0 @@
-From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Tue, 18 Aug 2015 20:57:27 +0200
-Subject: [PATCH] replace: Fix bug 11455
-
-Don't call rep_strtoull recursively
-
-Signed-off-by: Volker Lendecke <vl@samba.org>
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455
-
-https://lists.samba.org/archive/samba-technical/2015-July/108587.html
-https://lists.samba.org/archive/samba-technical/2015-July/108588.html
-
---- ./lib/replace/replace.c.orig	2015-09-18 23:51:08 UTC
-+++ ./lib/replace/replace.c	2015-09-18 23:51:08 UTC
-@@ -518,8 +518,10 @@
- }
- #else
- #ifdef HAVE_BSD_STRTOLL
-+#undef strtoll
- long long int rep_strtoll(const char *str, char **endptr, int base)
- {
-+	int errno0 = errno;
- 	long long int nb = strtoll(str, endptr, base);
- 	/* With glibc EINVAL is only returned if base is not ok */
- 	if (errno == EINVAL) {
-@@ -528,7 +530,7 @@
- 			 * able to make the convertion.
- 			 * Let's reset errno.
- 			 */
--			errno = 0;
-+			errno = errno0;
- 		}
- 	}
- 	return nb;
-@@ -551,26 +553,24 @@
- #endif
- }
- #else
--#ifdef HAVE_BSD_STRTOLL
--#ifdef HAVE_STRTOUQ
-+#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
-+#undef strtoull
- unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
- {
--	unsigned long long int nb = strtouq(str, endptr, base);
--	/* In linux EINVAL is only returned if base is not ok */
-+	int errno0 = errno;
-+	unsigned long long int nb = strtoull(str, endptr, base);
-+	/* With glibc EINVAL is only returned if base is not ok */
- 	if (errno == EINVAL) {
- 		if (base == 0 || (base >1 && base <37)) {
- 			/* Base was ok so it's because we were not
- 			 * able to make the convertion.
- 			 * Let's reset errno.
- 			 */
--			errno = 0;
-+			errno = errno0;
- 		}
- 	}
- 	return nb;
- }
--#else
--#error "You need the strtouq function"
--#endif /* HAVE_STRTOUQ */
- #endif /* HAVE_BSD_STRTOLL */
- #endif /* HAVE_STRTOULL */
-