<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/75efafd53832274209c0457f34dd8ed51f36aeec">https://github.com/macports/macports-ports/commit/75efafd53832274209c0457f34dd8ed51f36aeec</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 75efafd53832274209c0457f34dd8ed51f36aeec
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Sep 2 23:10:46 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> cl-plus-ssl: 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-plus-ssl/Portfile | 11 +++-
lisp/cl-plus-ssl/files/macports-integration.diff | 78 ++++++++++++++++++++++++
2 files changed, 87 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-plus-ssl/Portfile b/lisp/cl-plus-ssl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 827f68fde7b..793c56e43a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lisp/cl-plus-ssl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-plus-ssl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup common_lisp 1.0
</span>
github.setup cl-plus-ssl cl-plus-ssl 17d5cdd65405f1d26e26f3e875e70027d0c8eedb
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 823df477edf37a8ad1aa64a4b67c203380d70873 \
sha256 d3037a4f4593396d17677c7ce19a6900b80eed45e8f56f5547c2de4da9649970 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,8 @@ description A Common Lisp interface to OpenSSL / LibreSSL
</span>
long_description {*}${description}
<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> depends_lib-append port:cl-alexandria \
port:cl-bordeaux-threads \
port:cl-cffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +33,14 @@ depends_lib-append port:cl-alexandria \
</span> port:cl-trivial-sockets \
port:cl-usocket
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# stricly requires OpenSSL 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> # NOTE: cl-coveralls requires a lot of ports and useless here
reinplace {s|(:feature (:or :sbcl :ccl) :cl-coveralls)||} ${worksrcpath}/cl+ssl.test.asd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_OPENSSL_LIB@@|[openssl::lib_dir]|" ${worksrcpath}/src/reload.lisp
</span> }
common_lisp.ffi yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-plus-ssl/files/macports-integration.diff b/lisp/cl-plus-ssl/files/macports-integration.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..778bb3b4257
</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-plus-ssl/files/macports-integration.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/init.lisp src/init.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9dd202a..1997022 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/init.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/init.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,7 +231,7 @@ OpenSSL shared libraries have not changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If they have changed, you may get errors, as users report:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/cl-plus-ssl/cl-plus-ssl/issues/167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (detect-custom-openssl-installations-if-macos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; (detect-custom-openssl-installations-if-macos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (unless (member :cl+ssl-foreign-libs-already-loaded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *features*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cffi:use-foreign-library libcrypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/reload.lisp src/reload.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 05ab883..cff26a3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/reload.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/reload.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (member :darwin *features*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (detect-macos-custom-openssl-installations)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(detect-custom-openssl-installations-if-macos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; (detect-custom-openssl-installations-if-macos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,11 +123,11 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; load them via dlopen will work. This is because macOS ships
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; all system-provided libraries as a single dyld_shared_cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; bundle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.46.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.44.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.42.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.41.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.35.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libcrypto.46.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libcrypto.44.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libcrypto.42.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libcrypto.41.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libcrypto.35.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; The default old system libcrypto, versionless file name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; which may have insufficient crypto and can cause process
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,8 +138,8 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; delete the unversioned paths. Keeping them for a while for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; compatibility. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; https://github.com/cl-plus-ssl/cl-plus-ssl/pull/115
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "libcrypto.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libcrypto.dylib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "libcrypto.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@MACPORTS_OPENSSL_LIB@@/libcrypto.dylib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((and :unix (not :cygwin)) (:or "libcrypto.so.1.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "libcrypto.so.1.0.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "libcrypto.so.3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,16 +162,16 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((:and :darwin :cl+ssl-personalized-install-found) "/usr/local/lib/libssl.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:darwin (:or ;; System-provided libraries, with version in the file name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; See the comment for the libcryto equivalents above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.48.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.46.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.44.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.43.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.35.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libssl.48.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libssl.46.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libssl.44.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libssl.43.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "/usr/lib/libssl.35.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; Default system libssl, versionless file name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; See the coment for the corresponding libcrypto.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "libssl.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/libssl.dylib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; "libssl.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@@MACPORTS_OPENSSL_LIB@@/libssl.dylib"))
</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>