[138081] trunk/dports/mail/gnupg2
ionic at macports.org
ionic at macports.org
Sat Jun 27 18:13:12 PDT 2015
Revision: 138081
https://trac.macports.org/changeset/138081
Author: ionic at macports.org
Date: 2015-06-27 18:13:12 -0700 (Sat, 27 Jun 2015)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/dports/mail/gnupg2/Portfile
trunk/dports/mail/gnupg2/files/patch-configure.diff
trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff
Modified: trunk/dports/mail/gnupg2/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
# When updating gnupg2, update gpg-agent also if applicable.
name gnupg2
-version 2.0.27
+version 2.0.28
revision 0
categories mail security
maintainers ionic openmaintainer
@@ -26,8 +26,8 @@
use_bzip2 yes
-checksums rmd160 52aaf841339713aef9e2e034b1e045bec31d6322 \
- sha256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2
+checksums rmd160 ba35deebf89284f5e2debc0bd82b229f594d0306 \
+ sha256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c
# gpg-agent is built separately from the rest of gnupg2 to enable gnupg 1.x
# users to use gpg-agent as well.
Modified: trunk/dports/mail/gnupg2/files/patch-configure.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- configure.old 2015-02-24 20:51:25.000000000 +0100
-+++ configure 2015-02-24 20:51:57.000000000 +0100
+--- configure.old 2015-06-27 20:32:13.000000000 +0200
++++ configure 2015-06-27 20:32:32.000000000 +0200
@@ -578,7 +578,7 @@
MAKEFLAGS=
@@ -7,5 +7,5 @@
-PACKAGE_NAME='gnupg'
+PACKAGE_NAME='gnupg2'
PACKAGE_TARNAME='gnupg'
- PACKAGE_VERSION='2.0.27'
- PACKAGE_STRING='gnupg 2.0.27'
+ PACKAGE_VERSION='2.0.28'
+ PACKAGE_STRING='gnupg 2.0.28'
Modified: trunk/dports/mail/gnupg2/files/patch-gpg_agent-launchd.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
}
infostr = xstrdup (infostr);
@@ -8,19 +8,20 @@
if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
{
xfree (infostr);
-@@ -2519,6 +2520,10 @@
+@@ -2528,6 +2529,11 @@
return 0; /* Okay, its running on the standard socket. */
return -1;
}
+#else
-+ pid = 0;
++ // Currently unused by assuan.
++ pid = (pid_t) (-1);
+ 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
+--- common/asshelp.c.old 2015-06-27 20:34:52.000000000 +0200
++++ common/asshelp.c 2015-06-27 21:56:20.000000000 +0200
@@ -398,6 +398,7 @@
int pid;
@@ -29,28 +30,39 @@
if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr)
{
log_error (_("malformed GPG_AGENT_INFO environment variable\n"));
-@@ -418,6 +419,10 @@
+@@ -418,6 +419,11 @@
force_pipe_server = 1;
goto restart;
}
+#else
-+ pid = 0;
++ // Currently unused by assuan.
++ pid = (pid_t) (-1);
+ 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 @@
+--- 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 @@
strcpy (p, infostr);
infostr = p;
+#ifndef __APPLE__
if ( !(p = strchr ( infostr, PATHSEP_C)) || p == infostr
|| (p-infostr)+1 >= sizeof client_addr.sun_path )
++#else
++ if (((p-infostr) + 1) >= sizeof (client_addr.sun_path))
++#endif
{
-@@ -358,6 +359,9 @@
+ #ifdef SPWQ_USE_LOGGING
+ log_error ( _("malformed GPG_AGENT_INFO environment variable\n"));
+ #endif
+ return SPWQ_NO_AGENT;
+ }
++#ifndef __APPLE__
+ *p++ = 0;
+
while (*p && *p != PATHSEP_C)
p++;
prot = *p? atoi (p+1) : 0;
@@ -60,8 +72,8 @@
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
+--- 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
@@ -2163,6 +2163,7 @@
int pid;
@@ -76,14 +88,14 @@
prot = *p? atoi (p+1) : 0;
+#else
+ // Currently unused by assuan.
-+ pid = 0;
++ pid = (pid_t) (-1);
+ 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
+--- tools/gpgconf.c.old 2015-06-27 20:34:53.000000000 +0200
++++ tools/gpgconf.c 2015-06-27 21:03:50.000000000 +0200
@@ -317,6 +317,7 @@
char *tmp;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150627/1b1d3b79/attachment.html>
More information about the macports-changes
mailing list