diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-03-06 16:43:11 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-08 10:07:21 -0800 |
commit | 3feaaf5424bd1fbfab0db23480af8569d03daa1a (patch) | |
tree | fd5f8eefb39f9bc30dec41a075d2c14c96a8ab3f /meta-networking/recipes-support | |
parent | 9111c760d9baea4e59db0066eb592bba127b5341 (diff) | |
download | meta-openembedded-contrib-3feaaf5424bd1fbfab0db23480af8569d03daa1a.tar.gz |
libtdb: upgrade 1.4.9 -> 1.4.10
0001-tdb-Add-configure-options-for-packages.patch
refreshed for 1.4.10
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r-- | meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch | 39 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb (renamed from meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb) | 2 |
2 files changed, 33 insertions, 8 deletions
diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch index 477b1cec7b..5c811c4686 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch @@ -21,13 +21,16 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> Rebase to 1.4.9 Remove libaio option Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +Rebase to 1.4.10 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - lib/replace/wscript | 79 +++++++++++++++++++++++++++++++++------------ - wscript | 6 ++++ - 2 files changed, 65 insertions(+), 20 deletions(-) + lib/replace/wscript | 101 ++++++++++++++++++++++++++++++-------------- + wscript | 6 +++ + 2 files changed, 76 insertions(+), 31 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 199e636..cb13b62 100644 +index 77e655b..e6d50b3 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,34 @@ def options(opt): @@ -103,7 +106,7 @@ index 199e636..cb13b62 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -443,20 +481,21 @@ def configure(conf): +@@ -443,31 +481,32 @@ def configure(conf): strlcpy_in_bsd = False @@ -112,6 +115,17 @@ index 199e636..cb13b62 100644 - 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'): @@ -127,6 +141,17 @@ index 199e636..cb13b62 100644 + 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'): @@ -140,7 +165,7 @@ index 199e636..cb13b62 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 5e6a928..5443b43 100644 +index 2c587fb..b2164b2 100644 --- a/wscript +++ b/wscript @@ -69,6 +69,12 @@ def options(opt): @@ -157,5 +182,5 @@ index 5e6a928..5443b43 100644 def configure(conf): conf.env.disable_tdb_mutex_locking = getattr(Options.options, -- -2.25.1 +2.34.1 diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb index 9367600351..f23b157e8c 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb @@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "0ac226073e3a2db8648da7af744cb95f50766a52feeb001d558b2b321b74a765" +SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ |