CVS commit: pkgsrc/security/openssl

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Jun  1 16:47:42 UTC 2025

Modified Files:
        pkgsrc/security/openssl: distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-crypto_threads__pthread.c

Log Message:
security/openssl: fix build on ports needing 64-bit atomic assistance...

...which is basically all the 32-bit (ilp32) NetBSD ports.

This is done by fixing the multiple definition of
fallback_atomic_exchange_n_uint64_t() and missing definition of
fallback_atomic_compare_exchange_n_uint64_t().  "int" types used
for the unused memory_order arguments, but didn't want to add
inclusion of and dependence on <stdatomic.h> which defines that enum.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/openssl/patches/patch-crypto_threads__pthread.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.178 pkgsrc/security/openssl/distinfo:1.179
--- pkgsrc/security/openssl/distinfo:1.178      Tue Feb 11 21:27:36 2025
+++ pkgsrc/security/openssl/distinfo    Sun Jun  1 16:47:41 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.178 2025/02/11 21:27:36 wiz Exp $
+$NetBSD: distinfo,v 1.179 2025/06/01 16:47:41 he Exp $
 
 BLAKE2s (openssl-3.4.1.tar.gz) = 58141e2e79adb70da1ef6abfd5d9e992bab873711a01a4bb509916d9527f1aa3
 SHA512 (openssl-3.4.1.tar.gz) = 1de6307c587686711f05d1e96731c43526fa3af51e4cd94c06c880954b67f6eb4c7db3177f0ea5937d41bc1f8cadcf5bce75025b5c1a46a469376960f1001c5f
 Size (openssl-3.4.1.tar.gz) = 18346056 bytes
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = ea9b0a0c8de810362813d84a4f85c5ebdedf9fc6
+SHA1 (patch-crypto_threads__pthread.c) = 70cb743da7738214add4dbde6ff9b9bcd049d3be
 SHA1 (patch-util_perl_OpenSSL_config.pm) = 3ba3c23046bf69c7d348b4c1c8c8269d83cfa2b4

Added files:

Index: pkgsrc/security/openssl/patches/patch-crypto_threads__pthread.c
diff -u /dev/null pkgsrc/security/openssl/patches/patch-crypto_threads__pthread.c:1.1
--- /dev/null   Sun Jun  1 16:47:42 2025
+++ pkgsrc/security/openssl/patches/patch-crypto_threads__pthread.c     Sun Jun  1 16:47:42 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-crypto_threads__pthread.c,v 1.1 2025/06/01 16:47:42 he Exp $
+
+Fix multiple definition of fallback_atomic_exchange_n_uint64_t()
+and missing definition of fallback_atomic_compare_exchange_n_uint64_t().
+
+--- crypto/threads_pthread.c.orig      2025-02-11 14:29:27.000000000 +0000
++++ crypto/threads_pthread.c
+@@ -199,7 +199,7 @@ IMPL_fallback_atomic_exchange_n(prcu_cb_
+ #  define ATOMIC_EXCHANGE_N(t, p, v, o) fallback_atomic_exchange_n_##t(p, v)
+ 
+ #  define IMPL_fallback_atomic_compare_exchange_n(t)                                  \
+-    static ossl_inline int fallback_atomic_compare_exchange_n_##t(t *p, t *e, t d, s, f) \
++    static ossl_inline int fallback_atomic_compare_exchange_n_##t(t *p, t *e, t d, int s, int f) \
+     {                                                                                 \
+         int ret = 1;                                                                 \
+         pthread_mutex_lock(&atomic_sim_lock);                                         \
+@@ -211,7 +211,7 @@ IMPL_fallback_atomic_exchange_n(prcu_cb_
+         return ret;                                                                   \
+     }
+ 
+-IMPL_fallback_atomic_exchange_n(uint64_t)
++IMPL_fallback_atomic_compare_exchange_n(uint64_t)
+ 
+ #  define ATOMIC_COMPARE_EXCHANGE_N(t, p, e, d, s, f) fallback_atomic_compare_exchange_n_##t(p, e, d, s, f)
+