From nobody Wed Mar 30 06:12:02 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3D3AF1A30B83; Wed, 30 Mar 2022 06:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KSx0g1H9Pz4XcY; Wed, 30 Mar 2022 06:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648620723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmogKQXOyiAQAGXq+vf11QMg9UcDV/lpnixAuWLlNZk=; b=IHdHy7mFdEO1FCcjj3qWLu8hemeCzm5xtipB7i3H6mH3IT2O92NeFG9o5wcSP2ZGW84BCk zB5g0Gmeve+8abv/hEMWU9wz4mplOf7am7agv4InkSealSA+4OKow7sU2/F8brfvq59I1j FqP7TZE0VXWTzwQ6sb4Y3/XO6fMEzpRvTO/PmaJq3Te7JB8LiwYztnRdnXmwpJTUAHZ2lm LtfAAoVfZn+1ABeIRkyWCh5ok85eWLg4747ze+jSOLoC9xwaFdaGojreteDOiY0VcXf4gF ApkCvhhoy5ljlfpZU/+Exti6AHihIjV9Qq7nhCAij/umrJnskiXYTxBMxPzO6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C92256CC; Wed, 30 Mar 2022 06:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22U6C2C7046342; Wed, 30 Mar 2022 06:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U6C2AY046341; Wed, 30 Mar 2022 06:12:02 GMT (envelope-from git) Date: Wed, 30 Mar 2022 06:12:02 GMT Message-Id: <202203300612.22U6C2AY046341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 4ca30f86b0f0 - main - dns/fastresolve: Fix build when default version of berkeley db is 18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ca30f86b0f05083d410fa712562cd8de7734a0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648620723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmogKQXOyiAQAGXq+vf11QMg9UcDV/lpnixAuWLlNZk=; b=cpFi4kxVWDqGF8MVi1UiQgw/Hatp2geMGWr8ZLQLZVDDNkbDYYo3NKH6OjKZPf/Szn5HHQ /ZrmflrCFPRwqySb/1KStssIFJGhD+/ZCyqe4XEh+PLLHEjA4o555XGsTaXkTI8ojCK7PE UndoKK+1RNTsweIyK2Djl6petk0fSlyP9iQ25JFqDSdp3rhIYeV1GVx32kZch2nv6Jt1Nl De6sVkXctQnmYowTibA/CVH3ooSIVz4cwnspj4IocRwQ1eq9v6/wtb4yuaWvrd8SvryxOq etXpZlj2WN+pbuxNkX7RvBtKmmA/2wbQ2xn5ZZAVffUoJVMtrFlRr7vXop8cvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648620723; a=rsa-sha256; cv=none; b=fRVxBwZEWenzbTGakXV8zbOvvPGw/fyJOD7kpnWUZ2wol9W6Kp7VSwVxHbpOsfGwznabae Y0bs2rjGYw5Gq+b4dbAuh+GI21M4QYTsuOAFe11+mynqXWJelLdh9nBIWeYN+ZvXqhBnUr ByO3n+BvV+eKjQhBfgF+OmDl72THOxftdjUPKzpu5L8NxSm/+3Ev8jSUjwDmdK6VRlKGiK AttO9Aq38trtkXa2xfgV9gVDvsvKUKsrF4Re0HY7U+Azvf3cbX2FeAnAxxTZdkGlcLZhYA hn5m8fe8TsMTt3nCTe8E/qa4WdzwbFszIvkAp4D+Zie58pb8XxbcBjG1Ji3cGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ca30f86b0f05083d410fa712562cd8de7734a0e commit 4ca30f86b0f05083d410fa712562cd8de7734a0e Author: Yasuhiro Kimura AuthorDate: 2022-02-05 19:14:05 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-03-30 06:10:49 +0000 dns/fastresolve: Fix build when default version of berkeley db is 18 PR: 262138 Approved by: maintainer timeout MFH: 2022Q1 --- 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);