From nobody Thu Aug 29 18:29:53 2024 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 4WvqZT5Jtrz52Nbq; Thu, 29 Aug 2024 18:29:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WvqZT4S6Hz42ln; Thu, 29 Aug 2024 18:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724956193; 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=HS5e30bsrexHlE9MljENoHkeDwYaVWcYUuQLmh4r6cQ=; b=sUnFPwbxsGYK5w33IrG7wHBW7sx9WE672x130eMD2IOeOAq3T39bWWbv+f8+0o72XQX0Dc WapP/Xl2Y/f/nEFuN4Ba7En3RjDxPXT+SG8JTGyV0Gfrn4Nx0519y4n1tWslWH9LiBflJo JcoCUqtaW9xc1u0bEp1u7uPoDy/zEnigjd+dOa+lBS8c0rYT83eh/lULhACXKI///0/+qD TPRyGTDm1pwUIrfQ5ZCNx4FKofZ/4EncoSI6742hZ87vnJG/Y9jh+uUVGfVW1jr5bhEo2I ucQ552jXpQ5nnNiIvvAKty86d5RQK1A63XUL1cHvPusrjN5+yk/HINN9eyVTFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724956193; a=rsa-sha256; cv=none; b=qLoWgCkvoA8CU3Yw4In3Rk3lXXuCZA1CMoDa4i6mbsaWZWUdnfwbK8ngRMP+e0EGKHcXjP nmpkiCAaEzU7N5Z3VqGtkExUB/01TyL7gUCi3d/llURap50y5ys0EMQlSkDzI8egRSxGkD rfTWXsG9aej42whcGBlsPE3JpUaGnMIvDZkdhrN2b7cT1lWUcmq80aujjjc4Suoz8JPAwl 4d1yJEchXBNHE+tYP/cXtlm4erL5pd8sIaoNvdFtiYGhK4+a41Iq++tUTxj5xCnRTUGUcF la71btSnzj0twEWadzPdrHMPgyvSG40J8rLqZ+ddzbJdLjm2M2Nydr0Qenz8bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724956193; 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=HS5e30bsrexHlE9MljENoHkeDwYaVWcYUuQLmh4r6cQ=; b=tYNkx+pH3Mxwt6v0gY1C/LHt1LxbhBSQDFLrtNaOiC3edUhAQ2Q7Bhd4/8X9ddmY9OSQ7H 8sGTw171KO1OFpOFA6EhUfVRpIf2y9BKquZAtOWbTFPFjCHL8tCPz+OBrWicZ5AroTY21Y OzG8CUBoMIghGm3xgFp3fT04OkVtQX7xMoGNw3w1vMagIhwQSao/Hd6smMEZW3bSJMmXKm k3HpEEME7znGVHI2Gkytwzb6Ov1H1FSK17r3xyZ52XxRrdPiSAIfKjM0Tr+rPZ38TlKOD/ vmRrNRF0oRKq8P5CTccX9u0FNuilRNJQ3SDjEZlxxFx7r5g4buxGj1JuTgCrpA== 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 4WvqZT43tGzS9d; Thu, 29 Aug 2024 18:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47TITrn5019271; Thu, 29 Aug 2024 18:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47TITr9k019268; Thu, 29 Aug 2024 18:29:53 GMT (envelope-from git) Date: Thu, 29 Aug 2024 18:29:53 GMT Message-Id: <202408291829.47TITr9k019268@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: f3bf83db9866 - main - net/kea: update patch for building with libc++ 19 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3bf83db98662c18e96e4d6175751c8f38c3e14a Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3bf83db98662c18e96e4d6175751c8f38c3e14a commit f3bf83db98662c18e96e4d6175751c8f38c3e14a Author: Dimitry Andric AuthorDate: 2024-08-29 08:44:30 +0000 Commit: Dimitry Andric CommitDate: 2024-08-29 18:28:19 +0000 net/kea: update patch for building with libc++ 19 In https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2410, Francis Dupont noted there were some errors in the unit tests. These were due to mistakes on my side, so I now made sure all the unit tests pass (they silently require GoogleTest!), and updated the upstream merge request. I hope this goes in soon, but it all seems to take a long time. PR: 281124 Approved by: apevnev@me.com (maintainer) MFH: 2024Q3 --- net/kea/files/patch-src_lib_dns_name.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/kea/files/patch-src_lib_dns_name.cc b/net/kea/files/patch-src_lib_dns_name.cc index 745b4f6f66ca..a22b2eb3998c 100644 --- a/net/kea/files/patch-src_lib_dns_name.cc +++ b/net/kea/files/patch-src_lib_dns_name.cc @@ -23,7 +23,7 @@ // the origin's data ndata_.erase(ndata_.end() - 1); - ndata_.append(origin->ndata_); -+ ndata_.insert(ndata.end(), origin->ndata_.begin(), origin->ndata_.end()); ++ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end()); // Do a similar thing with offsets. However, we need to move them // so they point after the prefix we parsed before. @@ -45,12 +45,13 @@ retname.offsets_.push_back(retname.ndata_.size()); ++rit0; ++rit1; -@@ -662,7 +662,7 @@ Name::split(const unsigned int first, const unsigned i +@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned i // original name, and append the trailing dot explicitly. // retname.ndata_.reserve(retname.offsets_.back() + 1); - retname.ndata_.assign(ndata_, offsets_[first], retname.offsets_.back()); -+ retname.ndata_.assign(ndata_.data() + offsets_[first], ndata_.data() + retname.offsets_.back()); ++ auto it = ndata_.data() + offsets_[first]; ++ retname.ndata_.assign(it, it + retname.offsets_.back()); retname.ndata_.push_back(0); retname.length_ = retname.ndata_.size();