mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 18:16:48 -04:00
4e862d56da
As noted in the libc++ 19 release notes [1], std::char_traits<> is now
only provided for char, char8_t, char16_t, char32_t and wchar_t, and any
instantiation for other types will fail.
This causes databases/mysql80-client to fail to compile with clang 19
and libc++ 19, resulting in errors similar to:
/usr/include/c++/v1/string:820:42: error: implicit instantiation of
undefined template 'std::char_traits<unsigned char>'
820 | static_assert(is_same<_CharT, typename
traits_type::char_type>::value,
| ^
/wrkdirs/usr/ports/databases/mysql80-client/work/mysql-8.0.39/sql/rpl_log_encryption.h:821:14:
note: in instantiation of template class 'std::basic_string<unsigned
char>' requested here
821 | Key_string m_encrypted_password;
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared
here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
`Key_string` is defined as `std::basic_string<unsigned char>`, which is
no longer possible. So redefine it as a `std::vector<unsigned char>`
instead.
This requires only a few small adjustments in other places: replacing
the `length()` method with the equivalent `size()` method, and adjusting
the arguments for the `assign()` method, which for `std::vector` takes a
begin and end iterator, instead of a begin iterator and a size.
[1]
https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 280693
Sponsored by: Netzkommune GmbH
11 lines
508 B
C++
11 lines
508 B
C++
--- sql/stream_cipher.cc.orig 2024-07-12 19:15:25 UTC
|
|
+++ sql/stream_cipher.cc
|
|
@@ -46,7 +46,7 @@ bool Aes_ctr_cipher<TYPE>::open(const Key_string &pass
|
|
m_header_size = header_size;
|
|
#ifdef HAVE_BYTESTOKEY_SHA512_HANDLING
|
|
if (EVP_BytesToKey(Aes_ctr::get_evp_cipher(), Aes_ctr::get_evp_md(), nullptr,
|
|
- password.data(), password.length(), 1, m_file_key,
|
|
+ password.data(), password.size(), 1, m_file_key,
|
|
m_iv) == 0)
|
|
return true;
|
|
#else
|