<!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>[121201] trunk/dports/net/openssh</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/121201">121201</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-06-19 19:01:12 -0700 (Thu, 19 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssh: Update launchd.patch to match similar changes in libxcb</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetopensshPortfile">trunk/dports/net/openssh/Portfile</a></li>
<li><a href="#trunkdportsnetopensshfileslaunchdpatch">trunk/dports/net/openssh/files/launchd.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetopensshPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/openssh/Portfile (121200 => 121201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/Portfile 2014-06-19 21:49:39 UTC (rev 121200)
+++ trunk/dports/net/openssh/Portfile 2014-06-20 02:01:12 UTC (rev 121201)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name openssh
</span><span class="cx"> version 6.6p1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span></span></pre></div>
<a id="trunkdportsnetopensshfileslaunchdpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/openssh/files/launchd.patch (121200 => 121201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/openssh/files/launchd.patch 2014-06-19 21:49:39 UTC (rev 121200)
+++ trunk/dports/net/openssh/files/launchd.patch 2014-06-20 02:01:12 UTC (rev 121201)
</span><span class="lines">@@ -1,48 +1,57 @@
</span><del>---- a/clientloop.c 2014-03-17 00:22:44.000000000 -0700
-+++ b/clientloop.c 2014-03-17 00:29:45.000000000 -0700
-@@ -313,6 +313,11 @@
</del><ins>+diff --git a/clientloop.c b/clientloop.c
+index 59ad3a2..724acf4 100644
+--- a/clientloop.c
++++ b/clientloop.c
+@@ -313,6 +313,10 @@ client_x11_get_proto(const char *display, const char *xauth_path,
</ins><span class="cx"> struct stat st;
</span><span class="cx"> u_int now;
</span><span class="cx">
</span><span class="cx"> +#if __APPLE__
</span><del>-+ char *strptr = NULL;
-+ int is_launchd = 0, len_to_screen = 0;
</del><ins>++ int is_path_to_socket = 0;
</ins><span class="cx"> +#endif /* __APPLE__ */
</span><span class="cx"> +
</span><span class="cx"> xauthdir = xauthfile = NULL;
</span><span class="cx"> *_proto = proto;
</span><span class="cx"> *_data = data;
</span><del>-@@ -328,6 +333,24 @@
</del><ins>+@@ -328,6 +332,32 @@ client_x11_get_proto(const char *display, const char *xauth_path,
</ins><span class="cx"> debug("x11_get_proto: DISPLAY not set");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> +#if __APPLE__
</span><del>-+ /*
-+ * If using launchd socket, then remove the screen number from
-+ * end of $DISPLAY. is_launchd is used later in this function
-+ * to determine if an error should be displayed.
-+ */
-+ if (strncmp(display, "/tmp/launch-", 12) == 0) {
-+ is_launchd = 1;
-+ if (NULL != (strptr = rindex(display, ':')) &&
-+ NULL != (strptr = index(strptr, '.'))) {
-+ debug("x11_get_proto: $DISPLAY is launchd, removing screennum");
-+ len_to_screen = strptr - display;
-+ strlcpy(xdisplay, display, (len_to_screen + 1));
-+ display = xdisplay;
-+ setenv("DISPLAY", display, 1);
</del><ins>++ {
++ /*
++ * If using launchd socket, remove the screen number from the end
++ * of $DISPLAY. is_path_to_socket is used later in this function
++ * to determine if an error should be displayed.
++ */
++ char path[PATH_MAX];
++ struct stat sbuf;
++
++ strlcpy(path, display, sizeof(path));
++ if (0 == stat(path, &sbuf)) {
++ is_path_to_socket = 1;
++ } else {
++ char *dot = strrchr(path, '.');
++ if (dot) {
++ *dot = '\0';
++ /* screen = atoi(dot + 1); */
++ if (0 == stat(path, &sbuf)) {
++ debug("x11_get_proto: $DISPLAY is launchd, removing screennum");
++ setenv("DISPLAY", path, 1);
++ }
++ }
</ins><span class="cx"> + }
</span><span class="cx"> + }
</span><span class="cx"> +#endif /* __APPLE__ */
</span><span class="cx"> /*
</span><span class="cx"> * Handle FamilyLocal case where $DISPLAY does
</span><span class="cx"> * not match an authorization entry. For this we
</span><del>-@@ -407,6 +430,9 @@
</del><ins>+@@ -407,6 +437,9 @@ client_x11_get_proto(const char *display, const char *xauth_path,
</ins><span class="cx"> if (!got_data) {
</span><span class="cx"> u_int32_t rnd = 0;
</span><span class="cx">
</span><span class="cx"> +#if __APPLE__
</span><del>-+ if (!is_launchd)
</del><ins>++ if (!is_path_to_socket)
</ins><span class="cx"> +#endif /* __APPLE__ */
</span><span class="cx"> logit("Warning: No xauth data; "
</span><span class="cx"> "using fake authentication data for X11 forwarding.");
</span></span></pre>
</div>
</div>
</body>
</html>