<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad88b48e2bb1e6d3e96b810446faaf7edc361d92">https://github.com/macports/macports-ports/commit/ad88b48e2bb1e6d3e96b810446faaf7edc361d92</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ad88b48e2bb1e6d3e96b810446faaf7edc361d92
</span>Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
AuthorDate: Tue Aug 6 09:13:33 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> rxvt-unicode: use perl 5.28
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch, backported from urxvt cvs, fixes a potential assertion
</span><span style='display:block; white-space:pre;color:#404040;'> failure inside libperl 5.28 and later:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/Perl/perl5/commit/cc85e83f9e22c43fcb37b072c8d9d20a3e8d9a64
</span>---
x11/rxvt-unicode/Portfile | 12 ++++++------
x11/rxvt-unicode/files/patch-perl-5.28-compat.diff | 15 +++++++++++++++
2 files changed, 21 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/rxvt-unicode/Portfile b/x11/rxvt-unicode/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6a6bcc..8e2c5b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/rxvt-unicode/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/rxvt-unicode/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name rxvt-unicode
version 9.22
<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 x11
license GPL-3+
maintainers {gmail.com:emanuele.giaquinta @exg} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,16 +36,16 @@ depends_lib \
</span> port:startup-notification \
port:xorg-libXmu \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/perl:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5.28
</span>
# clang++ 3.0 produces unstable urxvt binary which sometimes causes errors like:
# "terminate called throwing an exceptionAbort trap: 6"
compiler.blacklist {clang < 318}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl5.28
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-perl-5.28-compat.diff \
</span> CVE-2017-7483.patch
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ variant pixbuf description {gdk-pixbuf support} {
</span> variant lite description {lightweight build options} {
depends_lib-delete port:Xft2 \
port:startup-notification \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/perl:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5.28
</span> depends_lib-append port:xorg-libX11
configure.args-delete --enable-everything
configure.args-append --disable-everything \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/rxvt-unicode/files/patch-perl-5.28-compat.diff b/x11/rxvt-unicode/files/patch-perl-5.28-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..516b47c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/rxvt-unicode/files/patch-perl-5.28-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/rxvtperl.xs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/rxvtperl.xs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -401,9 +401,10 @@ rxvt_perl_interp::init ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " unshift @INC, '" LIBDIR "';"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "use urxvt;"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "use urxvt;",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int argc = ecb_array_length (args);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int argc = ecb_array_length (args) - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv = args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL_SYS_INIT3 (&argc, &argv, &environ);
</span></pre><pre style='margin:0'>
</pre>