[git] GnuPG - branch, master, updated. gnupg-2.1.15-393-g833eef9

[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  833eef974ad4721b9b3e247bae9c890476a936ce (commit)
       via  b3a917201207898059c048dd101344765201b03c (commit)
      from  b2e1b17efa952afcf7aeec8b15e9d0088dba587a (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 833eef974ad4721b9b3e247bae9c890476a936ce
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 18 08:28:15 2016 +0100

    dirmngr: Use a longer timer tick interval.
    
    * dirmngr/dirmngr.c (TIMERTICK_INTERVAL): Always use 60 seconds like
    we did for WindowsCE.
    --
    
    Given that the timer tick is only used for housekeeping tasks and
    these are done every 10 minutes, it makes no sense to use 2 seconds.
    The minor drawback is tha the housekeeping may be delayed by one
    minute.
    
    NB: For the purpose of power saving, we already make sure that the
    process wakes up at the full second so that it is synchronized to the
    wakeup time of other processes.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 2a6729e..7214d49 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -296,17 +296,10 @@ static int active_connections;
  * thread to run background network tasks.  */
 static int network_activity_seen;
 
-/* The timer tick used for housekeeping stuff.  For Windows we use a
-   longer period as the SetWaitableTimer seems to signal earlier than
-   the 2 seconds.  All values are in seconds. */
-#if defined(HAVE_W32CE_SYSTEM)
-# define TIMERTICK_INTERVAL         (60)
-#elif defined(HAVE_W32_SYSTEM)
-# define TIMERTICK_INTERVAL          (4)
-#else
-# define TIMERTICK_INTERVAL          (2)
-#endif
+/* The timer tick used for housekeeping stuff.  */
+#define TIMERTICK_INTERVAL         (60)
 
+/* How oft to run the housekeeping.  */
 #define HOUSEKEEPING_INTERVAL      (600)
 
 

commit b3a917201207898059c048dd101344765201b03c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Oct 31 20:33:02 2016 -0400

    dirmngr: More w32 system daemon cleanup
    
    * dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
    shutdown_pending; no longer needed.
    
    --
    
    In d83ba4897bf217d1045c58d1b99e52bd31c58812, we removed the
    Windows-specific system daemon features, where shutdown_pending was
    set from w32_service_control().  shutdown_pending is now never
    assigned outside of handle_signal() or within an inotify test, neither
    of which are available on w32.
    
    As a result, this stanza in handle_tick() should be dead code, and can
    be removed to keep things simple.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
    
    s/win32/w32/ to please RMS ;-)  -wk

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index f5dce81..2a6729e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1842,20 +1842,6 @@ time_for_housekeeping_p (time_t curtime)
 static void
 handle_tick (void)
 {
-  /* Under Windows we don't use signals and need a way for the loop to
-     check for the shutdown flag.  */
-#ifdef HAVE_W32_SYSTEM
-  if (shutdown_pending)
-    log_info (_("SIGTERM received - shutting down ...\n"));
-  if (shutdown_pending > 2)
-    {
-      log_info (_("shutdown forced\n"));
-      log_info ("%s %s stopped\n", strusage(11), strusage(13) );
-      cleanup ();
-      dirmngr_exit (0);
-    }
-#endif /*HAVE_W32_SYSTEM*/
-
   if (time_for_housekeeping_p (gnupg_get_time ()))
     {
       npth_t thread;

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

Summary of changes:
 dirmngr/dirmngr.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)


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