<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/c943c21b053cbf609436b31103f2b8fca071831d">https://github.com/macports/macports-legacy-support/commit/c943c21b053cbf609436b31103f2b8fca071831d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c943c21b053cbf609436b31103f2b8fca071831d
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Feb 7 17:19:18 2025 -0800
<span style='display:block; white-space:pre;color:#404040;'> Narrow CMSG_DATA fix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It was originally assumed that the 64-bit bug in the 10.5 CMSG_DATA
</span><span style='display:block; white-space:pre;color:#404040;'> definition might apply to 10.4 64-bit as well (even though the code
</span><span style='display:block; white-space:pre;color:#404040;'> isn't identical). It wasn't practical to try the real failing case
</span><span style='display:block; white-space:pre;color:#404040;'> (ntpsec's ntpd), so assuming that 10.4 also needed the fix was
</span><span style='display:block; white-space:pre;color:#404040;'> conservative. But a new ntpsec-related test program was able to
</span><span style='display:block; white-space:pre;color:#404040;'> confirm that the bug doesn't exist in 64-bit 10.4, so we narrow the
</span><span style='display:block; white-space:pre;color:#404040;'> applicability of the fix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Test still passes on all platforms.
</span>---
include/MacportsLegacySupport.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/MacportsLegacySupport.h b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 90bb1db..7bb6420 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,8 +171,9 @@
</span> /* <net/if.h> include <sys/socket.h> */
#define __MPLS_SDK_NETIF_SOCKET_FIX__ (__MPLS_SDK_MAJOR < 1090)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* CMSG_DATA definition in <sys/socket.h> */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MPLS_SDK_CMSG_DATA_FIX__ (__MPLS_SDK_MAJOR < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Bad CMSG_DATA definition in 10.5 <sys/socket.h> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_CMSG_DATA_FIX__ (__MPLS_SDK_MAJOR < 1060 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && __MPLS_SDK_MAJOR >= 1050)
</span>
/* stpncpy */
#define __MPLS_SDK_SUPPORT_STPNCPY__ (__MPLS_SDK_MAJOR < 1070)
</pre><pre style='margin:0'>
</pre>