<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c38f5ce3f10fbbca13892ff86f591bdeb7d098cd">https://github.com/macports/macports-ports/commit/c38f5ce3f10fbbca13892ff86f591bdeb7d098cd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c38f5ce3f10fbbca13892ff86f591bdeb7d098cd
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Fri Nov 1 00:14:27 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> cherokee: use OpenSSL 1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I don't quite understand the +ssl variant. It's not a default
</span><span style='display:block; white-space:pre;color:#404040;'> variant, and cherokee is still built with SSL support without
</span><span style='display:block; white-space:pre;color:#404040;'> +ssl. Also, --enable-tls and --with-openssl have no effects.
</span><span style='display:block; white-space:pre;color:#404040;'> Simply removing that variant and enabling SSL support
</span><span style='display:block; white-space:pre;color:#404040;'> unconditionally is the best fix out of my head.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream has patches for OpenSSL 1.1 [1], while a newer version
</span><span style='display:block; white-space:pre;color:#404040;'> is required for those patches to be applied. On the other hand,
</span><span style='display:block; white-space:pre;color:#404040;'> tarballs for new versions require running ./autogen.sh, where
</span><span style='display:block; white-space:pre;color:#404040;'> a `python2` command in $PATH is requested. That would be a
</span><span style='display:block; white-space:pre;color:#404040;'> headache and I don't plan to invest more time into it.
</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/59544
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/cherokee/webserver/pull/1196
</span>---
www/cherokee/Portfile | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cherokee/Portfile b/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 668f920..b240c63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cherokee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup old_openssl 1.0
</span>
name cherokee
version 1.2.101
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +28,9 @@ depends_lib port:pcre \
</span> port:libgeoip \
port:rrdtool
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure build_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Startup item.
set cherokee_config_name cherokee.conf
set cherokee_config ${prefix}/etc/${name}/${cherokee_config_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,12 +46,6 @@ variant no_startupitem description {Do not create a startup item} {
</span> startupitem.create no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ssl description {Add SSL (HTTPS) support to the server} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-tls=openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl=${prefix}/include/openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant no_ipv6 description {Disable IPv6 support} {
configure.args-append --disable-ipv6
}
</pre><pre style='margin:0'>
</pre>