[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.6-38-g007dde9

[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, STABLE-BRANCH-2-2 has been updated
       via  007dde93cc3971cb51d08e8c082e172506ae7f80 (commit)
       via  ddfd39e91a532fd31cd0c20c5d4cf9643acc58bd (commit)
       via  6365338816092845b0e08f25731f8eccc605d042 (commit)
      from  3bd793256e2e4be52075d50ccf2df70c4a2e1a0f (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 007dde93cc3971cb51d08e8c082e172506ae7f80
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 2 18:40:01 2018 +0200

    dirmngr: Implement timeout for dirmngr_ldap under Windows.
    
    * dirmngr/dirmngr_ldap.c (alarm_thread) [W32]: New.
    (set_timeout): Implement for W32.
    --
    
    GnuPG-bug-id: 3937
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index e05c779..8452c3b 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -381,16 +381,56 @@ catch_alarm (int dummy)
 }
 #endif
 
+
+#ifdef HAVE_W32_SYSTEM
+static DWORD CALLBACK
+alarm_thread (void *arg)
+{
+  HANDLE timer = arg;
+
+  WaitForSingleObject (timer, INFINITE);
+  _exit (10);
+
+  return 0;
+}
+#endif
+
+
 static void
 set_timeout (my_opt_t myopt)
 {
+  if (myopt->alarm_timeout)
+    {
 #ifdef HAVE_W32_SYSTEM
-  /* FIXME for W32.  */
-  (void)myopt;
+      static HANDLE timer;
+      LARGE_INTEGER due_time;
+
+      /* A negative value is a relative time.  */
+      due_time.QuadPart = (unsigned long long)-10000000 * myopt->alarm_timeout;
+
+      if (!timer)
+        {
+          SECURITY_ATTRIBUTES sec_attr;
+          DWORD tid;
+
+          memset (&sec_attr, 0, sizeof sec_attr);
+          sec_attr.nLength = sizeof sec_attr;
+          sec_attr.bInheritHandle = FALSE;
+
+          /* Create a manual resetable timer.  */
+          timer = CreateWaitableTimer (NULL, TRUE, NULL);
+          /* Intially set the timer.  */
+          SetWaitableTimer (timer, &due_time, 0, NULL, NULL, 0);
+
+          if (CreateThread (&sec_attr, 0, alarm_thread, timer, 0, &tid))
+            log_error ("failed to create alarm thread\n");
+        }
+      else /* Retrigger the timer.  */
+        SetWaitableTimer (timer, &due_time, 0, NULL, NULL, 0);
 #else
-  if (myopt->alarm_timeout)
-    alarm (myopt->alarm_timeout);
+      alarm (myopt->alarm_timeout);
 #endif
+    }
 }
 
 

commit ddfd39e91a532fd31cd0c20c5d4cf9643acc58bd
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 2 17:06:22 2018 +0200

    build: New configure option to help with nPth debugging.
    
    * configure.ac: Add option --enable-npth-debug
    --
    
    This requires a not yet release nPth version to have an effect.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index f2814dd..e94bd30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -963,6 +963,17 @@ else
 *** we need the support of the New Portable Threads Library.
 ***]])
 fi
+#
+# Enable debugging of nPth
+#
+AC_ARG_ENABLE(npth-debug,
+   AC_HELP_STRING([--enable-npth-debug],
+                  [build with debug version of npth]),
+                  [if test $enableval = yes ; then
+                     AC_DEFINE(NPTH_ENABLE_DEBUG,1,
+                              [Build with debug version of nPth])
+                  fi])
+
 
 
 #

commit 6365338816092845b0e08f25731f8eccc605d042
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 1 19:48:44 2018 +0200

    speedo: Install Spanish translation for Libgpg-error.
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index b89876e..df08fb0 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -743,6 +743,8 @@ Section "-libgpg-error" SEC_libgpg_error
   File share/locale/de/LC_MESSAGES/libgpg-error.mo
   SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
   File share/locale/eo/LC_MESSAGES/libgpg-error.mo
+  SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+  File share/locale/es/LC_MESSAGES/libgpg-error.mo
   SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
   File share/locale/fr/LC_MESSAGES/libgpg-error.mo
   SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
@@ -1249,6 +1251,9 @@ Section "-un.libgpg-error"
   Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\libgpg-error.mo"
   RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\eo"
+  Delete "$INSTDIR\share\locale\es\LC_MESSAGES\libgpg-error.mo"
+  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\es"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libgpg-error.mo"
   RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\fr"

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

Summary of changes:
 build-aux/speedo/w32/inst.nsi |  5 +++++
 configure.ac                  | 11 ++++++++++
 dirmngr/dirmngr_ldap.c        | 48 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 60 insertions(+), 4 deletions(-)


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