From: Bjorn Ketelaars <bket@openbsd.org>
Subject: UPDATE databases/tdb-1.4.12
To: ports@openbsd.org
Cc: Ian McWilliam <kaosagnt@gmail.com>
Date: Mon, 2 Sep 2024 19:06:18 +0200

Simple diff for updating databases/tdb to 1.4.12, which is needed for an
update of net/samba.

Tested against the samba update.

Comments / OK?


diff --git Makefile Makefile
index 0cb79630e24..71ee8d7d360 100644
--- Makefile
+++ Makefile
@@ -2,11 +2,10 @@ COMMENT-main=	trivial database library
 COMMENT-python=	Python ${MODPY_VERSION} bindings for tdb
 
 # Keep in sync with the version bundled in net/samba
-V=		1.4.10
+V=		1.4.12
 
 DISTNAME=	tdb-$V
 PKGNAME-python=	py3-${DISTNAME}
-REVISION=	1
 
 MULTI_PACKAGES=	-main -python
 
diff --git distinfo distinfo
index 885f4093736..6471965a4ec 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.10.tar.gz) = AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8=
-SIZE (tdb-1.4.10.tar.gz) = 747139
+SHA256 (tdb-1.4.12.tar.gz) = bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo=
+SIZE (tdb-1.4.12.tar.gz) = 748827
diff --git patches/patch-buildtools_wafsamba_wafsamba_py patches/patch-buildtools_wafsamba_wafsamba_py
index 1a8a28706d2..ae284e72547 100644
--- patches/patch-buildtools_wafsamba_wafsamba_py
+++ patches/patch-buildtools_wafsamba_wafsamba_py
@@ -4,7 +4,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -292,6 +292,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -294,6 +294,13 @@ def SAMBA_LIBRARY(bld, libname, source,
      realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
      link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
  
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
      # we don't want any public libraries without version numbers
      if (not private_library and target_type != 'PYTHON' and not realname):
          if vnum is None and soname is None:
-@@ -408,9 +415,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -410,9 +417,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  
      if pc_files is not None and not private_library:
          if pyembed: