<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/8503daef84f2f0f74e48f1b2cc5c68ce57720dd9">https://github.com/macports/macports-ports/commit/8503daef84f2f0f74e48f1b2cc5c68ce57720dd9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8503daef84f2f0f74e48f1b2cc5c68ce57720dd9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 3 05:35:21 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> medusa: Update to 2.2 and use openssl 1.0
</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/58983
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59978
</span>---
security/medusa/Portfile | 41 +++++++++++++++---------
security/medusa/files/configure.ac.patch | 38 ++++++++++++++++++++++
security/medusa/files/src_medusa.c.diff | 54 --------------------------------
3 files changed, 64 insertions(+), 69 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/medusa/Portfile b/security/medusa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 575f8c59034..21af85dbc7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/medusa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/medusa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name medusa
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bcbc6337ca54eeec4441252d29ae18cf15283927 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 28bdcbdbc08b904a0e680cc42419c387b5baf86e27dd31e7f6651733ae1f3061 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 399836
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories security net
license {GPL-2 OpenSSLException}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {wohner.eu:normen @Gminfly} openmaintainer
description Medusa is a speedy, massively parallel, modular, login brute-forcer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,20 +31,24 @@ long_description Medusa is intended to be a speedy, massively parallel, \
</span>
homepage http://www.foofus.net/~jmk/medusa/medusa.html
master_sites http://www.foofus.net/~jmk/tools/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0638e4f9e1ce2df6351f98afd7ecdee10a7bbbfc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c8f83f54f76f021f213007c1c83e659f30dd16de84046df2b50e3db2bb6a7ef2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl port:libssh2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libssh2
</span>
livecheck.type regex
livecheck.url ${homepage}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(.*?).tar.gz"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles src_medusa.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We patch configure.ac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span>
# --enable-untested
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-module-svn=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-module-postgres=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-module-rdp=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-svn=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-postgres=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-ssl=[openssl::install_area]
</span>
# All modules end up linked with libsvn_client-1.0.dylib, even if the svn
# module was not requested.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,16 +58,19 @@ if {![variant_isset subversion]} {
</span> }
variant subversion description "Build the Subversion module" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-module-svn=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-module-svn=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-subversion=${prefix}
</span> depends_lib-append port:subversion
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-svn=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-svn=yes
</span> }
variant postgresql description "Build the PostgreSQL module" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-module-postgres=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-module-postgres=yes
</span> depends_lib-append port:postgresql83
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-postgres=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-module-postgres=yes
</span> }
# FIXME check building afpfs-ng, ncp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(.*?)[quotemeta ${extract.suffix}]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/medusa/files/configure.ac.patch b/security/medusa/files/configure.ac.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1c8de91079d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/medusa/files/configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't add weird non-MacPorts paths for freerdp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't claim freerdp support is broken and disabled by default on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+I don't know whether it's broken, but it does build by default and has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to be disabled explicitly. It doesn't build with MacPorts freerdp 2.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2015-11-24 13:16:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2022-01-03 05:25:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -419,17 +419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_module_rdp="false"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module_rdp_headers="false"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl https://ci.freerdp.com - Nightly FreeRDP master builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -d "/opt/freerdp-nightly"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="$CPPFLAGS -I/opt/freerdp-nightly/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="$LDFLAGS -L/opt/freerdp-nightly/lib"
</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;'>+ case "$target" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *apple-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="$LDFLAGS -L/usr/local/lib/freerdp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RDP_LIBS="-lfreerdp -lwinpr -lfreerdp-client -laudin-client -ldisp-client -lecho-client -lrdpei-client -lrdpgfx-client -ltsmf-client -lcliprdr-client -ldrdynvc-client -lencomsp-client -lrail-client -lrdpdr-client -lrdpsnd-client -lremdesk-client -ldrive-client -lparallel-client -lserial-client -lsmartcard-client"
</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;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -532,12 +522,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</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;'>+-case "$target" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *apple-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_MESSAGE([RDP module is currently broken on OS X and disabled by default.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check_module_rdp="false"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING(whether to enable RDP module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE(module-rdp,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/medusa/files/src_medusa.c.diff b/security/medusa/files/src_medusa.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 259832f2bf1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/medusa/files/src_medusa.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/medusa.c.orig 2012-03-02 04:39:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/medusa.c 2012-07-30 22:44:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1438,6 +1438,7 @@ int setPassResult(sLogin *_psLogin, char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutex_unlock(&_psLogin->psServer->ptmMutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1497,6 +1498,7 @@ int addMissedCredSet(sLogin *_psLogin, s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _psLogin->psServer->iCredentialsMissed++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutex_unlock(&_psLogin->psServer->ptmMutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1567,7 +1569,7 @@ void *startLoginThreadPool(void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (errcode != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writeError(ERR_CRITICAL, "Failed to resolve hostname: %s - %s", _psServer->psHost->pHost, gai_strerror(errcode));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res->ai_next != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1609,7 +1611,7 @@ void *startLoginThreadPool(void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( thr_pool_queue(login_pool, startModule, (void *) &modParams[iLoginId]) < 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writeError(ERR_CRITICAL, "Failed to add module launch task to login thread pool for server queue: %d.", _psServer->iId);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1645,7 +1647,7 @@ void *startLoginThreadPool(void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( thr_pool_queue(login_pool, startModule, (void *) &modParams[iLoginId]) < 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- writeError(ERR_CRITICAL, "Failed to add module launch task to login thread pool for server queue: %d.", _psServer->iId);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* wait for login thread pool to finish */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1675,7 +1677,7 @@ void *startLoginThreadPool(void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(_psServer->pHostIP);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>