<!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>[138081] 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/138081">138081</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-06-27 18:13:12 -0700 (Sat, 27 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnupg2: update to 2.0.28. Regenerate and slightly rework patch files.
Also fixes a previously over-looked issue in the simple pwquery
component. Not sure if someone actually uses it, but better make sure we
don't write over random stack or heap data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailgnupg2Portfile">trunk/dports/mail/gnupg2/Portfile</a></li>
<li><a href="#trunkdportsmailgnupg2filespatchconfigurediff">trunk/dports/mail/gnupg2/files/patch-configure.diff</a></li>
<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 (138080 => 138081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/gnupg2/Portfile 2015-06-28 01:13:06 UTC (rev 138080)
+++ trunk/dports/mail/gnupg2/Portfile 2015-06-28 01:13:12 UTC (rev 138081)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> # When updating gnupg2, update gpg-agent also if applicable.
</span><span class="cx"> name gnupg2
</span><del>-version 2.0.27
</del><ins>+version 2.0.28
</ins><span class="cx"> revision 0
</span><span class="cx"> categories mail security
</span><span class="cx"> maintainers ionic openmaintainer
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 52aaf841339713aef9e2e034b1e045bec31d6322 \
- sha256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2
</del><ins>+checksums rmd160 ba35deebf89284f5e2debc0bd82b229f594d0306 \
+ sha256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c
</ins><span class="cx">
</span><span class="cx"> # gpg-agent is built separately from the rest of gnupg2 to enable gnupg 1.x
</span><span class="cx"> # users to use gpg-agent as well.
</span></span></pre></div>
<a id="trunkdportsmailgnupg2filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/gnupg2/files/patch-configure.diff (138080 => 138081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/gnupg2/files/patch-configure.diff 2015-06-28 01:13:06 UTC (rev 138080)
+++ trunk/dports/mail/gnupg2/files/patch-configure.diff 2015-06-28 01:13:12 UTC (rev 138081)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- configure.old 2015-02-24 20:51:25.000000000 +0100
-+++ configure 2015-02-24 20:51:57.000000000 +0100
</del><ins>+--- configure.old 2015-06-27 20:32:13.000000000 +0200
++++ configure 2015-06-27 20:32:32.000000000 +0200
</ins><span class="cx"> @@ -578,7 +578,7 @@
</span><span class="cx"> MAKEFLAGS=
</span><span class="cx">
</span><span class="lines">@@ -7,5 +7,5 @@
</span><span class="cx"> -PACKAGE_NAME='gnupg'
</span><span class="cx"> +PACKAGE_NAME='gnupg2'
</span><span class="cx"> PACKAGE_TARNAME='gnupg'
</span><del>- PACKAGE_VERSION='2.0.27'
- PACKAGE_STRING='gnupg 2.0.27'
</del><ins>+ PACKAGE_VERSION='2.0.28'
+ PACKAGE_STRING='gnupg 2.0.28'
</ins></span></pre></div>
<a id="trunkdportsmailgnupg2filespatchgpg_agentlaunchddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff (138080 => 138081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff 2015-06-28 01:13:06 UTC (rev 138080)
+++ trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff 2015-06-28 01:13:12 UTC (rev 138081)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- agent/gpg-agent.c.old 2015-06-27 20:34:53.000000000 +0200
++++ agent/gpg-agent.c 2015-06-27 21:56:17.000000000 +0200
+@@ -2503,6 +2503,7 @@
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> infostr = xstrdup (infostr);
</span><span class="lines">@@ -8,19 +8,20 @@
</span><span class="cx"> if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
</span><span class="cx"> {
</span><span class="cx"> xfree (infostr);
</span><del>-@@ -2519,6 +2520,10 @@
</del><ins>+@@ -2528,6 +2529,11 @@
</ins><span class="cx"> return 0; /* Okay, its running on the standard socket. */
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx"> +#else
</span><del>-+ pid = 0;
</del><ins>++ // Currently unused by assuan.
++ pid = (pid_t) (-1);
</ins><span class="cx"> + prot = 1;
</span><span class="cx"> +#endif
</span><span class="cx"> }
</span><span class="cx"> else /* MODE != 0 */
</span><span class="cx"> {
</span><del>---- common/asshelp.c.old 2014-08-10 22:50:59.000000000 +0200
-+++ common/asshelp.c 2014-08-10 22:51:26.000000000 +0200
</del><ins>+--- common/asshelp.c.old 2015-06-27 20:34:52.000000000 +0200
++++ common/asshelp.c 2015-06-27 21:56:20.000000000 +0200
</ins><span class="cx"> @@ -398,6 +398,7 @@
</span><span class="cx"> int pid;
</span><span class="cx">
</span><span class="lines">@@ -29,28 +30,39 @@
</span><span class="cx"> if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
</span><span class="cx"> {
</span><span class="cx"> log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
</span><del>-@@ -418,6 +419,10 @@
</del><ins>+@@ -418,6 +419,11 @@
</ins><span class="cx"> force_pipe_server = 1;
</span><span class="cx"> goto restart;
</span><span class="cx"> }
</span><span class="cx"> +#else
</span><del>-+ pid = 0;
</del><ins>++ // Currently unused by assuan.
++ pid = (pid_t) (-1);
</ins><span class="cx"> + prot = 1;
</span><span class="cx"> +#endif
</span><span class="cx">
</span><span class="cx"> err = assuan_socket_connect (ctx, infostr, pid, 0);
</span><span class="cx"> xfree (infostr);
</span><del>---- 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 @@
</del><ins>+--- common/simple-pwquery.c.old 2015-06-27 20:34:52.000000000 +0200
++++ common/simple-pwquery.c 2015-06-27 21:55:50.000000000 +0200
+@@ -345,19 +345,27 @@
</ins><span class="cx"> strcpy (p, infostr);
</span><span class="cx"> infostr = p;
</span><span class="cx">
</span><span class="cx"> +#ifndef __APPLE__
</span><span class="cx"> if ( !(p = strchr ( infostr, PATHSEP_C)) || p == infostr
</span><span class="cx"> || (p-infostr)+1 >= sizeof client_addr.sun_path )
</span><ins>++#else
++ if (((p-infostr) + 1) >= sizeof (client_addr.sun_path))
++#endif
</ins><span class="cx"> {
</span><del>-@@ -358,6 +359,9 @@
</del><ins>+ #ifdef SPWQ_USE_LOGGING
+ log_error ( _("malformed GPG_AGENT_INFO environment variable\n"));
+ #endif
+ return SPWQ_NO_AGENT;
+ }
++#ifndef __APPLE__
+ *p++ = 0;
+
</ins><span class="cx"> while (*p && *p != PATHSEP_C)
</span><span class="cx"> p++;
</span><span class="cx"> prot = *p? atoi (p+1) : 0;
</span><span class="lines">@@ -60,8 +72,8 @@
</span><span class="cx"> if ( prot != 1)
</span><span class="cx"> {
</span><span class="cx"> #ifdef SPWQ_USE_LOGGING
</span><del>---- 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
</del><ins>+--- tools/gpg-connect-agent.c.old 2015-06-27 20:34:53.000000000 +0200
++++ tools/gpg-connect-agent.c 2015-06-27 21:54:35.000000000 +0200
</ins><span class="cx"> @@ -2163,6 +2163,7 @@
</span><span class="cx"> int pid;
</span><span class="cx">
</span><span class="lines">@@ -76,14 +88,14 @@
</span><span class="cx"> prot = *p? atoi (p+1) : 0;
</span><span class="cx"> +#else
</span><span class="cx"> + // Currently unused by assuan.
</span><del>-+ pid = 0;
</del><ins>++ pid = (pid_t) (-1);
</ins><span class="cx"> + prot = 1;
</span><span class="cx"> +#endif
</span><span class="cx"> if (prot != 1)
</span><span class="cx"> {
</span><span class="cx"> log_error (_("gpg-agent protocol version %d is not supported\n"),
</span><del>---- tools/gpgconf.c.old 2014-08-10 22:50:59.000000000 +0200
-+++ tools/gpgconf.c 2014-08-10 22:51:26.000000000 +0200
</del><ins>+--- tools/gpgconf.c.old 2015-06-27 20:34:53.000000000 +0200
++++ tools/gpgconf.c 2015-06-27 21:03:50.000000000 +0200
</ins><span class="cx"> @@ -317,6 +317,7 @@
</span><span class="cx"> char *tmp;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>