From nobody Thu Aug 29 19:01:05 2024 X-Original-To: dev-commits-ports-branches@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 4WvrGV11qcz52RXn; Thu, 29 Aug 2024 19:01:06 +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 4WvrGV0VnZz469j; Thu, 29 Aug 2024 19:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724958066; 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=r1PA4WknhXynQvTMAkMuRQYlrWN3v9lx/wvnxXbICOM=; b=fRx9gAijiTT3w1tFrgDdffqUzP0p18HsLQwPCSkiWl8Bs5LN+cPQwwrzY9h1PJQSR1hLLe SAwto3iodP8WksrAVMHPoYkIH0agMxl3Cy99yQ3CJ7MoHsPHbP1Z52TmiyAl4zNaQRE/70 YpQuO1GgJbZ0EsDZJRM1oLTMV/y4AABVWyDC+wxMkPXEYmjlvYsCCQS8OLonzkEaNaYzwN RkCRfyqO5csyUtt7J+LRq65VR17k37j+Fe86sF3yvDxM3rxg1VLlQ3Jh+GFujOpx2Uf+Fh lcvDb0b2KowuCcicGRhIQZliM30yIX/yLYz6mWehaj3uzbHuWw8701D4OadsIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724958066; a=rsa-sha256; cv=none; b=J7XGpWuyRpB8HuNfDyXyss57kLgpCnR9+k5r3v6pNT1QXj2JKLhMo+1oxsl9wHg0sdd5OY mi634fv+XAg7DEnNESGw+jJkBRSVZFyEBalgD8JnWGIHA56PaO72vKiQwD44BoF+am97aV u9CgB1YXJ2ocMb/nPU/4R3AYzSvqIfeKJFEOPyhPMlFvdw3kyA8u0kd1WPpuyB+z4/JxF4 odb7wqnonH8ltFAmlMGllFbDz8SwiGzsK5Dt/ijLp3gg5jc8vmVeEv8usClhHjbDv/zi0j pEamMYLySDapGRVfU6DCWlNSKgC3erSCpz0zHKMRS1STD+fhSFJhb255mCEKNw== 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=1724958066; 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=r1PA4WknhXynQvTMAkMuRQYlrWN3v9lx/wvnxXbICOM=; b=dqE8Q9Y5B9klQhk1jvwywFub9cAN5OIrj8zDuJLd+m/Mi68qjruR2/4XEi20TVNkJe1E/P SIz3QKtohMHHzr92D4z8OEDSFzmfHpZ3WUYCfrSrHNf/yKP8+umQwrb+R+zRXqwePkx39a MJZjF450JCwjj23b3WaHVKBm9iPbbmljqp3R2C7pZHUXOvxC5d7fR/Ef13i6BwDIDEf+f3 le01d/V6b9oCf6CYrwNqkBJ3dn9NaK/Xc/nzXbQtrieChPtPy0I8d07QxL1jAADlrgIZcy LYEAXzVktSjQADO4X8NtrMW6u1T2N0x00WFyUlkJfFsY4kf7N0Y6Rkk8TdP0rw== 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 4WvrGT6vjGzV77; Thu, 29 Aug 2024 19:01:05 +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 47TJ15Sw080218; Thu, 29 Aug 2024 19:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47TJ15fP080215; Thu, 29 Aug 2024 19:01:05 GMT (envelope-from git) Date: Thu, 29 Aug 2024 19:01:05 GMT Message-Id: <202408291901.47TJ15fP080215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5dc0fd9c632c - 2024Q3 - net/kea: update patch for building with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 5dc0fd9c632c59a024873badffad031113a4527d Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dc0fd9c632c59a024873badffad031113a4527d commit 5dc0fd9c632c59a024873badffad031113a4527d Author: Dimitry Andric AuthorDate: 2024-08-29 08:44:30 +0000 Commit: Dimitry Andric CommitDate: 2024-08-29 19:00:50 +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 (cherry picked from commit f3bf83db98662c18e96e4d6175751c8f38c3e14a) --- 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();