From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 30 Nov 2025 07:40:07 +0000 (+0200)
Subject: tdb: update for compatibility, remove absent maintainer
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8a51592569e9c110a4dc19f8687f053ba7de5d85;p=feed%2Fpackages.git

tdb: update for compatibility, remove absent maintainer

Update to 1.4.14 for compatibility with the current packages infra
(python etc.)

* Refresh patches. Remove old upstream patch
* Remove absent maintainer

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/libs/tdb/Makefile b/libs/tdb/Makefile
index d78043da1d..53c83535ef 100644
--- a/libs/tdb/Makefile
+++ b/libs/tdb/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tdb
-PKG_VERSION:=1.4.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.14
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.samba.org/ftp/tdb/
-PKG_HASH:=c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
+PKG_HASH:=144f407d42ed7a0ec1470a40ef17ad41133fe910bce865dd9fe084d49c907526
 
 PKG_BUILD_DEPENDS:=python3/host
 PKG_INSTALL:=1
@@ -31,7 +31,7 @@ define Package/tdb
   CATEGORY:=Libraries
   TITLE:=Trivial Database
   URL:=http://sourceforge.net/projects/tdb/
-  MAINTAINER:=Dmitry V. Zimin <pfzim@mail.ru>
+  MAINTAINER:=
 endef
 
 define Package/tdb/description
diff --git a/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch b/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch
index 4fe2c66301..c970dc8e5e 100644
--- a/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch
+++ b/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch
@@ -1,6 +1,6 @@
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
-@@ -416,22 +416,13 @@ def configure(conf):
+@@ -441,33 +441,13 @@ def configure(conf):
  
      conf.CHECK_FUNCS('prctl dirname basename')
  
@@ -16,6 +16,17 @@
 -        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
 -                               checklibc=True):
 -            strlcpy_in_bsd = True
+-    elif conf.env.enable_fuzzing:
+-        # Just to complicate it more, some versions of Honggfuzz have
+-        # got strlcpy and strlcat in libc, but not in <string.h>
+-        # (unless it is there coincidentally, on a BSD). Therefore we
+-        # can't use CHECK_FUNCS alone to decide whether to add the
+-        # headers to replace.h.
+-        #
+-        # As this is only known to happen on a fuzzing compiler, we'll
+-        # skip the check when not in fuzzing mode.
+-        conf.CHECK_HEADERS('bsd/string.h')
+-
 -    if not conf.CHECK_FUNCS('getpeereid'):
 -        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 -    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
@@ -29,7 +40,7 @@
  
      conf.CHECK_CODE('''
                  struct ucred cred;
-@@ -808,9 +799,6 @@ def configure(conf):
+@@ -850,9 +830,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL
  
      # look for a method of finding the list of network interfaces
      for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
@@ -39,7 +50,7 @@
          if conf.CHECK_CODE('''
                             #define %s 1
                             #define NO_CONFIG_H 1
-@@ -823,7 +811,7 @@ def configure(conf):
+@@ -865,7 +842,7 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL
                             #include "tests/getifaddrs.c"
                             ''' % method,
                             method,
@@ -48,7 +59,7 @@
                             addmain=False,
                             execute=True):
              break
-@@ -871,7 +859,6 @@ def build(bld):
+@@ -913,7 +890,6 @@ def build(bld):
                  break
  
      extra_libs = ''
diff --git a/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch b/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch
deleted file mode 100644
index 9b8aca00e6..0000000000
--- a/libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: https://gitlab.com/samba-team/samba/-/merge_requests/2374/diffs?commit_id=90bb371863d5a44845f47ebbceeb60842b46eda7
-
-From 79b2f38c27c8df918d8260fe838f55bcf6d3eb73 Mon Sep 17 00:00:00 2001
-From: "Sergey V. Lobanov" <sergey@lobanov.in>
-Date: Thu, 10 Feb 2022 00:02:17 +0300
-Subject: [PATCH] wafsamba: replace 'echo -n' with printf
-
-This patch makes samba_cross.py compatible with old bash (e.g. 3.2)
-
-Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
----
- buildtools/wafsamba/samba_cross.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/buildtools/wafsamba/samba_cross.py
-+++ b/buildtools/wafsamba/samba_cross.py
-@@ -134,7 +134,7 @@ class cross_Popen(Utils.subprocess.Popen
-                 cross_answers_incomplete = True
-                 add_answer(ca_file, msg, ans)
-             (retcode, retstring) = ans
--            args = ['/bin/sh', '-c', "echo -n '%s'; exit %d" % (retstring, retcode)]
-+            args = ['/bin/sh', '-c', "printf '%s'; exit %d" % (retstring, retcode)]
-         real_Popen.__init__(*(obj, args), **kw)
- 
-