<pre style='margin:0'>
kimura wataru (kimuraw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36878b9a51aa0e184f9c1282c631fbedeac3b05b">https://github.com/macports/macports-ports/commit/36878b9a51aa0e184f9c1282c631fbedeac3b05b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36878b9a51aa0e184f9c1282c631fbedeac3b05b
</span>Author: kimura wataru <kimuraw@i.nifty.jp>
AuthorDate: Sat Nov 6 11:17:03 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby24 .. ruby30: use openssl11 clearly
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> default version of openssl will become 3.
</span><span style='display:block; white-space:pre;color:#404040;'> but current version of ruby/openssl does not support openssl-3.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://github.com/macports/macports-ports/pull/12807
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I tested these changes like this:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'> % port deps ruby24 | grep ssl
</span><span style='display:block; white-space:pre;color:#404040;'> Library Dependencies: readline, zlib, libyaml, libffi, gdbm, openssl11
</span><span style='display:block; white-space:pre;color:#404040;'> % sudo port -nsf -k upgrade ruby24
</span><span style='display:block; white-space:pre;color:#404040;'> % DYLD_PRINT_LIBRARIES=YES ruby2.4 -e 'require "openssl"' |& grep ssl
</span><span style='display:block; white-space:pre;color:#404040;'> dyld: loaded: <22F19195-2D1D-3D46-8530-2B309350B3DD> /opt/local/lib/ruby2.4/2.4.0/x86_64-darwin20/openssl.bundle
</span><span style='display:block; white-space:pre;color:#404040;'> dyld: loaded: <D2533122-B166-35AD-9FA0-E43A5611963B> /opt/local/libexec/openssl11/lib/libssl.1.1.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> dyld: loaded: <F2F6853D-15E9-3382-96B0-BC38A6E2BA30> /opt/local/libexec/openssl11/lib/libcrypto.1.1.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> % cd `port work ruby24`/ruby*
</span><span style='display:block; white-space:pre;color:#404040;'> % sudo chown -R ${USER} .
</span><span style='display:block; white-space:pre;color:#404040;'> % make TESTS=openssl test-all
</span><span style='display:block; white-space:pre;color:#404040;'> :
</span><span style='display:block; white-space:pre;color:#404040;'> Finished tests in 3.903854s, 97.3397 tests/s, 1067.6629 assertions/s.
</span><span style='display:block; white-space:pre;color:#404040;'> 380 tests, 4168 assertions, 0 failures, 0 errors, 2 skips
</span><span style='display:block; white-space:pre;color:#404040;'> % popd
</span><span style='display:block; white-space:pre;color:#404040;'> % sudo port clean ruby24
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> note: ruby23 or earlier uses openssl10.
</span>---
lang/ruby24/Portfile | 17 +++++++++++++----
lang/ruby25/Portfile | 17 +++++++++++++----
lang/ruby26/Portfile | 13 +++++++++----
lang/ruby27/Portfile | 11 ++++++++---
lang/ruby30/Portfile | 11 ++++++++---
5 files changed, 51 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby24/Portfile b/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e17237a3a5d..4770083da00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,15 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup deprecated 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reached EOL on 2020-03-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deprecated.upstream_support no
</span>
name ruby24
version 2.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +53,10 @@ checksums md5 b10a7d2fcaf218c98edbaf57efc36e58 \
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby/openssl does not support openssl-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:zlib \
port:libyaml \
port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +85,9 @@ configure.args --enable-shared \
</span> --without-gmp \
--with-opt-dir="${prefix}" \
--program-suffix=2.4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rubylibprefix="${prefix}/lib/ruby2.4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rubylibprefix="${prefix}/lib/ruby2.4" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-lib=[openssl::lib_dir]
</span>
# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +147,7 @@ post-destroot {
</span> destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby2.4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "
</span> To make this the default Ruby (i.e., the version run by\
the 'ruby' or 'gem' commands), run:
sudo port select --set ruby $name
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby25/Portfile b/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94deddf9616..19a2d7fe70f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby25/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,15 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup deprecated 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reached EOL on 2021-03-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deprecated.upstream_support no
</span>
name ruby25
version 2.5.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +38,10 @@ checksums md5 9e905a545a729af1f1620ddfc2976fe5 \
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby/openssl does not support openssl-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:zlib \
port:libyaml \
port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +87,9 @@ configure.args --enable-shared \
</span> --without-gmp \
--with-opt-dir="${prefix}" \
--program-suffix=2.5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rubylibprefix="${prefix}/lib/ruby2.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rubylibprefix="${prefix}/lib/ruby2.5" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-lib=[openssl::lib_dir]
</span>
# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +140,7 @@ post-destroot {
</span> destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby2.5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "
</span> To make this the default Ruby (i.e., the version run by\
the 'ruby' or 'gem' commands), run:
sudo port select --set ruby $name
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/Portfile b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9bac962705..2b0ff0bf835 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name ruby26
version 2.6.8
<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 lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +35,10 @@ checksums md5 c53761123d17e929cfe248f50429bcab \
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby/openssl does not support openssl-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:zlib \
port:libyaml \
port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +58,9 @@ configure.args --enable-shared \
</span> --without-gmp \
--with-opt-dir="${prefix}" \
--program-suffix=2.6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-rubylibprefix="${prefix}/lib/ruby2.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rubylibprefix="${prefix}/lib/ruby2.6" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-lib=[openssl::lib_dir]
</span>
# patch-configure_cxx11.diff: fix "invalid suffix on literal" with C++11
# from RUBY_ARCH and RUBY_PLATFORM in config.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +124,7 @@ post-destroot {
</span> destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby2.6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "
</span> To make this the default Ruby (i.e., the version run by\
the 'ruby', 'gem' or 'bundle' commands), run:
sudo port select --set ruby $name
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/Portfile b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f583939bec..e28bf62f5b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name ruby27
version 2.7.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +34,10 @@ checksums md5 52705d799ed851dd3bfd5634265cde46 \
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby/openssl does not support openssl-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:zlib \
port:libyaml \
port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +58,8 @@ configure.args --enable-shared \
</span> --with-opt-dir="${prefix}" \
--program-suffix=2.7 \
--with-rubylibprefix="${prefix}/lib/ruby2.7" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-lib=[openssl::lib_dir] \
</span> --without-baseruby
# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +110,7 @@ post-destroot {
</span> destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "
</span> To make this the default Ruby (i.e., the version run by\
the 'ruby', 'gem' or 'bundle' commands), run:
sudo port select --set ruby $name
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/Portfile b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ad635bf416..fbd60e2e5d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name ruby30
version 3.0.2
<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 lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +36,10 @@ checksums md5 b973af486291a1e17ad50d88472bfa86 \
</span> use_parallel_build no
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ruby/openssl does not support openssl-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:zlib \
port:libyaml \
port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +71,8 @@ configure.args --enable-shared \
</span> --with-opt-dir="${prefix}" \
--program-suffix=3.0 \
--with-rubylibprefix="${prefix}/lib/ruby3.0" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-lib=[openssl::lib_dir] \
</span> --without-baseruby
# prefer Apple cctools to GNU binutils, build with binutils may fail.
configure.args-append AR=${prefix}/bin/ar RANLIB=${prefix}/bin/ranlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +122,7 @@ post-destroot {
</span> destroot.keepdirs-append ${destroot}${prefix}/libexec/ruby3.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append "
</span> To make this the default Ruby (i.e., the version run by\
the 'ruby', 'gem' or 'bundle' commands), run:
sudo port select --set ruby $name
</pre><pre style='margin:0'>
</pre>