<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/ff88854dc602d9aed7bd2559eb5d3d05d418d98a">https://github.com/macports/macports-ports/commit/ff88854dc602d9aed7bd2559eb5d3d05d418d98a</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 ff88854dc60 lang/ruby26: update to 2.6.7 includes security fixes
</span>ff88854dc60 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ff88854dc602d9aed7bd2559eb5d3d05d418d98a
</span>Author: kimura wataru <kimuraw@i.nifty.jp>
AuthorDate: Sat Apr 10 14:27:31 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby26: update to 2.6.7 includes security fixes
</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/2021/04/05/ruby-2-6-7-released/
</span>---
lang/ruby26/Portfile | 17 +++++++++++------
lang/ruby26/files/patch-test-fiddle-helper.rb.diff | 16 ++++++++++++++++
2 files changed, 27 insertions(+), 6 deletions(-)
<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 200429e84db..084964e56c5 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;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup select 1.0
name ruby26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.7
</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;'>@@ -26,10 +26,10 @@ use_bzip2 yes
</span> distname ruby-${version}
dist_subdir ruby26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 abc030870bfbe18ae9c356abebd95cb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1360730a1c81be2a3e869a341f899b50ce10a26d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 62adcc4c465a8790b3df87860551e7ad7d84f23d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f08b779079ecd1498e6a2548c39a86144c6c784dcec6f7e8a93208682eb8306e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 46f24740181f91247c72f19d52334379 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bdda3463189143649b2ff006eac1d9aee1d5310f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 826bcbe83fde9c813a88e5d42155ea8fa6ffb017 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 775a5d47b73ce3ee5d600f993badd7b640a2caca138573326db6632858517710
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,11 +55,16 @@ configure.args --enable-shared \
</span> --with-opt-dir="${prefix}" \
--program-suffix=2.6 \
--with-rubylibprefix="${prefix}/lib/ruby2.6"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid build error with apple clang 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.ruby-lang.org/issues/17777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Wno-error=implicit-function-declaration
</span>
# patch-configure_cxx11.diff: fix "invalid suffix on literal" with C++11
# from RUBY_ARCH and RUBY_PLATFORM in config.h
# https://trac.macports.org/ticket/58255
patchfiles patch-configure_cxx11.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix test failure at ext/fiddle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-test-fiddle-helper.rb.diff
</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;color:#808080;'>diff --git a/lang/ruby26/files/patch-test-fiddle-helper.rb.diff b/lang/ruby26/files/patch-test-fiddle-helper.rb.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b82776745f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/files/patch-test-fiddle-helper.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/fiddle/helper.rb.orig 2021-04-05 20:48:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/fiddle/helper.rb 2021-04-09 22:38:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,6 +95,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://github.com/ruby/fiddle/commit/b9e7c7b6e32088e8e02d952b4240b3665859af6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use libSystem.B.dylib instead of libm.dylib and libc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if RUBY_PLATFORM =~ /darwin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if !libc_so || !libm_so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby = EnvUtil.rubybin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldd = `ldd #{ruby}`
</span></pre><pre style='margin:0'>
</pre>