CVS commit: pkgsrc/databases/ldb

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul 21 08:56:47 UTC 2022

Modified Files:
        pkgsrc/databases/ldb: Makefile distinfo
Added Files:
        pkgsrc/databases/ldb/patches: patch-common_ldb__match.c
            patch-ldb__mdb_ldb__mdb.h

Log Message:
ldb: updated to 2.5.1

2.5.1:
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/ldb/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/ldb/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/ldb/patches/patch-common_ldb__match.c \
    pkgsrc/databases/ldb/patches/patch-ldb__mdb_ldb__mdb.h

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

Modified files:

Index: pkgsrc/databases/ldb/Makefile
diff -u pkgsrc/databases/ldb/Makefile:1.27 pkgsrc/databases/ldb/Makefile:1.28
--- pkgsrc/databases/ldb/Makefile:1.27  Thu Jun 30 11:18:08 2022
+++ pkgsrc/databases/ldb/Makefile       Thu Jul 21 08:56:47 2022
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2022/06/30 11:18:08 nia Exp $
+# $NetBSD: Makefile,v 1.28 2022/07/21 08:56:47 adam Exp $
 
-# Before updating, make sure net/samba4 supports the newer version.
-DISTNAME=      ldb-2.4.2
-PKGREVISION=   1
+DISTNAME=      ldb-2.5.1
 CATEGORIES=    databases
 MASTER_SITES=  https://www.samba.org/ftp/ldb/
 
@@ -16,11 +14,10 @@ BUILD_DEPENDS+=     docbook-xsl-[0-9]*:../..
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+.include "../../mk/bsd.prefs.mk"
+
 USE_TOOLS+=            gmake pkg-config
 HAS_CONFIGURE=         yes
-CONFIG_SHELL=          ${PYTHONBIN}
-CONFIGURE_SCRIPT=      ${WRKSRC}/buildtools/bin/waf
-CONFIGURE_ARGS+=       configure
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --abi-check-disable
 CONFIGURE_ARGS+=       --disable-symbol-versions
@@ -38,8 +35,6 @@ PY_PATCHPLIST=                yes
 REPLACE_PYTHON+=       buildtools/bin/waf
 MAKE_FLAGS+=           WAF_BINARY=${PYTHONBIN}\ ${WRKSRC}/buildtools/bin/waf
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=  SOEXT=dylib
 .else

Index: pkgsrc/databases/ldb/distinfo
diff -u pkgsrc/databases/ldb/distinfo:1.18 pkgsrc/databases/ldb/distinfo:1.19
--- pkgsrc/databases/ldb/distinfo:1.18  Mon Mar  7 21:36:19 2022
+++ pkgsrc/databases/ldb/distinfo       Thu Jul 21 08:56:47 2022
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.18 2022/03/07 21:36:19 thor Exp $
+$NetBSD: distinfo,v 1.19 2022/07/21 08:56:47 adam Exp $
 
-BLAKE2s (ldb-2.4.2.tar.gz) = 710d6614f1ffcc61735f96fae6495be90b185f0bbd19e8c293650ae73e9dee00
-SHA512 (ldb-2.4.2.tar.gz) = 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989
-Size (ldb-2.4.2.tar.gz) = 1720169 bytes
+BLAKE2s (ldb-2.5.1.tar.gz) = 190d6a40ea419aaf494ad70298f9dac5950d1a08639f09366e1ea21ea8d77261
+SHA512 (ldb-2.5.1.tar.gz) = 679ad695d4467a38e6cb87ba2b7d61049a42c59792b39f0a40256456ac673849adf58dc0759a89be982b80bb4a0834d34b51779424f7b997a53ea95f02f410ad
+Size (ldb-2.5.1.tar.gz) = 1736209 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 813c639e404e3b301444decae318c702c87f0cc1
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
+SHA1 (patch-common_ldb__match.c) = a373b64d5933a4c03a71f80bc1f09d2f64738594
+SHA1 (patch-ldb__mdb_ldb__mdb.h) = 8285630012c18c6f86939105d9d030746d86f58e
 SHA1 (patch-wscript) = ad5dd815e97e29e5c19e5f45165cac490d01492d

Added files:

Index: pkgsrc/databases/ldb/patches/patch-common_ldb__match.c
diff -u /dev/null pkgsrc/databases/ldb/patches/patch-common_ldb__match.c:1.1
--- /dev/null   Thu Jul 21 08:56:47 2022
+++ pkgsrc/databases/ldb/patches/patch-common_ldb__match.c      Thu Jul 21 08:56:47 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_ldb__match.c,v 1.1 2022/07/21 08:56:47 adam Exp $
+
+Fix building.
+
+--- common/ldb_match.c.orig    2022-06-14 20:00:35.000000000 +0000
++++ common/ldb_match.c
+@@ -33,6 +33,9 @@
+  */
+ 
+ #include "ldb_private.h"
++#ifdef HAVE_BSD_STRTOLL
++#undef strtoull
++#endif
+ #include "dlinklist.h"
+ 
+ /*
Index: pkgsrc/databases/ldb/patches/patch-ldb__mdb_ldb__mdb.h
diff -u /dev/null pkgsrc/databases/ldb/patches/patch-ldb__mdb_ldb__mdb.h:1.1
--- /dev/null   Thu Jul 21 08:56:47 2022
+++ pkgsrc/databases/ldb/patches/patch-ldb__mdb_ldb__mdb.h      Thu Jul 21 08:56:47 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-ldb__mdb_ldb__mdb.h,v 1.1 2022/07/21 08:56:47 adam Exp $
+
+Fix building.
+
+--- ldb_mdb/ldb_mdb.h.orig     2022-06-14 19:58:02.000000000 +0000
++++ ldb_mdb/ldb_mdb.h
+@@ -26,6 +26,9 @@
+ #define _LDB_MDB_H_
+ 
+ #include "ldb_private.h"
++#ifdef HAVE_BSD_STRTOLL
++#undef strtoull
++#endif
+ #include <lmdb.h>
+ 
+ struct lmdb_private {