<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/4c73bed4b6a5538c6d68f7128604890423b5dbda">https://github.com/macports/macports-ports/commit/4c73bed4b6a5538c6d68f7128604890423b5dbda</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 4c73bed4b6a murk: Use openssl 1.0; link with bz2 dynamically
</span>4c73bed4b6a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c73bed4b6a5538c6d68f7128604890423b5dbda
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jul 26 15:20:09 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> murk: Use openssl 1.0; link with bz2 dynamically
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63299
</span>---
security/murk/Portfile | 21 ++++++++++------
security/murk/files/configure.patch | 49 +++++++++++++++++++++++++++++++++++++
security/murk/files/patch-configure | 11 ---------
3 files changed, 63 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/murk/Portfile b/security/murk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e4e29cf7ef2..4f8d26c0217 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/murk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/murk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup old_openssl 1.0
</span>
name murk
version 0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories security
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,22 +20,28 @@ homepage http://murk.sourceforge.net/
</span> master_sites sourceforge:project/murk/murk/${version}
checksums rmd160 02d4f8784bca9896605df53746516d2c7a7c4015 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0d9a53efe8ab62eea8e1deb0b6c0f3e605573b23a6f1eda4cb71aa3f921a6ea8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d9a53efe8ab62eea8e1deb0b6c0f3e605573b23a6f1eda4cb71aa3f921a6ea8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33220
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ctags
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:bzip2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -I ${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -I ${openssl.includedir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I ${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L ${openssl.libdir} \
</span> -L ${prefix}/lib
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc} [get_canonical_archflags cc]"
</span>
test.run yes
test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/murk/files/configure.patch b/security/murk/files/configure.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8e040fb148c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/murk/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not find things in /usr/local.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Link with bzip2 dynamic library not static library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Link with OpenSSL dynamic library not shared library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2005-03-26 05:21:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-07-26 15:16:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,8 +5,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##### config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STANDARD_LIBDIRS='/lib /usr/lib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_LIBDIRS='-L /usr/local/lib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_INCDIRS='-I /usr/local/include'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_LIBDIRS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_INCDIRS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##### Functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,9 +138,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##### Bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Find the static library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_lib 'libbz2.a'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bz2lib="${find_lib_ret}/libbz2.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Attempt to find the dynamic library first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ "X$all_static" = 'X' ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_lib 'libbz2.dylib' ignore_errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -n "$all_static" -o "X$find_lib_ret" = 'X' ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Try to use the static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_lib 'libbz2.a'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bz2lib="${find_lib_ret}/libbz2.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bz2lib='-lbz2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##### OpenSSL/libcrypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +159,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Attempt to find the dynamic library first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "X$all_static" = 'X' ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_lib 'libcrypto.so' ignore_errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_lib 'libcrypto.dylib' ignore_errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -n "$all_static" -o "X$find_lib_ret" = 'X' ]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/murk/files/patch-configure b/security/murk/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 10634bf2b53..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/murk/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2005-03-26 05:21:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2012-01-02 04:23:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Attempt to find the dynamic library first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X$all_static" = 'X' ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_lib 'libcrypto.so' ignore_errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_lib 'libcrypto.dylib' ignore_errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$all_static" -o "X$find_lib_ret" = 'X' ]
</span></pre><pre style='margin:0'>
</pre>