<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/a58658e8b028942a43ff6a855f255fa7f540a912">https://github.com/macports/macports-ports/commit/a58658e8b028942a43ff6a855f255fa7f540a912</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 a58658e8b02 lang/ruby31, ruby30, ruby27: update to 3.1.3, 3.0.5, 2.7.7
</span>a58658e8b02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a58658e8b028942a43ff6a855f255fa7f540a912
</span>Author: kimura wataru <kimuraw@i.nifty.jp>
AuthorDate: Sat Nov 26 00:38:00 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby31, ruby30, ruby27: update to 3.1.3, 3.0.5, 2.7.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update includes security fix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/
</span><span style='display:block; white-space:pre;color:#404040;'> - https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-0-5-released/
</span><span style='display:block; white-space:pre;color:#404040;'> - https://www.ruby-lang.org/en/news/2022/11/24/ruby-2-7-7-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> delete unneeded patch files, related problems are solved.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - 3.1: bundled gems that contains binary extensions cannot build (debug and rbs)
</span><span style='display:block; white-space:pre;color:#404040;'> - 3.0, 2.7: ext/openssl chooses openssl3, ignoring configure options
</span>---
lang/ruby27/Portfile | 14 ++++++--------
.../ruby27/files/patch-ext-openssl-extconf.rb.diff | 13 -------------
lang/ruby30/Portfile | 14 ++++++--------
.../ruby30/files/patch-ext-openssl-extconf.rb.diff | 13 -------------
lang/ruby31/Portfile | 22 +++++++++-------------
.../files/patch-_bundle_gems-extconf.rb.diff | 19 -------------------
6 files changed, 21 insertions(+), 74 deletions(-)
<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 b0f927458e3..743de31e743 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;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span> PortGroup openssl 1.0
name ruby27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.7.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.7
</span> revision 0
categories lang ruby
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,11 @@ use_bzip2 yes
</span> distname ruby-${version}
dist_subdir ruby27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1b6efacb9f129d0253d8a9faa9c21f99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d8860ad734caa6ff325156eeab2c78530d49c3e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 0eb555e5169af2cfcedd2394137f129ddc842cc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6de239d74cf6da09d0c17a116378a866743f5f0a52c9355da26b5d312ca6eed3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14805659
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 63c55e75150251d3ba092b662138e4af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6a4fdf0292259124e6a6a51ddd8b8aa1cbdc0615 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 dfcd86b459a9d4bbdf2d4eb82ad3476cb9820892 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf800820c9e69cdd31a8cdab920391f74ed935db2397a905afabd48961913658 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14850886
</span>
# ruby/openssl does not support openssl-3
openssl.branch 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +60,6 @@ configure.args --enable-shared \
</span> --with-openssl-dir=[openssl::install_area] \
--without-baseruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-ext-openssl-extconf.rb.diff: fix ext/openssl uses wrong pkgconfig (#63845)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ext-openssl-extconf.rb.diff
</span> # patch-random.c.diff: fix build error on 10.7 or 10.8 (#64191)
patchfiles-append patch-random.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/files/patch-ext-openssl-extconf.rb.diff b/lang/ruby27/files/patch-ext-openssl-extconf.rb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6e14de3a07d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/files/patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/openssl/extconf.rb.orig 2021-11-25 23:19:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/openssl/extconf.rb 2021-11-25 23:22:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Logging::message "=== Checking for required stuff... ===\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# mkmf#pkg_config() looks to ignore macports' build.env PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pkg_config_found = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if !pkg_config_found && !find_openssl_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Logging::message "=== Checking for required stuff failed. ===\n"
</span><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 8334868d3d2..5e71b22107e 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,7 +6,7 @@ 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.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.5
</span> revision 0
categories lang ruby
<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 ec9de9a15acc4f205b08816d94267415 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5d8c99dc9e8ca48bae7117216ea690b188ae3209 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9c995a7a5cc3300ea1adb734017545e19d0af3ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21139486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 cdff2395625dc1d632fc5400c8fec103 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f9b5ccef8f9226c3e8e3b84c9b186b5699d5392b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 95e69c79c0cf173f87727b76994ddf0725d5fafc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21312118
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,8 +53,6 @@ select.file ${filespath}/ruby30
</span> # patch-random.c.diff: fix build error at Lion (#63571)
patchfiles patch-random.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-ext-openssl-extconf.rb.diff: fix ext/openssl uses wrong pkgconfig (#63845)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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;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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d34baa0da90..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/openssl/extconf.rb.orig 2021-11-24 20:12:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/openssl/extconf.rb 2021-11-25 22:46:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Logging::message "=== Checking for required stuff... ===\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# mkmf#pkg_config() looks to ignore macports' build.env PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pkg_config_found = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if !pkg_config_found && !find_openssl_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Logging::message "=== Checking for required stuff failed. ===\n"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/Portfile b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11b81f4c38f..9b8182a768c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,11 +10,11 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 14
set ruby_ver 3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruby_patch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 3
</span> set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</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;'>@@ -34,9 +34,9 @@ master_sites ruby:${ruby_ver}
</span> distname ruby-${version}
dist_subdir ruby${ruby_ver_nodot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 544ae8509271263956c0a3d6cb415f2d4e00cdb3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20553628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 39d618260e4d6dcbdb02efa4d6ac20980ff0a090 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20906051
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,13 +84,9 @@ configure.args --enable-shared \
</span> # 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:#ffe0e0;'>-# temporal fix error at destroot "bundled gems" (`make install DESTDIR=path/to`)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.ruby-lang.org/issues/18373
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-_bundle_gems-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix version detection with AvailabilityMacros.h
# future version should be a numeric literal, not a macro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff \
</span> patch-dln.c.diff
# Backport of a fix from ruby32
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,9 +107,9 @@ post-patch {
</span>
# temporal fix error at destroot "bundled gems" (`make install DESTDIR=path/to`)
# https://bugs.ruby-lang.org/issues/18373
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|@@worksrcpath@@|${worksrcpath}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/.bundle/gems/debug-1.4.0/ext/debug/extconf.rb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/.bundle/gems/rbs-2.1.0/ext/rbs_extension/extconf.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# reinplace -E "s|@@worksrcpath@@|${worksrcpath}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${worksrcpath}/.bundle/gems/debug-1.4.0/ext/debug/extconf.rb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${worksrcpath}/.bundle/gems/rbs-2.1.0/ext/rbs_extension/extconf.rb
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/files/patch-_bundle_gems-extconf.rb.diff b/lang/ruby31/files/patch-_bundle_gems-extconf.rb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 836a90d9b37..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby31/files/patch-_bundle_gems-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .bundle/gems/debug-1.4.0/ext/debug/extconf.rb.orig 2021-12-25 21:23:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .bundle/gems/debug-1.4.0/ext/debug/extconf.rb 2021-12-26 22:37:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require 'mkmf'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_relative '../../lib/debug/version'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- File.write("debug_version.h", "#define RUBY_DEBUG_VERSION \"#{DEBUGGER__::VERSION}\"\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$hdrdir = "@@worksrcpath@@/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$arch_hdrdir = "$(hdrdir)/../.ext/include/$(arch)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$DLDFLAGS << " -L#{$top_srcdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_makefile 'debug/debug'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .bundle/gems/rbs-2.1.0/ext/rbs_extension/extconf.rb.orig 2021-12-25 21:23:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .bundle/gems/rbs-2.1.0/ext/rbs_extension/extconf.rb 2021-12-26 22:38:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require 'mkmf'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $INCFLAGS << " -I$(top_srcdir)" if $extmk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$hdrdir = "@@worksrcpath@@/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$arch_hdrdir = "$(hdrdir)/../.ext/include/$(arch)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$DLDFLAGS << " -L#{$top_srcdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_makefile 'rbs_extension'
</span></pre><pre style='margin:0'>
</pre>