[git] GnuPG - branch, master, updated. gnupg-2.1.3-43-g987532b

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  987532b038a2d9b9e76c0de425ee036ca2bffa1b (commit)
       via  26e2eb98d3d8405b335b43c8e86deacf622cd957 (commit)
      from  d7293cb317acc40cc9e5189cef33fe9d8b47e62a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 987532b038a2d9b9e76c0de425ee036ca2bffa1b
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 11 20:18:08 2015 +0200

    common: Cope with AIX problem on number of open files.
    
    * common/exechelp-posix.c: Limit returned value for too hight values.
    --
    
    GnuPG-bug-id: 1778
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 1a1ff1b..8a2b3b9 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -36,6 +36,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
@@ -114,6 +117,13 @@ get_max_fds (void)
   if (max_fds == -1)
     max_fds = 256;  /* Arbitrary limit.  */
 
+  /* AIX returns INT32_MAX instead of a proper value.  We assume that
+     this is always an error and use an arbitrary limit.  */
+#ifdef INT32_MAX
+  if (max_fds == INT32_MAX)
+    max_fds = 256;
+#endif
+
   return max_fds;
 }
 

commit 26e2eb98d3d8405b335b43c8e86deacf622cd957
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 11 19:38:07 2015 +0200

    gpg-connect-agent: Fix quoting of internal percent+ function.
    
    * tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
    escape '+'.
    --
    
    GnuPG-bug-id: 1841
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index f1d123f..2e00b8f 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -501,8 +501,8 @@ arithmetic_op (int operator, const char *operands)
      percent ARGS
      percent+ ARGS
            Escape the args using the percent style.  Tabs, formfeeds,
-           linefeeds and carriage returns are also escaped.
-           "percent+" also maps spaces to plus characters.
+           linefeeds, carriage return, and the plus sign are also
+           escaped.  "percent+" also maps spaces to plus characters.
 
      errcode ARG
            Assuming ARG is an integer, return the gpg-error code.
@@ -594,12 +594,12 @@ get_var_ext (const char *name)
   else if ( (s - name) == 7 && !strncmp (name, "percent", 7))
     {
       s++;
-      result = percent_escape (s, "\t\r\n\f\v");
+      result = percent_escape (s, "+\t\r\n\f\v");
     }
   else if ( (s - name) == 8 && !strncmp (name, "percent+", 8))
     {
       s++;
-      result = percent_escape (s, "\t\r\n\f\v");
+      result = percent_escape (s, "+\t\r\n\f\v");
       for (p=result; *p; p++)
         if (*p == ' ')
           *p = '+';

-----------------------------------------------------------------------

Summary of changes:
 common/exechelp-posix.c   | 10 ++++++++++
 tools/gpg-connect-agent.c |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org