[git] GnuPG - branch, npth-2, updated. gnupg-2.1.0beta3-15-gd974920

[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, npth-2 has been updated
       via  d97492064c20953b4e401f5c14e1a93108b4e8e3 (commit)
       via  4ee5b5c91e23f6e022385b13477ed1db36c364fb (commit)
       via  add8ac3d56ca69246b11a3fd1358c2c46dbf25b7 (commit)
      from  122d1d1babf919d491390ad2e3fa8ab8271a19a1 (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 d97492064c20953b4e401f5c14e1a93108b4e8e3
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 25 14:44:34 2012 +0100

    Re-indent overlong lines.
    
    --

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 155fe73..537f526 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1934,7 +1934,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
       npth_timersub (&abstime, &curtime, &timeout);
 
 #ifndef HAVE_W32_SYSTEM
-      ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout, npth_sigev_sigmask());
+      ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
+                          npth_sigev_sigmask ());
       saved_errno = errno;
 
       {
@@ -1944,7 +1945,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
       }
 #else
       events_set = 0;
-      ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout, events, &events_set);
+      ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
+                          events, &events_set);
       saved_errno = errno;
 
       /* This is valid even if npth_eselect returns an error.  */
@@ -1993,7 +1995,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
 	      npth_t thread;
 
               ctrl->thread_startup.fd = fd;
-	      ret = npth_create (&thread, &tattr, start_connection_thread, ctrl);
+	      ret = npth_create (&thread, &tattr,
+                                 start_connection_thread, ctrl);
               if (ret)
                 {
                   log_error ("error spawning connection handler: %s\n",
@@ -2037,7 +2040,8 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
 
               agent_init_default_ctrl (ctrl);
               ctrl->thread_startup.fd = fd;
-              ret = npth_create (&thread, &tattr, start_connection_thread_ssh, ctrl);
+              ret = npth_create (&thread, &tattr,
+                                 start_connection_thread_ssh, ctrl);
 	      if (ret)
                 {
                   log_error ("error spawning ssh connection handler: %s\n",

commit 4ee5b5c91e23f6e022385b13477ed1db36c364fb
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 25 12:11:41 2012 +0100

    Add missing variable.
    
    * agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 9bd0c46..155fe73 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1937,8 +1937,11 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
       ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout, npth_sigev_sigmask());
       saved_errno = errno;
 
-      while (npth_sigev_get_pending(&signo))
-	handle_signal (signo);
+      {
+        int signo;
+        while (npth_sigev_get_pending (&signo))
+          handle_signal (signo);
+      }
 #else
       events_set = 0;
       ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout, events, &events_set);

commit add8ac3d56ca69246b11a3fd1358c2c46dbf25b7
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 25 12:11:41 2012 +0100

    Require gitlog-to-changelog to be installed.
    
    * Makefile.am (GITLOG_TO_CHANGELOG): New.
    (gen-ChangeLog): Use installed version of gitlog-to-changelog.
    --
    
    In case an appropriate version of gitlog-to-changelog is not in the
    PATH, it is possible to override it using something like:
    
      make distcheck GITLOG_TO_CHANGELOG=/foo/bar/my-gitlog-to-changelog

diff --git a/Makefile.am b/Makefile.am
index 49ec3fc..6207d7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
+GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
 EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
 	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
 	     scripts/gitlog-to-changelog \
@@ -115,8 +117,7 @@ gen_start_date = 2011-12-01T06:00:00
 gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
-	    ./scripts/gitlog-to-changelog				\
-	    --append-dot --tear-off					\
+	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
 	    --amend=scripts/git-log-fix	 				\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \

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

Summary of changes:
 Makefile.am       |    5 +++--
 agent/gpg-agent.c |   19 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)


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