<!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>[122535] trunk/dports/x11/xorg-server-devel</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/122535">122535</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-07-23 12:05:00 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server-devel: Possibly work around an XQuartz crash (http://xquartz.macosforge.org/trac/ticket/869)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelPortfile">trunk/dports/x11/xorg-server-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelfiles0001ListenOnOpenFDRemoveResetssincethisisintendedpatch">trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/Portfile (122534 => 122535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/Portfile 2014-07-23 19:04:59 UTC (rev 122534)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2014-07-23 19:05:00 UTC (rev 122535)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> conflicts xorg-server
</span><span class="cx"> set my_name xorg-server
</span><span class="cx"> version 1.16.99.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> 0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
</span><ins>+ 0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
</ins><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span class="cx"> 5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0001ListenOnOpenFDRemoveResetssincethisisintendedpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (0 => 122535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2014-07-23 19:05:00 UTC (rev 122535)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+From 2996b9bff99882f2bcd7eaf5540d2e6eb78fa668 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 23 Jul 2014 11:53:33 -0700
+Subject: [PATCH] ListenOnOpenFD: Remove Resets since this is intended to be
+ for hotplugging connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+pharris says that the resets should not be done in the hotplugging case.
+
+This may fix a crash reported against XQuartz:
+http://xquartz.macosforge.org/trac/ticket/869
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+CC: Peter Harris <pharris@opentext.com>
+CC: Kristian Høgsberg <krh@bitplanet.net>
+---
+ os/connection.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/os/connection.c b/os/connection.c
+index 40d9ff3..f915e12 100644
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
+
+ /* Increment the count */
+ ListenTransCount++;
+-
+- /* This *might* not be needed... /shrug */
+- ResetAuthorization();
+- ResetHosts(display);
+-#ifdef XDMCP
+- XdmcpReset();
+-#endif
+ }
+
+ /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
+--
+2.0.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>