git: 319b9c0cd355 - main - security/shibboleth-sp: Fix build with clang19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 31 Oct 2024 12:59:00 UTC
The branch main has been updated by girgen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=319b9c0cd3556550f107a1b4d8f083b0eba665b9
commit 319b9c0cd3556550f107a1b4d8f083b0eba665b9
Author: Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2024-10-31 12:56:56 +0000
Commit: Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2024-10-31 12:58:56 +0000
security/shibboleth-sp: Fix build with clang19
There was probably a name space clash between std and xmltooling for
the `char_traits' method.
See also: https://shibboleth.atlassian.net/browse/SSPCPP-998
---
.../files/patch-shibsp_util_IPRange.cpp | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/security/shibboleth-sp/files/patch-shibsp_util_IPRange.cpp b/security/shibboleth-sp/files/patch-shibsp_util_IPRange.cpp
new file mode 100644
index 000000000000..4400421e0e59
--- /dev/null
+++ b/security/shibboleth-sp/files/patch-shibsp_util_IPRange.cpp
@@ -0,0 +1,28 @@
+--- shibsp/util/IPRange.cpp.bak 2024-09-10 19:52:20.000000000 +0000
++++ shibsp/util/IPRange.cpp 2024-10-31 10:12:49.160721000 +0000
+@@ -119,9 +119,9 @@
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "comparing address (%s) to network (%s) with mask (%s)",
+- rawbits.to_string< char, char_traits<char>, allocator<char> >().c_str(),
+- m_network4.to_string< char, char_traits<char>, allocator<char> >().c_str(),
+- m_mask4.to_string< char, char_traits<char>, allocator<char> >().c_str()
++ rawbits.to_string< char, std::char_traits<char>, allocator<char> >().c_str(),
++ m_network4.to_string< char, std::char_traits<char>, allocator<char> >().c_str(),
++ m_mask4.to_string< char, std::char_traits<char>, allocator<char> >().c_str()
+ );
+ }
+ rawbits &= m_mask4;
+@@ -141,9 +141,9 @@
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "comparing address (%s) to network (%s) with mask (%s)",
+- rawbits.to_string< char, char_traits<char>, allocator<char> >().c_str(),
+- m_network6.to_string< char, char_traits<char>, allocator<char> >().c_str(),
+- m_mask6.to_string< char, char_traits<char>, allocator<char> >().c_str()
++ rawbits.to_string< char, std::char_traits<char>, allocator<char> >().c_str(),
++ m_network6.to_string< char, std::char_traits<char>, allocator<char> >().c_str(),
++ m_mask6.to_string< char, std::char_traits<char>, allocator<char> >().c_str()
+ );
+ }
+ rawbits &= m_mask6;