Date: Wed, 30 Mar 2022 06:14:50 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: c04feb893717 - 2022Q1 - dns/fastresolve: Fix build when default version of berkeley db is 18 Message-ID: <202203300614.22U6EoBF047429@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c04feb8937175d5d066a40b3d33957bef0123cd1 commit c04feb8937175d5d066a40b3d33957bef0123cd1 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2022-02-05 19:14:05 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2022-03-30 06:14:13 +0000 dns/fastresolve: Fix build when default version of berkeley db is 18 PR: 262138 Approved by: maintainer timeout MFH: 2022Q1 (cherry picked from commit 4ca30f86b0f05083d410fa712562cd8de7734a0e) --- dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc b/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc index 53d15eff0c29..dd2bde9c77a9 100644 --- a/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc +++ b/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc @@ -1,6 +1,16 @@ --- dns-terror/DatedStringDb.cc.orig 2003-05-17 18:14:35 UTC +++ dns-terror/DatedStringDb.cc -@@ -69,7 +69,11 @@ DatedStringDb::DatedStringDb(const char +@@ -63,13 +63,21 @@ using namespace std; + DatedStringDb::DatedStringDb(const char *dbhome, const char *storename) + { + #if DB_VERSION_MAJOR >= 3 ++#if DB_VERSION_MAJOR >= 5 ++ env = new DbEnv((u_int32_t) 0); ++#else + env = new DbEnv(0); ++#endif + env->set_error_stream(&cerr); + env->set_errpfx(storename ? storename : "DatedStringDb"); env->set_cachesize(0, MPOOL_SIZE, 0); env->open(dbhome, DB_CREATE|DB_INIT_MPOOL|DB_PRIVATE, 0644); db = new Db(env, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203300614.22U6EoBF047429>