<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/294d7b9e86d52ed9034e3a0ec98d140495630def">https://github.com/macports/macports-ports/commit/294d7b9e86d52ed9034e3a0ec98d140495630def</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 294d7b9e86d botan1: Link only with openssl 1.0
</span>294d7b9e86d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 294d7b9e86d52ed9034e3a0ec98d140495630def
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 12 07:19:23 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> botan1: Link only with openssl 1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't also link with openssl 3. If it's installed, that's unnecessary,
</span><span style='display:block; white-space:pre;color:#404040;'> and if it's not installed, that fails.
</span>---
security/botan1/Portfile | 2 +-
security/botan1/files/patch-botan1-use-openssl10.diff | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan1/Portfile b/security/botan1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa15a58c874..31ac8b56c08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name botan1
version 1.10.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories security devel
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan1/files/patch-botan1-use-openssl10.diff b/security/botan1/files/patch-botan1-use-openssl10.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index af328cdf7f4..a2edd83629e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan1/files/patch-botan1-use-openssl10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan1/files/patch-botan1-use-openssl10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/build-data/cc/clang.txt src/build-data/cc/clang.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dc21a9e..29d772a 100644
</span> --- src/build-data/cc/clang.txt
+++ src/build-data/cc/clang.txt
@@ -6,9 +6,9 @@ binary_name clang++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,12 +8,10 @@ index dc21a9e..29d772a 100644
</span> +add_include_dir_option "-I@@PREFIX@@/include/openssl-1.0 -I"
add_lib_dir_option -L
-add_lib_option -l
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_lib_option "@@PREFIX@@/lib/openssl-1.0/libssl.dylib @@PREFIX@@/lib/openssl-1.0/libcrypto.dylib -l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_lib_option "-L@@PREFIX@@/lib/openssl-1.0 -l"
</span>
lang_flags "-D_REENTRANT -ansi -Wno-long-long"
warning_flags "-W -Wall"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/build-data/cc/gcc.txt src/build-data/cc/gcc.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dd2fef0..3255aee 100644
</span> --- src/build-data/cc/gcc.txt
+++ src/build-data/cc/gcc.txt
@@ -6,9 +6,9 @@ has_tr1 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +22,7 @@ index dd2fef0..3255aee 100644
</span> +add_include_dir_option "-I@@PREFIX@@/include/openssl-1.0 -I"
add_lib_dir_option -L
-add_lib_option -l
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_lib_option "@@PREFIX@@/lib/openssl-1.0/libssl.dylib @@PREFIX@@/lib/openssl-1.0/libcrypto.dylib -l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_lib_option "-L@@PREFIX@@/lib/openssl-1.0 -l"
</span>
lang_flags "-D_REENTRANT -Wno-long-long"
warning_flags "-W -Wall"
</pre><pre style='margin:0'>
</pre>