CVS commit: pkgsrc/databases/libzdb

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  2 17:50:48 UTC 2026

Modified Files:
        pkgsrc/databases/libzdb: Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/databases/libzdb/patches: patch-src_system_Time.c
Removed Files:
        pkgsrc/databases/libzdb/patches: patch-src_util_Str.c patch-src_zdbpp.h
            patch-test_pool.c patch-test_unit.c

Log Message:
libzdb: update to 3.5.0

Version 3.5.0
Added numeric DB error codes and SQLSTATE support (PostgreSQL).
Blocks MySQL proxies by default due to protocol issues.
Oracle cleanup; supports 18c+, fixes transaction bugs.
More reliable MySQL/PostgreSQL ping and reconnect behavior.
Fixed multi-threaded pool memory and locking issues.

Version 3.4.1
ConnectionPool can report database type.
Optional SQLite shared cache for better concurrency.
SSL/TLS options added to MySQL and PostgreSQL URLs.
Removed SQLite heap_limit URL parameter.

Version 3.4.0
Configurable transaction isolation on begin.
New valueOr macro for safer return handling.
SQLite multi-thread mode enabled by default.
More efficient prepared statement string binding.
Minor SQLite and C++ fixes.

Version 3.3.0
Pool reaper thread enabled by default.
New C++ API (C++20, breaking change).
Added pool capacity check (ConnectionPool_isFull).
Improved pool concurrency and stability.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/libzdb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/libzdb/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/libzdb/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/libzdb/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/libzdb/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/libzdb/patches/patch-src_system_Time.c
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/libzdb/patches/patch-src_util_Str.c \
    pkgsrc/databases/libzdb/patches/patch-src_zdbpp.h \
    pkgsrc/databases/libzdb/patches/patch-test_pool.c \
    pkgsrc/databases/libzdb/patches/patch-test_unit.c

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

Modified files:

Index: pkgsrc/databases/libzdb/Makefile
diff -u pkgsrc/databases/libzdb/Makefile:1.41 pkgsrc/databases/libzdb/Makefile:1.42
--- pkgsrc/databases/libzdb/Makefile:1.41       Fri May 16 22:12:11 2025
+++ pkgsrc/databases/libzdb/Makefile    Fri Jan  2 17:50:47 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2025/05/16 22:12:11 zafer Exp $
+# $NetBSD: Makefile,v 1.42 2026/01/02 17:50:47 tnn Exp $
 
-DISTNAME=      libzdb-3.2.3
-PKGREVISION=   9
+DISTNAME=      libzdb-3.5.0
 CATEGORIES=    databases
 MASTER_SITES=  https://www.tildeslash.com/libzdb/dist/
 

Index: pkgsrc/databases/libzdb/PLIST
diff -u pkgsrc/databases/libzdb/PLIST:1.2 pkgsrc/databases/libzdb/PLIST:1.3
--- pkgsrc/databases/libzdb/PLIST:1.2   Sat Feb 13 14:07:40 2021
+++ pkgsrc/databases/libzdb/PLIST       Fri Jan  2 17:50:47 2026
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2021/02/13 14:07:40 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/01/02 17:50:47 tnn Exp $
 include/zdb/Connection.h
 include/zdb/ConnectionPool.h
 include/zdb/Exception.h
 include/zdb/PreparedStatement.h
 include/zdb/ResultSet.h
 include/zdb/SQLException.h
+include/zdb/SQLState.h
 include/zdb/URL.h
 include/zdb/zdb.h
 include/zdb/zdbpp.h

Index: pkgsrc/databases/libzdb/buildlink3.mk
diff -u pkgsrc/databases/libzdb/buildlink3.mk:1.28 pkgsrc/databases/libzdb/buildlink3.mk:1.29
--- pkgsrc/databases/libzdb/buildlink3.mk:1.28  Thu Apr 17 21:50:02 2025
+++ pkgsrc/databases/libzdb/buildlink3.mk       Fri Jan  2 17:50:47 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2025/04/17 21:50:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2026/01/02 17:50:47 tnn Exp $
 
 BUILDLINK_TREE+=       libzdb
 
@@ -8,22 +8,22 @@ LIBZDB_BUILDLINK3_MK:=
 USE_CXX_FEATURES+=     c++17
 
 BUILDLINK_API_DEPENDS.libzdb+= libzdb>=2.6
-BUILDLINK_ABI_DEPENDS.libzdb?= libzdb>=3.2.3nb9
+BUILDLINK_ABI_DEPENDS.libzdb+= libzdb>=3.5.0
 BUILDLINK_PKGSRCDIR.libzdb?=   ../../databases/libzdb
 
 pkgbase := libzdb
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.libzdb:Msqlite)
+.if ${PKG_BUILD_OPTIONS.libzdb:Msqlite}
 .  include "../../databases/sqlite3/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libzdb:Mpgsql)
+.if ${PKG_BUILD_OPTIONS.libzdb:Mpgsql}
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libzdb:Mmysql)
+.if ${PKG_BUILD_OPTIONS.libzdb:Mmysql}
 .  include "../../mk/mysql.buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libzdb:Mssl)
+.if ${PKG_BUILD_OPTIONS.libzdb:Mssl}
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 

Index: pkgsrc/databases/libzdb/distinfo
diff -u pkgsrc/databases/libzdb/distinfo:1.11 pkgsrc/databases/libzdb/distinfo:1.12
--- pkgsrc/databases/libzdb/distinfo:1.11       Fri Oct 28 18:39:24 2022
+++ pkgsrc/databases/libzdb/distinfo    Fri Jan  2 17:50:47 2026
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.11 2022/10/28 18:39:24 he Exp $
+$NetBSD: distinfo,v 1.12 2026/01/02 17:50:47 tnn Exp $
 
-BLAKE2s (libzdb-3.2.3.tar.gz) = 6f8b72d27a90180c4241389852c3bd1f5905c575db6644155810382cfb60ae4c
-SHA512 (libzdb-3.2.3.tar.gz) = 3cf0641a7aabf91fa9bc7ed93bce6fa3e692cad309086e3f899ede443ffdd84ed20dda38fbc48764733537cdc105ae7e555a23cf7bc9b8f99e233787e0271e29
-Size (libzdb-3.2.3.tar.gz) = 771263 bytes
-SHA1 (patch-src_system_Time.c) = e24510cf6acc9f3df4b344a2c3d09f5ebdef729b
-SHA1 (patch-src_util_Str.c) = 81ff5e539772470a9e03029ef4e0cf48e9751b6e
-SHA1 (patch-src_zdbpp.h) = c1dcdc7cea4ed55408107cb3e794ba38430ee4ae
-SHA1 (patch-test_pool.c) = c96b47dc723b7fb7bf5e02cd3cdec49cb66d3656
-SHA1 (patch-test_unit.c) = c7095217e6bf2fa04bb033ae8600fb04d85b4b69
+BLAKE2s (libzdb-3.5.0.tar.gz) = d9ab4d87b6a761200a37b44aace667a0789871bf43379d119282ccac7231c73a
+SHA512 (libzdb-3.5.0.tar.gz) = ddbde199abd153cd72237761bee0d40db22de5f72089573e55296afe7a5de3f9dd2b8e10d3e7d72547843916fb4c9f8c78d967e8e5f8e4f943f679dad9f46cdb
+Size (libzdb-3.5.0.tar.gz) = 1038028 bytes
+SHA1 (patch-src_system_Time.c) = 57062544f3edcf5edccfdf236a271e9bcfa7e395

Index: pkgsrc/databases/libzdb/options.mk
diff -u pkgsrc/databases/libzdb/options.mk:1.1 pkgsrc/databases/libzdb/options.mk:1.2
--- pkgsrc/databases/libzdb/options.mk:1.1      Sun Aug 30 17:41:51 2015
+++ pkgsrc/databases/libzdb/options.mk  Fri Jan  2 17:50:47 2026
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2015/08/30 17:41:51 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2026/01/02 17:50:47 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libzdb
 PKG_SUPPORTED_OPTIONS=         ssl libzdb-sqliteunlock
-PKG_SUGGESTED_OPTIONS=         ssl mysql pgsql sqlite
+PKG_SUGGESTED_OPTIONS=         ssl libzdb-sqliteunlock mysql pgsql sqlite
 PKG_OPTIONS_NONEMPTY_SETS=     database
 PKG_OPTIONS_SET.database=      mysql pgsql sqlite
 
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=      --without-mysql
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-postgresql=${BUILDLINK_PREFIX.postgresql-lib}
+CONFIGURE_ARGS+=       --with-postgresql=${PGSQL_PREFIX}/bin/pg_config
 .else
 CONFIGURE_ARGS+=       --without-postgresql
 .endif
@@ -37,6 +37,9 @@ CONFIGURE_ARGS+=      --with-sqlite=${BUILDLI
 .  if !empty(PKG_OPTIONS:Mlibzdb-sqliteunlock)
 CONFIGURE_ARGS+=       --enable-sqliteunlock
 .  endif
+.  if ${OPSYS} != "Linux"
+BUILDLINK_TRANSFORM+=  rm:-ldl
+.  endif
 .else
 CONFIGURE_ARGS+=       --without-sqlite
 .endif

Index: pkgsrc/databases/libzdb/patches/patch-src_system_Time.c
diff -u pkgsrc/databases/libzdb/patches/patch-src_system_Time.c:1.2 pkgsrc/databases/libzdb/patches/patch-src_system_Time.c:1.3
--- pkgsrc/databases/libzdb/patches/patch-src_system_Time.c:1.2 Fri Oct 28 18:39:25 2022
+++ pkgsrc/databases/libzdb/patches/patch-src_system_Time.c     Fri Jan  2 17:50:48 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_system_Time.c,v 1.2 2022/10/28 18:39:25 he Exp $
+$NetBSD: patch-src_system_Time.c,v 1.3 2026/01/02 17:50:48 tnn Exp $
 
 Fix uses of isxxxx() by casting arg to u_char.
 
---- src/system/Time.c.orig     2020-03-31 22:57:32.000000000 +0000
+--- src/system/Time.c.orig     2025-12-31 16:37:52.418416030 +0000
 +++ src/system/Time.c
-@@ -147,7 +147,7 @@ static inline int _a2i(const char *a, in
+@@ -148,7 +148,7 @@ static inline int _a2i(const char *a, in
  }
  
  static inline int _m2i(const char m[static 3]) {
@@ -13,15 +13,15 @@ Fix uses of isxxxx() by casting arg to u
          static char *months = "janfebmaraprmayjunjulaugsepoctnovdec";
          for (int i = 0; i < 34; i += 3) {
                  if (memcmp(months + i, month, 3) == 0)
-@@ -318,9 +318,9 @@ yy9:
+@@ -312,9 +312,9 @@ yy9:
        { // Timezone: +-HH:MM, +-HH or +-HHMM is offset from UTC in seconds
                          if (have_time) { // Only set timezone if we have parsed time
-                                 tm.TM_GMTOFF = _a2i(token + 1, 2) * 3600;
--                                if (isdigit(token[3]))
-+                                if (isdigit((u_char)token[3]))
-                                         tm.TM_GMTOFF += _a2i(token + 3, 2) * 60;
--                                else if (isdigit(token[4]))
-+                                else if (isdigit((u_char)token[4]))
-                                         tm.TM_GMTOFF += _a2i(token + 4, 2) * 60;
-                                 if (token[0] == '-')
+                                 tm.TM_GMTOFF = _a2i(yytoken + 1, 2) * 3600;
+-                                if (isdigit(yytoken[3]))
++                                if (isdigit((u_char)yytoken[3]))
+                                         tm.TM_GMTOFF += _a2i(yytoken + 3, 2) * 60;
+-                                else if (isdigit(yytoken[4]))
++                                else if (isdigit((u_char)yytoken[4]))
+                                         tm.TM_GMTOFF += _a2i(yytoken + 4, 2) * 60;
+                                 if (yytoken[0] == '-')
                                          tm.TM_GMTOFF *= -1;