From nobody Wed Mar 30 06:14:50 2022 X-Original-To: dev-commits-ports-all@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 A6C051A31E0F; Wed, 30 Mar 2022 06:14:50 +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 4KSx3t4GCTz4YVR; Wed, 30 Mar 2022 06:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648620890; 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=sJxAg6o3+PV+N219tDzvbf+ZdWGe8M/Mhg4Xr2vjpQQ=; b=TjFGTHdl8e89eOoblcS8MyVzl2oPkJfAXAujth/FMndoexuNyFKYu6FdqSxFj3AtYXzSAV u+XRX1wv7LpO62fxdDlN8ioaNydAIveGNZozkFJv1tP+TFAutOj383GYRt5CRubEcmvhAt lfy39wO4XulsAGkqMKKHFA0syFhJGwpaxHiKa4AUM5g6eIJbwr0Rkc5M8DXrYYr1HtpfBm 93deSNzQszIGa5PGzsm8l5KEdf7F9RnznjG64h5dCQgFqh5sB4V6CuMxJQvEPmD2XS37Ki cbiM9KX5aZklayvk2wXbGLF+3WqKQFim8PRmY9OER+uk43cgqjZvL4l5wLshtA== 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 721F85A59; Wed, 30 Mar 2022 06:14:50 +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 22U6Eorn047430; Wed, 30 Mar 2022 06:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U6EoBF047429; Wed, 30 Mar 2022 06:14:50 GMT (envelope-from git) Date: Wed, 30 Mar 2022 06:14:50 GMT Message-Id: <202203300614.22U6EoBF047429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: c04feb893717 - 2022Q1 - dns/fastresolve: Fix build when default version of berkeley db is 18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: c04feb8937175d5d066a40b3d33957bef0123cd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648620890; 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=sJxAg6o3+PV+N219tDzvbf+ZdWGe8M/Mhg4Xr2vjpQQ=; b=lTvq+EqKyYNDe5YF0zFWHY/yPYxIBuDqYle1GjV5ti8a7yPBEfT98+4CoRk881wYs/DQSQ V/JKmyyyoNJEslgkt+7ScDN9PQ/fsVa2ZPRA3RR6WgjYi9cwq460qenmNVGHPRjt4/6kVj sXTL6VYEjjZKmuYWa0tsR6UV/4tucwBFghSadEJy1NSSOisvMGvukFmeoeaIfgJlRenqCk VqLP87NXo0vT86aVP/9VWcaP7VADjU8WAuytMi532pcjXReEPgbcRDUIrRw5ysbq4EPykN /xBxUWSb9ItVgD6ZrGZ47FSRLZqdHCXwlqSuGEEhLgsTIEjPCDjAOkq+GcKhHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648620890; a=rsa-sha256; cv=none; b=incYEZPz89kwhS8I4TP76YIO/FyqzQtGft1+EmcfBvRZP0rwEBcnR85soUlzADutwntILs itDVecz0v/g9B03hT5pOePbbTy2oxYlCXyfjKXyYospG0qvTYQJ8JnW1NwbNL65BNYM4+I 4NKiBLrOOMkBe271hqNd+vH14o+72tDGfkbRy6Qu6FQZmd0cf9L/0jKyM+7VQtxSr03V3H Sw5d5OSJ4iWjnw4U1QmiYREJhRbxKhZ7LqAEscsZtUsVCBKwW6lOl0yTfA5p+EunFj0+/x Vxu4wJk9eMGvCUPwjIk9JMsHPQ0bc1McwzMSIjzbWl3xPjr6EIFXTTu5jC0/pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c04feb8937175d5d066a40b3d33957bef0123cd1 commit c04feb8937175d5d066a40b3d33957bef0123cd1 Author: Yasuhiro Kimura AuthorDate: 2022-02-05 19:14:05 +0000 Commit: Yasuhiro Kimura 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);