<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[151547] trunk/dports/lang/perl5</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/151547">151547</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-17 05:37:47 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5: patch for sockets and Sierra (hopefully closes #51327 and #52012)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5Portfile">trunk/dports/lang/perl5/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files522patchdistIOtcachepropagateunixtdiff">trunk/dports/lang/perl5/files/5.22/patch-dist-IO-t-cachepropagate-unix.t.diff</a></li>
<li><a href="#trunkdportslangperl5files524patchdistIOtcachepropagateunixtdiff">trunk/dports/lang/perl5/files/5.24/patch-dist-IO-t-cachepropagate-unix.t.diff</a></li>
<li><a href="#trunkdportslangperl5files524patchdistTimeHiResHiResxsdiff">trunk/dports/lang/perl5/files/5.24/patch-dist-Time-HiRes-HiRes.xs.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/Portfile (151546 => 151547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/Portfile 2016-08-17 12:11:17 UTC (rev 151546)
+++ trunk/dports/lang/perl5/Portfile 2016-08-17 12:37:47 UTC (rev 151547)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> 5.22 2 0 203afca8995ca426db0af48b78eb606b5d24011a f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
</span><span class="cx"> 5.24 0 0 756bf07069e91eabe3dac3a47aec5097d48f8963 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0
</span><span class="cx"> }
</span><del>-# 5.25 0 0 543c60ab51bd0e84e3f04cedbab72077b81f2b9f 70750d287b7a6607c35ab0d2073c78ab7d437eef2f1a78b74afca577605e39f2
</del><ins>+# 5.22 3-RC3 0 24f508e342cb824d96254e91ffd35b09ed740382 9074ac008f11aa5ea3df91a646fa8c23fec37923c729e06a8bc54be4fa710d07
+# 5.24 1-RC3 0 9d055aa3bc92b8cae2a1dd14fd29b7dde1345218 9be39db0b008d2c2d14ae4f6b92418260ce5eb7809a79d729686a0d461b96404
+# 5.25 3 0 268c9c45e4b4f296981be238c11332094fe559b9 0d406dc08717822cfc67937414cf38801ca7101b5a971465b88c0aee005fe823
</ins><span class="cx">
</span><span class="cx"> # NOTE: if you need to revbump perl, please consult with maintainer first
</span><span class="cx"> # to change the configure flags at the same time
</span><span class="lines">@@ -63,6 +65,7 @@
</span><span class="cx"> dist_subdir perl${perl5.major}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><ins>+ # TODO: revise patch naming scheme
</ins><span class="cx"> patchfiles ${perl5.major}/clean-up-paths.patch \
</span><span class="cx"> ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch \
</span><span class="cx"> ${perl5.major}/fix-ld-modification.patch
</span><span class="lines">@@ -78,6 +81,19 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> ${perl5.major}/install-under-short-version-PR43480.patch \
</span><span class="cx"> }
</span><ins>+ if {${perl5.major} >= 5.22} {
+ # failed test
+ # https://trac.macports.org/ticket/51327
+ patchfiles-append \
+ ${perl5.major}/patch-dist-IO-t-cachepropagate-unix.t.diff
+ }
+ if {${perl5.major} == 5.24} {
+ # build error on Sierra (maybe also relevant for other perl versions?)
+ # https://trac.macports.org/ticket/52012
+ patchfiles-append \
+ ${perl5.major}/patch-dist-Time-HiRes-HiRes.xs.diff \
+ ${perl5.major}/patch-dist-IO-t-cachepropagate-unix.t.diff
+ }
</ins><span class="cx">
</span><span class="cx"> # Prevent build from picking up the bind9 port's static libbind, which
</span><span class="cx"> # duplicates symbols from /usr/lib/libdl (r10638).
</span></span></pre></div>
<a id="trunkdportslangperl5files522patchdistIOtcachepropagateunixtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/perl5/files/5.22/patch-dist-IO-t-cachepropagate-unix.t.diff (0 => 151547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/patch-dist-IO-t-cachepropagate-unix.t.diff (rev 0)
+++ trunk/dports/lang/perl5/files/5.22/patch-dist-IO-t-cachepropagate-unix.t.diff 2016-08-17 12:37:47 UTC (rev 151547)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From 4b09738d6af9f9ed8890fd7af0868339e4a3fda9 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 15 Aug 2016 10:39:22 +1000
+Subject: (perl #128095) check pack_sockaddr_un()'s return value
+
+pack_sockaddr_un() silently truncates the supplied path if it won't
+fit into the sun_path member of sockaddr_un.
+
+This may change in the future, but for now check the path in the
+sockaddr matches the desired path, and skip if it doesn't.
+---
+ dist/IO/t/cachepropagate-unix.t | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dist/IO/t/cachepropagate-unix.t b/dist/IO/t/cachepropagate-unix.t
+index e3e438e..20c70dd 100644
+--- dist/IO/t/cachepropagate-unix.t.orig
++++ dist/IO/t/cachepropagate-unix.t
+@@ -14,10 +14,21 @@ use Test::More;
+ plan skip_all => "UNIX domain sockets not implemented on $^O"
+ if ($^O =~ m/^(?:qnx|nto|vos|MSWin32|VMS)$/);
+
+-plan tests => 15;
+-
+ my $socketpath = catfile(tempdir( CLEANUP => 1 ), 'testsock');
+
++# check the socketpath fits in sun_path.
++#
++# pack_sockaddr_un() just truncates the path, this may change, but how
++# it will handle such a condition is undetermined (and we might need
++# to work with older versions of Socket outside of a perl build)
++# https://rt.cpan.org/Ticket/Display.html?id=116819
++
++my $name = eval { pack_sockaddr_un($socketpath) };
++defined $name && (unpack_sockaddr_un($name))[0] eq $socketpath
++ or plan skip_all => "socketpath too long for sockaddr_un";
++
++plan tests => 15;
++
+ # start testing stream sockets:
+ my $listener = IO::Socket::UNIX->new(Type => SOCK_STREAM,
+ Listen => 1,
+--
+2.1.4
+
</ins></span></pre></div>
<a id="trunkdportslangperl5files524patchdistIOtcachepropagateunixtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/perl5/files/5.24/patch-dist-IO-t-cachepropagate-unix.t.diff (0 => 151547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.24/patch-dist-IO-t-cachepropagate-unix.t.diff (rev 0)
+++ trunk/dports/lang/perl5/files/5.24/patch-dist-IO-t-cachepropagate-unix.t.diff 2016-08-17 12:37:47 UTC (rev 151547)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From 4b09738d6af9f9ed8890fd7af0868339e4a3fda9 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 15 Aug 2016 10:39:22 +1000
+Subject: (perl #128095) check pack_sockaddr_un()'s return value
+
+pack_sockaddr_un() silently truncates the supplied path if it won't
+fit into the sun_path member of sockaddr_un.
+
+This may change in the future, but for now check the path in the
+sockaddr matches the desired path, and skip if it doesn't.
+---
+ dist/IO/t/cachepropagate-unix.t | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dist/IO/t/cachepropagate-unix.t b/dist/IO/t/cachepropagate-unix.t
+index e3e438e..20c70dd 100644
+--- dist/IO/t/cachepropagate-unix.t.orig
++++ dist/IO/t/cachepropagate-unix.t
+@@ -14,10 +14,21 @@ use Test::More;
+ plan skip_all => "UNIX domain sockets not implemented on $^O"
+ if ($^O =~ m/^(?:qnx|nto|vos|MSWin32|VMS)$/);
+
+-plan tests => 15;
+-
+ my $socketpath = catfile(tempdir( CLEANUP => 1 ), 'testsock');
+
++# check the socketpath fits in sun_path.
++#
++# pack_sockaddr_un() just truncates the path, this may change, but how
++# it will handle such a condition is undetermined (and we might need
++# to work with older versions of Socket outside of a perl build)
++# https://rt.cpan.org/Ticket/Display.html?id=116819
++
++my $name = eval { pack_sockaddr_un($socketpath) };
++defined $name && (unpack_sockaddr_un($name))[0] eq $socketpath
++ or plan skip_all => "socketpath too long for sockaddr_un";
++
++plan tests => 15;
++
+ # start testing stream sockets:
+ my $listener = IO::Socket::UNIX->new(Type => SOCK_STREAM,
+ Listen => 1,
+--
+2.1.4
+
</ins></span></pre></div>
<a id="trunkdportslangperl5files524patchdistTimeHiResHiResxsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/perl5/files/5.24/patch-dist-Time-HiRes-HiRes.xs.diff (0 => 151547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.24/patch-dist-Time-HiRes-HiRes.xs.diff (rev 0)
+++ trunk/dports/lang/perl5/files/5.24/patch-dist-Time-HiRes-HiRes.xs.diff 2016-08-17 12:37:47 UTC (rev 151547)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+https://trac.macports.org/ticket/52012
+https://github.com/Homebrew/homebrew-core/issues/1957#issuecomment-226850273
+
+--- dist/Time-HiRes/HiRes.xs.orig
++++ dist/Time-HiRes/HiRes.xs
+@@ -940,7 +940,7 @@ BOOT:
+ }
+ # endif
+ #endif
+-#if defined(PERL_DARWIN)
++#if defined(PERL_DARWIN) && !defined(CLOCK_REALTIME)
+ # ifdef USE_ITHREADS
+ MUTEX_INIT(&darwin_time_mutex);
+ # endif
</ins></span></pre>
</div>
</div>
</body>
</html>