[git] GnuPG - branch, master, updated. gnupg-2.1.15-193-g4a232d2

by Justus Winter cvs at cvs.gnupg.org
Tue Oct 4 14:11:28 CEST 2016


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  4a232d23a8f51bebf9ee382e480248b4bde30f28 (commit)
       via  41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b (commit)
       via  949e70115eb2c04bd09da6477f6c433e6fd9a366 (commit)
       via  fbc83c0cdd390473c044953fb774571ffc636c6d (commit)
      from  eda17649f8bd3b8ce7bfc00a3c11cbcae63c845d (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 4a232d23a8f51bebf9ee382e480248b4bde30f28
Author: Justus Winter <justus at g10code.com>
Date:   Fri Sep 30 16:22:40 2016 +0200

    build,w32: Unconditionally build tests.
    
    * configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
    variables.  They are misleadingly named, as they inhibit building the
    tests.  There is no reason not to build the tests even when
    cross-compiling, as they are only run if one does 'make check'.
    * Makefile: Adapt accordingly.
    * tests/Makefile.am: Adapt accordingly.  Avoid building 'asschk' on
    Windows as it uses non-portable functions.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/Makefile.am b/Makefile.am
index b589e72..7950980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,15 +90,9 @@ else
 doc =
 endif
 
-if RUN_TESTS
-tests = tests
-else
-tests =
-endif
-
 SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          ${tools} po ${doc} ${tests}
+          ${tools} po ${doc} tests
 
 dist_doc_DATA = README
 
diff --git a/configure.ac b/configure.ac
index 85cd69a..9c591ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,7 +626,6 @@ have_dosish_system=no
 have_w32_system=no
 have_w32ce_system=no
 have_android_system=no
-run_tests=yes
 use_simple_gettext=no
 use_ldapwrapper=yes
 mmap_needed=yes
@@ -643,7 +642,6 @@ case "${host}" in
         have_dosish_system=yes
         have_w32_system=yes
         require_iconv=no
-        run_tests=no
         use_ldapwrapper=no  # Fixme: Do this only for CE.
         case "${host}" in
           *-mingw32ce*)
@@ -702,7 +700,6 @@ case "${host}" in
         # Android is fully utf-8 and we do not want to use iconv to
         # keeps things simple
         require_iconv=no
-        run_tests=no
         ;;
     *)
        ;;
@@ -733,11 +730,6 @@ if test "$have_android_system" = yes; then
 fi
 AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
 
-if test "$run_tests" = yes; then
-   AC_DEFINE(RUN_TESTS,1, [Defined if we should run the tests])
-fi
-AM_CONDITIONAL(RUN_TESTS, test "$run_tests" = yes)
-
 
 # (These need to go after AC_PROG_CC so that $EXEEXT is defined)
 AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
@@ -1693,9 +1685,6 @@ AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
 AM_CONDITIONAL(NO_TRUST_MODELS,     test "$use_trust_models" = no)
 AM_CONDITIONAL(USE_TOFU,            test "$use_tofu" = yes)
 
-AM_CONDITIONAL(RUN_GPG_TESTS,
-               test x$cross_compiling = xno -a "$build_gpg" = yes )
-
 #
 # Set some defines for use gpgconf.
 #
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d72f51e..6ede0d4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,14 +18,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-
-if RUN_GPG_TESTS
-openpgp = openpgp
-else
-openpgp =
-endif
-
-SUBDIRS = gpgscm ${openpgp} . migrations pkits
+SUBDIRS = gpgscm openpgp migrations pkits .
 
 GPGSM = ../sm/gpgsm
 
@@ -66,7 +59,9 @@ CLEANFILES = inittests.stamp x y y z out err \
 
 DISTCLEANFILES = pubring.kbx~ random_seed
 
+if !HAVE_W32_SYSTEM
 noinst_PROGRAMS = asschk
+endif
 
 asschk_SOURCES = asschk.c
 

commit 41b510f9c510f8fd1b59eb0c5dd2e2b2deaf0a1b
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:59:18 2016 +0200

    tests,w32: Do not expose 'glob' to gpgscm.
    
    * tests/gpgscm/ffi.c (do_glob): Remove function.
    (ffi_init): Likewise.
    --
    'glob' is not available on mingw, and portability is the whole point
    of gpgscm.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 4559f10..829384a 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -25,7 +25,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <glob.h>
 #include <gpg-error.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -1025,42 +1024,6 @@ do_string_contains (scheme *sc, pointer args)
   FFI_RETURN_POINTER (sc, strstr (haystack, needle) ? sc->T : sc->F);
 }
 
-static pointer
-do_glob (scheme *sc, pointer args)
-{
-  FFI_PROLOG ();
-  pointer result = sc->NIL;
-  size_t i;
-  char *pattern;
-  glob_t pglob;
-  FFI_ARG_OR_RETURN (sc, char *, pattern, string, args);
-  FFI_ARGS_DONE_OR_RETURN (sc, args);
-
-  switch (glob (pattern, 0, NULL, &pglob))
-    {
-    case 0:
-      for (i = 0; i < pglob.gl_pathc; i++)
-        result =
-          (sc->vptr->cons) (sc,
-                            sc->vptr->mk_string (sc, pglob.gl_pathv[i]),
-                            result);
-      globfree (&pglob);
-      break;
-
-    case GLOB_NOMATCH:
-      /* Return the empty list.  */
-      break;
-
-    case GLOB_NOSPACE:
-      return ffi_sprintf (sc, "out of memory");
-    case GLOB_ABORTED:
-      return ffi_sprintf (sc, "read error");
-    default:
-      assert (! "not reached");
-    }
-  FFI_RETURN_POINTER (sc, result);
-}
-
 

 
 static pointer
@@ -1289,7 +1252,6 @@ ffi_init (scheme *sc, const char *argv0, const char *scriptname,
   ffi_define_function (sc, string_index);
   ffi_define_function (sc, string_rindex);
   ffi_define_function_name (sc, "string-contains?", string_contains);
-  ffi_define_function (sc, glob);
 
   /* User interface.  */
   ffi_define_function (sc, flush_stdio);

commit 949e70115eb2c04bd09da6477f6c433e6fd9a366
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:46:00 2016 +0200

    tests,w32: Avoid using 'glob'.
    
    * tests/openpgp/setup.scm: Avoid 'glob' which is not available on
    mingw.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index d4a3e37..0a9a153 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -127,8 +127,7 @@
    (setenv "GNUPGHOME" (getcwd) #t)
    (create-gpghome)
    (kill-agent)
-   (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*)
-		 ,@(glob "*")))))
+   (call-check `(,(tool 'gpgtar) --create --output ,(cadr *args*) "."))))
  ((member "--unpack-tarball" *args*)
   (call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
   (start-agent))

commit fbc83c0cdd390473c044953fb774571ffc636c6d
Author: Justus Winter <justus at g10code.com>
Date:   Tue Oct 4 12:44:14 2016 +0200

    tools: Ignore existing directories in gpgtar.
    
    * tools/gpgtar-extract.c (extract_directory): Ignore existing
    directories now that we have '--directory'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index cee609c..8641126 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -122,11 +122,15 @@ extract_directory (const char *dirname, tar_header_t hdr)
   if (fname[strlen (fname)-1] == '/')
     fname[strlen (fname)-1] = 0;
 
- /* Note that we don't need to care about EEXIST because we always
-     extract into a new hierarchy.  */
   if (! opt.dry_run && gnupg_mkdir (fname, "-rwx------"))
     {
       err = gpg_error_from_syserror ();
+      if (gpg_err_code (err) == GPG_ERR_EEXIST)
+        {
+          /* Ignore existing directories while extracting.  */
+          err = 0;
+        }
+
       if (gpg_err_code (err) == GPG_ERR_ENOENT)
         {
           /* Try to create the directory with parents but keep the

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

Summary of changes:
 Makefile.am             |  8 +-------
 configure.ac            | 11 -----------
 tests/Makefile.am       | 11 +++--------
 tests/gpgscm/ffi.c      | 38 --------------------------------------
 tests/openpgp/setup.scm |  3 +--
 tools/gpgtar-extract.c  |  8 ++++++--
 6 files changed, 11 insertions(+), 68 deletions(-)


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




More information about the Gnupg-commits mailing list