<!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>[128053] trunk/dports/mail/gnupg2</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/128053">128053</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2014-11-11 18:40:23 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnupg2: apply patch to support gpg-agent started via launchd. #43584</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailgnupg2Portfile">trunk/dports/mail/gnupg2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmailgnupg2filespatchgpg_agentlaunchddiff">trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailgnupg2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/gnupg2/Portfile (128052 => 128053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/gnupg2/Portfile 2014-11-12 02:40:18 UTC (rev 128052)
+++ trunk/dports/mail/gnupg2/Portfile 2014-11-12 02:40:23 UTC (rev 128053)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> # When updating gnupg2, update gpg-agent also if applicable.
</span><span class="cx"> name gnupg2
</span><span class="cx"> version 2.0.26
</span><ins>+revision 1
</ins><span class="cx"> categories mail security
</span><span class="cx"> maintainers ionic openmaintainer
</span><span class="cx"> license GPL-3+
</span><span class="lines">@@ -57,6 +58,10 @@
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-tests__openpgp__Makefile.in.diff
</span><span class="cx">
</span><ins>+platform darwin {
+ patchfiles-append patch-gpg_agent-launchd.diff
+}
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/common/homedir.c
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmailgnupg2filespatchgpg_agentlaunchddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff (0 => 128053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff (rev 0)
+++ trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff 2014-11-12 02:40:23 UTC (rev 128053)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+--- agent/gpg-agent.c.old 2014-08-10 22:50:59.000000000 +0200
++++ agent/gpg-agent.c 2014-08-10 22:51:26.000000000 +0200
+@@ -2494,6 +2494,7 @@
+ }
+
+ infostr = xstrdup (infostr);
++#ifndef __APPLE__
+ if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
+ {
+ xfree (infostr);
+@@ -2519,6 +2520,10 @@
+ return 0; /* Okay, its running on the standard socket. */
+ return -1;
+ }
++#else
++ pid = 0;
++ prot = 1;
++#endif
+ }
+ else /* MODE != 0 */
+ {
+--- common/asshelp.c.old 2014-08-10 22:50:59.000000000 +0200
++++ common/asshelp.c 2014-08-10 22:51:26.000000000 +0200
+@@ -398,6 +398,7 @@
+ int pid;
+
+ infostr = xstrdup (infostr);
++#ifndef __APPLE__
+ if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
+ {
+ log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
+@@ -418,6 +419,10 @@
+ force_pipe_server = 1;
+ goto restart;
+ }
++#else
++ pid = 0;
++ prot = 1;
++#endif
+
+ err = assuan_socket_connect (ctx, infostr, pid, 0);
+ xfree (infostr);
+--- common/simple-pwquery.c.old 2014-08-10 22:50:59.000000000 +0200
++++ common/simple-pwquery.c 2014-08-10 22:51:26.000000000 +0200
+@@ -345,6 +345,7 @@
+ strcpy (p, infostr);
+ infostr = p;
+
++#ifndef __APPLE__
+ if ( !(p = strchr ( infostr, PATHSEP_C)) || p == infostr
+ || (p-infostr)+1 >= sizeof client_addr.sun_path )
+ {
+@@ -358,6 +359,9 @@
+ while (*p && *p != PATHSEP_C)
+ p++;
+ prot = *p? atoi (p+1) : 0;
++#else
++ prot = 1;
++#endif
+ if ( prot != 1)
+ {
+ #ifdef SPWQ_USE_LOGGING
+--- tools/gpg-connect-agent.c.old 2014-08-10 22:50:59.000000000 +0200
++++ tools/gpg-connect-agent.c 2014-08-10 22:51:26.000000000 +0200
+@@ -2163,6 +2163,7 @@
+ int pid;
+
+ infostr = xstrdup (infostr);
++#ifndef __APPLE__
+ if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
+ {
+ log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
+@@ -2174,6 +2175,11 @@
+ while (*p && *p != PATHSEP_C)
+ p++;
+ prot = *p? atoi (p+1) : 0;
++#else
++ // Currently unused by assuan.
++ pid = 0;
++ prot = 1;
++#endif
+ if (prot != 1)
+ {
+ log_error (_("gpg-agent protocol version %d is not supported\n"),
+--- tools/gpgconf.c.old 2014-08-10 22:50:59.000000000 +0200
++++ tools/gpgconf.c 2014-08-10 22:51:26.000000000 +0200
+@@ -317,6 +317,7 @@
+ char *tmp;
+
+ infostr = xstrdup (infostr);
++#ifndef __APPLE__
+ tmp = strchr (infostr, PATHSEP_C);
+ if (!tmp || tmp == infostr)
+ {
+@@ -325,6 +326,7 @@
+ }
+ else
+ *tmp = 0;
++#endif
+ }
+ fprintf (outfp, "agent-socket:%s\n",
+ infostr? gc_percent_escape (infostr) : "");
</ins></span></pre>
</div>
</div>
</body>
</html>