[122535] trunk/dports/x11/xorg-server-devel

[jeremyhu at macports.org]

Revision: 122535
          https://trac.macports.org/changeset/122535
Author:   jeremyhu at macports.org
Date:     2014-07-23 12:05:00 -0700 (Wed, 23 Jul 2014)
Log Message:
-----------
xorg-server-devel: Possibly work around an XQuartz crash (http://xquartz.macosforge.org/trac/ticket/869)

Modified Paths:
--------------
    trunk/dports/x11/xorg-server-devel/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 conflicts       xorg-server
 set my_name	xorg-server
 version		1.16.99.1
-revision        1
+revision        2
 categories	x11 devel
 license         X11
 maintainers	jeremyhu openmaintainer
@@ -82,6 +82,7 @@
 
 patchfiles \
 	0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
+        0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
 	5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
 	5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
 	5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \

Added: trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch
===================================================================
--- 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)
@@ -0,0 +1,42 @@
+From 2996b9bff99882f2bcd7eaf5540d2e6eb78fa668 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at apple.com>
+CC: Peter Harris <pharris at opentext.com>
+CC: Kristian Høgsberg <krh at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140723/48b82149/attachment.html>