Skip to content

Commit 8a51592

Browse files
committed
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 <[email protected]>
1 parent 6469f06 commit 8a51592

File tree

3 files changed

+19
-33
lines changed

3 files changed

+19
-33
lines changed

libs/tdb/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=tdb
11-
PKG_VERSION:=1.4.3
12-
PKG_RELEASE:=2
11+
PKG_VERSION:=1.4.14
12+
PKG_RELEASE:=1
1313
PKG_LICENSE:=GPL-2.0
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://www.samba.org/ftp/tdb/
17-
PKG_HASH:=c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
17+
PKG_HASH:=144f407d42ed7a0ec1470a40ef17ad41133fe910bce865dd9fe084d49c907526
1818

1919
PKG_BUILD_DEPENDS:=python3/host
2020
PKG_INSTALL:=1
@@ -31,7 +31,7 @@ define Package/tdb
3131
CATEGORY:=Libraries
3232
TITLE:=Trivial Database
3333
URL:=http://sourceforge.net/projects/tdb/
34-
MAINTAINER:=Dmitry V. Zimin <[email protected]>
34+
MAINTAINER:=
3535
endef
3636

3737
define Package/tdb/description

libs/tdb/patches/100-Remove_libbsd_dependency_check.patch

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/lib/replace/wscript
22
+++ b/lib/replace/wscript
3-
@@ -416,22 +416,13 @@ def configure(conf):
3+
@@ -441,33 +441,13 @@ def configure(conf):
44

55
conf.CHECK_FUNCS('prctl dirname basename')
66

@@ -16,6 +16,17 @@
1616
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
1717
- checklibc=True):
1818
- strlcpy_in_bsd = True
19+
- elif conf.env.enable_fuzzing:
20+
- # Just to complicate it more, some versions of Honggfuzz have
21+
- # got strlcpy and strlcat in libc, but not in <string.h>
22+
- # (unless it is there coincidentally, on a BSD). Therefore we
23+
- # can't use CHECK_FUNCS alone to decide whether to add the
24+
- # headers to replace.h.
25+
- #
26+
- # As this is only known to happen on a fuzzing compiler, we'll
27+
- # skip the check when not in fuzzing mode.
28+
- conf.CHECK_HEADERS('bsd/string.h')
29+
-
1930
- if not conf.CHECK_FUNCS('getpeereid'):
2031
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
2132
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
@@ -29,7 +40,7 @@
2940

3041
conf.CHECK_CODE('''
3142
struct ucred cred;
32-
@@ -808,9 +799,6 @@ def configure(conf):
43+
@@ -850,9 +830,6 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL
3344

3445
# look for a method of finding the list of network interfaces
3546
for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
@@ -39,7 +50,7 @@
3950
if conf.CHECK_CODE('''
4051
#define %s 1
4152
#define NO_CONFIG_H 1
42-
@@ -823,7 +811,7 @@ def configure(conf):
53+
@@ -865,7 +842,7 @@ syscall(SYS_copy_file_range,0,NULL,0,NUL
4354
#include "tests/getifaddrs.c"
4455
''' % method,
4556
method,
@@ -48,7 +59,7 @@
4859
addmain=False,
4960
execute=True):
5061
break
51-
@@ -871,7 +859,6 @@ def build(bld):
62+
@@ -913,7 +890,6 @@ def build(bld):
5263
break
5364

5465
extra_libs = ''

libs/tdb/patches/101_wafsamba-replace-echo-n-with-printf.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)