[git] GnuPG - branch, master, updated. gnupg-2.1.19-27-gb9ab733

[by NIIBE Yutaka]

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  b9ab733fc0dd2ca2a7eaac0bde3a817c07af36c5 (commit)
       via  ce37ada87139ef418401f9f35439007a8c04a856 (commit)
       via  cc933a96f8e83bc66fb69ed33d9593acdd60c929 (commit)
      from  7e19786a5ddef637d1d9d21593fecf5a36b6f372 (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 b9ab733fc0dd2ca2a7eaac0bde3a817c07af36c5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 7 10:42:46 2017 +0900

    common: Fix warning for portability.
    
    * common/localename.c (do_nl_locale_name): We don't use CATEGORY.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/common/localename.c b/common/localename.c
index 2650ea7..b620a74 100644
--- a/common/localename.c
+++ b/common/localename.c
@@ -79,6 +79,7 @@ do_nl_locale_name (int category, const char *categoryname)
   (void)categoryname;
   retval = setlocale (category, NULL);
 # else
+  (void)category;
   /* Setting of LC_ALL overwrites all other.  */
   retval = getenv ("LC_ALL");
   if (retval == NULL || retval[0] == '\0')

commit ce37ada87139ef418401f9f35439007a8c04a856
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 7 10:29:37 2017 +0900

    tools: More portable for openpty use.
    
    * configure.ac (AC_CHECK_HEADERS): Add util.h libutil.h and termios.h.
    * tools/symcryptrun.c: Include those headers.
    
    --
    
    This is for OpenBSD and FreeBSD.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index bec7428..5fc2b85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1274,7 +1274,8 @@ AC_MSG_NOTICE([checking for header files])
 AC_HEADER_STDC
 AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \
                   pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h     \
-                  stdint.h signal.h])
+                  stdint.h signal.h util.h libutil.h termios.h])
+
 AC_HEADER_TIME
 
 
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index a72b9cf..b32d43a 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -71,9 +71,21 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+
 #ifdef HAVE_PTY_H
 #include <pty.h>
+#else
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+#ifdef HAVE_UTIL_H
+#include <util.h>
+#endif
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
 #endif
+#endif
+
 #ifdef HAVE_UTMP_H
 #include <utmp.h>
 #endif

commit cc933a96f8e83bc66fb69ed33d9593acdd60c929
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 7 10:19:40 2017 +0900

    scd: Close THE_EVENT handle.
    
    * scd/scdaemon.c (handle_connections): Close the handle.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 4b63c9b..13cf2e6 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1378,6 +1378,10 @@ handle_connections (int listen_fd)
         }
     }
 
+#ifdef HAVE_W32_SYSTEM
+  if (the_event != INVALID_HANDLE_VALUE)
+    CloseHandle (the_event);
+#endif
   cleanup ();
   log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
   npth_attr_destroy (&tattr);

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

Summary of changes:
 common/localename.c |  1 +
 configure.ac        |  3 ++-
 scd/scdaemon.c      |  4 ++++
 tools/symcryptrun.c | 12 ++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)


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