[git] GPG-ERROR - branch, master, updated. libgpg-error-1.19-6-g1e8d002

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

The branch, master has been updated
       via  1e8d00260a97e0213559c74f687e478e7479a0ea (commit)
       via  d2e4bb4c77167a1ed10f1017a7d06a822bbd5135 (commit)
      from  4e790613f66efcfc62d73722d5f1730a37cb8324 (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 1e8d00260a97e0213559c74f687e478e7479a0ea
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 25 15:55:57 2015 +0200

    w32: Make sure the setmode is called.
    
    * src/estream.c (HAVE_DOSISH_SYSTEM): Define if needed.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/estream.c b/src/estream.c
index 3c7d05f..1175ac8 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -92,8 +92,14 @@
 
 
 #ifndef O_BINARY
-#define O_BINARY 0
+# define O_BINARY 0
 #endif
+#ifndef HAVE_DOSISH_SYSTEM
+# ifdef HAVE_W32_SYSTEM
+#  define HAVE_DOSISH_SYSTEM 1
+# endif
+#endif
+
 
 #ifdef HAVE_W32_SYSTEM
 # define S_IRGRP S_IRUSR

commit d2e4bb4c77167a1ed10f1017a7d06a822bbd5135
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 27 13:20:19 2015 +0200

    Add option --lib-version to the gpg-error tool.
    
    * src/gpg-error.c (main): Add new option.

diff --git a/src/gpg-error.c b/src/gpg-error.c
index 672efe7..117b367 100644
--- a/src/gpg-error.c
+++ b/src/gpg-error.c
@@ -398,10 +398,20 @@ main (int argc, char *argv[])
     {
       fputs ("gpg-error (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stdout);
       fputs ("Options:\n"
-             "  --version  Print version\n"
-             "  --help     Print this help\n"
-             "  --list     Print all error codes\n"
-             "  --defines  Print all error codes as #define lines\n", stdout);
+             "  --version      Print version\n"
+             "  --lib-version  Print library version\n"
+             "  --help         Print this help\n"
+             "  --list         Print all error codes\n"
+             "  --defines      Print all error codes as #define lines\n"
+             , stdout);
+      exit (0);
+    }
+  else if (argc == 2 && !strcmp (argv[1], "--lib-version"))
+    {
+      printf ("Version from header: %s (0x%06x)\n",
+              GPG_ERROR_VERSION, GPG_ERROR_VERSION_NUMBER);
+      printf ("Version from binary: %s\n", gpg_error_check_version (NULL));
+      printf ("Copyright blurb ...:%s\n", gpg_error_check_version ("\x01\x01"));
       exit (0);
     }
   else if (argc == 2 && !strcmp (argv[1], "--list"))

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

Summary of changes:
 src/estream.c   |  8 +++++++-
 src/gpg-error.c | 18 ++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)


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