<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6df448ed0cb7b1f9c95adadbc6495b43d03b3a65">https://github.com/macports/macports-ports/commit/6df448ed0cb7b1f9c95adadbc6495b43d03b3a65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6df448ed0cb7b1f9c95adadbc6495b43d03b3a65
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Sep 2 23:23:16 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    cl-async: enforce use MacPorts OpenSSL
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/68074
</span>---
 lisp/cl-async/Portfile                        |  9 +++----
 lisp/cl-async/files/macports-integration.diff | 34 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-async/Portfile b/lisp/cl-async/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52e6394aa91..aef354e8aa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lisp/cl-async/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-async/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup           common_lisp 1.0
</span> 
 github.setup        orthecreedence cl-async 2d9a976f4d011b9ad45b642013caa9ef93cd1582
 version             20230731
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 checksums           rmd160  15e283a2ae724d7b7adfa20ddf35e1318aeee104 \
                     sha256  78d0a4aaec07a1a538e6e9048307525e02b68c17472ad78f1b1a2820dc8a0c04 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,10 @@ description         Asynchronous IO library for Common Lisp.
</span> 
 long_description    {*}${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/opt/local/lib/libssl.dylib|[openssl::lib_dir]/libssl.dylib|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/src/ssl/package.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   macports-integration.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@MACPORTS_OPENSSL_LIB@@|[openssl::lib_dir]|" ${worksrcpath}/src/ssl/package.lisp
</span> }
 
 depends_lib-append  port:cl-babel \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-async/files/macports-integration.diff b/lisp/cl-async/files/macports-integration.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8e669d758b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-async/files/macports-integration.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/ssl/package.lisp src/ssl/package.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e6184b1..9b2cd76 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ssl/package.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ssl/package.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #+(or openbsd linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (progn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (cffi:define-foreign-library libcrypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      (:darwin "@@MACPORTS_OPENSSL_LIB@@/libcrypto.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       (:openbsd "libcrypto.so")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       (:linux (:or "libcrypto.so.1.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "libcrypto.so.1.0.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,13 +70,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ;; (missing TLSv1_[1,2]_XXX methods,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ;; see https://github.com/cl-plus-ssl/cl-plus-ssl/issues/56)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ;; so first try to load possible custom installations of libssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    (:darwin (:or "/opt/local/lib/libssl.dylib" ;; MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "/sw/lib/libssl.dylib"        ;; Fink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "/usr/local/opt/openssl/lib/libssl.dylib" ;; Homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "/opt/homebrew/opt/openssl/lib/libssl.dylib" ;; Homebrew Arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "/usr/local/lib/libssl.dylib" ;; personalized install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "libssl.dylib"                ;; default system libssl, which may have insufficient crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  "/usr/lib/libssl.dylib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    (:darwin (:or "@@MACPORTS_OPENSSL_LIB@@/libssl.dylib" ;; MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "/sw/lib/libssl.dylib"        ;; Fink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "/usr/local/opt/openssl/lib/libssl.dylib" ;; Homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "/opt/homebrew/opt/openssl/lib/libssl.dylib" ;; Homebrew Arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "/usr/local/lib/libssl.dylib" ;; personalized install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "libssl.dylib"                ;; default system libssl, which may have insufficient crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ;; "/usr/lib/libssl.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (:solaris (:or "/lib/64/libssl.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "libssl.so.0.9.8" "libssl.so" "libssl.so.4"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ;; Unlike some other systems, OpenBSD linker,
</span></pre><pre style='margin:0'>

</pre>