<!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>[145936] trunk/dports/sysutils/tmux</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/145936">145936</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-02-21 10:02:08 -0800 (Sun, 21 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>tmux: Backport fix for a bug in attach-session -dt

Maintainer timeout.

Closes: #50623</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilstmuxPortfile">trunk/dports/sysutils/tmux/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilstmuxfilesfixreattachwithsessionlistpatch">trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilstmuxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/tmux/Portfile (145935 => 145936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/tmux/Portfile        2016-02-21 17:52:59 UTC (rev 145935)
+++ trunk/dports/sysutils/tmux/Portfile        2016-02-21 18:02:08 UTC (rev 145936)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> 
</span><span class="cx"> github.setup    tmux tmux 2.1
</span><span class="cx"> if {${subport} eq ${name}} {
</span><del>-    revision        0
</del><ins>+    revision        1
</ins><span class="cx">     conflicts       tmux-devel
</span><span class="cx"> }
</span><span class="cx"> subport tmux-devel {
</span><span class="cx">     github.setup    tmux tmux 7120ab2f161a5762d16aba54451d29dcd0fbbeeb
</span><span class="cx">     version         20150926-[string range ${github.version} 0 6]
</span><del>-    revision        0
</del><ins>+    revision        1
</ins><span class="cx">     conflicts       tmux
</span><span class="cx"> }
</span><span class="cx"> categories      sysutils
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> platforms       darwin
</span><span class="cx"> license         BSD
</span><span class="cx"> 
</span><ins>+patchfiles      fix-reattach-with-session-list.patch
+
</ins><span class="cx"> depends_lib     port:libevent port:ncurses
</span><span class="cx"> 
</span><span class="cx"> if {${subport} eq ${name}} {
</span></span></pre></div>
<a id="trunkdportssysutilstmuxfilesfixreattachwithsessionlistpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch (0 => 145936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch                                (rev 0)
+++ trunk/dports/sysutils/tmux/files/fix-reattach-with-session-list.patch        2016-02-21 18:02:08 UTC (rev 145936)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Detach the right seesion with -d
+
+Fixes a bug that would detach the wrong session when running
+attach-session -dt $sessionname. See
+  https://trac.macports.org/ticket/50623
+for the report. This has been fixed upstream, but the backported patch
+looks different because of changes to upstream source code.
+
+Upstream-Status: Backport [https://github.com/tmux/tmux/commit/f2ec911b8a0bb88d23f16b7d9e0f41f29d4ac541]
+--- cmd-attach-session.c.old        2015-12-21 05:01:35.060975526 -0800
++++ cmd-attach-session.c        2015-12-21 05:01:40.179848875 -0800
+@@ -120,7 +120,7 @@
+                         TAILQ_FOREACH(c_loop, &amp;clients, entry) {
+                                 if (c_loop-&gt;session != s || c == c_loop)
+                                         continue;
+-                                server_write_client(c, MSG_DETACH,
++                                server_write_client(c_loop, MSG_DETACH,
+                                     c_loop-&gt;session-&gt;name,
+                                     strlen(c_loop-&gt;session-&gt;name) + 1);
+                         }
</ins></span></pre>
</div>
</div>

</body>
</html>