[git] GPG-ERROR - branch, master, updated. libgpg-error-1.27-8-g4a9857a

by Justus Winter cvs at cvs.gnupg.org
Wed May 31 10:34:54 CEST 2017


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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  4a9857a2b6d8a8e847638416d35398508b3291fd (commit)
       via  df1d61d5c84d984fb2d2a6f1b69c57878decf13e (commit)
      from  1e7203515be0b030709109e9da621642dfa20312 (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 4a9857a2b6d8a8e847638416d35398508b3291fd
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 17 15:42:34 2017 +0200

    Align 'es_poll' semantics closer with POSIX.
    
    * src/estream.c (_gpgrt_poll): Do not return early if some streams are
    found to be ready before even polling the others.
    --
    
    POSIX mandates that all streams are examined and returning early
    violates that.  It also imposes an order on how the callee serves the
    streams, which might be incompatible with the order the callee wants
    to serve them, leading to deadlocks.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/src/estream.c b/src/estream.c
index cae0a69..2f29cdb 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -4857,9 +4857,6 @@ _gpgrt_poll (gpgrt_poll_t *fds, unsigned int nfds, int timeout)
       /* FIXME */
     }
 
-  if (count)
-    goto leave;  /* Early return without waiting.  */
-
   /* Now do the real select.  */
 #ifdef HAVE_W32_SYSTEM
 

commit df1d61d5c84d984fb2d2a6f1b69c57878decf13e
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 17 15:41:48 2017 +0200

    build: Prepend the maintainer CFLAGS.
    
    * configure.ac: Prepend the maintainer CFLAGS making it possible to
    override e.g. the optimization level for debugging.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index d5c6887..bddb915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,8 +240,8 @@ if test "$GCC" = yes; then
     # warning options and the user should have a chance of overriding
     # them.
     if test "$USE_MAINTAINER_MODE" = "yes"; then
-        CFLAGS="$CFLAGS -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
-        CFLAGS="$CFLAGS -Wformat -Wno-format-y2k -Wformat-security"
+        M_CFLAGS="-O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
+        M_CFLAGS="$M_CFLAGS -Wformat -Wno-format-y2k -Wformat-security"
         if test x"$_gcc_silent_wno" = xyes ; then
           _gcc_wopt=yes
         else
@@ -254,7 +254,7 @@ if test "$GCC" = yes; then
           CFLAGS=$_gcc_cflags_save;
         fi
         if test x"$_gcc_wopt" = xyes ; then
-          CFLAGS="$CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
+          M_CFLAGS="$M_CFLAGS -W -Wno-sign-compare -Wno-missing-field-initializers"
         fi
 
         AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
@@ -264,8 +264,12 @@ if test "$GCC" = yes; then
         AC_MSG_RESULT($_gcc_wopt)
         CFLAGS=$_gcc_cflags_save;
         if test x"$_gcc_wopt" = xyes ; then
-          CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+          M_CFLAGS="$M_CFLAGS -Wdeclaration-after-statement"
         fi
+
+	# Prepend the maintainer-cflags so that the user can override
+	# them, e.g. to override the optimization flags for debugging.
+	CFLAGS="$M_CFLAGS $CFLAGS"
     else
         CFLAGS="$CFLAGS -Wall"
     fi

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

Summary of changes:
 configure.ac  | 12 ++++++++----
 src/estream.c |  3 ---
 2 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list