diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2024-08-29 08:44:30 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-08-29 18:28:19 +0000 |
| commit | f3bf83db98662c18e96e4d6175751c8f38c3e14a (patch) | |
| tree | 58ce7cd1ff05bb16e958ce1a1539b38b39d5521e | |
| parent | 4453cf7eef05f9ac2b27bda7a87afb7da713f1c4 (diff) | |
| download | ports-f3bf83db98662c18e96e4d6175751c8f38c3e14a.tar.gz ports-f3bf83db98662c18e96e4d6175751c8f38c3e14a.zip | |
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
| -rw-r--r-- | net/kea/files/patch-src_lib_dns_name.cc | 7 |
1 files 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(); |