<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/37229adf23cfae7220920daff2d4fed9c2330217">https://github.com/macports/macports-ports/commit/37229adf23cfae7220920daff2d4fed9c2330217</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 37229adf23cfae7220920daff2d4fed9c2330217
</span>Author: kimura wataru <kimuraw@i.nifty.jp>
AuthorDate: Thu Nov 25 23:52:55 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby30: upgrade to 3.0.3, includes security fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/
</span>---
lang/ruby30/Portfile | 29 ++++++++++++----------
.../ruby30/files/patch-ext-openssl-extconf.rb.diff | 18 +++++++-------
2 files changed, 25 insertions(+), 22 deletions(-)
<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 d6ec81acc59..c59e4caf475 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;'>@@ -6,8 +6,8 @@ PortGroup openssl 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name ruby30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,11 @@ master_sites ruby:3.0
</span> distname ruby-${version}
dist_subdir ruby30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 b973af486291a1e17ad50d88472bfa86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e8d512f1948dc4d59c0ee3a0ef4a2288492b9620 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 e00784956ed2083a40e269d8b14e571b8fae9a0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19941179
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 9ecae293da9547c1438a970f04f64655 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7a01e5e76fea1318d653ac440e50de648139a719 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 049317b7c6246d6ea86564c3f73a629b766ff634 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20242729
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +51,10 @@ select.group ruby
</span> select.file ${filespath}/ruby30
# patch-random.c.diff: fix build error at Lion (#63571)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-random.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # patch-ext-openssl-extconf.rb.diff: fix ext/openssl uses wrong pkgconfig (#63845)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-random.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ext-openssl-extconf.rb.diff
</span> #----------------------------------------------------------------------------------------
# Fix compilation on buildbots for 10.12 and earlier.
# Issue: 62183: error: use of undeclared identifier 'fmt'; did you mean 'fma'?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,8 +73,7 @@ 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:#ffe0e0;'>- --with-openssl-include=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl-lib=[openssl::lib_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openssl-dir=[openssl::install_area] \
</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;'>@@ -104,8 +104,11 @@ if {[info exists build_arch] && ${build_arch} != ""} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # (see rb-bundler) sh "gem build ..." -> sh "gem3.0 build ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/(gem) (build|install|push)/gem3.0 \\2/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite "gem" to "gem3.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # def gem_command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s/(shellsplit .. .)(\"gem\")/\\1\"gem3.0\"/g" \
</span> ${worksrcpath}/lib/bundler/gem_helper.rb
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/files/patch-ext-openssl-extconf.rb.diff b/lang/ruby30/files/patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b3232db8b63..d34baa0da90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/files/patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/files/patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/openssl/extconf.rb.orig 2021-07-07 19:08:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/openssl/extconf.rb 2021-11-08 21:38:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/extconf.rb.orig 2021-11-24 20:12:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/extconf.rb 2021-11-25 22:46:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,9 @@
</span> end
Logging::message "=== Checking for required stuff... ===\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# mkmf#pkg_config() looks to ignore PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+result = nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# mkmf#pkg_config() looks to ignore macports' build.env PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pkg_config_found = false
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if $mingw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append_cflags '-D_FORTIFY_SOURCE=2'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if !pkg_config_found && !find_openssl_library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Logging::message "=== Checking for required stuff failed. ===\n"
</span></pre><pre style='margin:0'>
</pre>