[git] GPGME - branch, master, updated. gpgme-1.11.1-329-g913601f

[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 "GnuPG Made Easy".

The branch, master has been updated
       via  913601f4879f011878b53b885f35524df98b5570 (commit)
       via  ecfa48fffa93f3d1b66354d2d46872ff614c4a68 (commit)
      from  033da18b88af69b7846de62af4aeea359d27ec20 (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 913601f4879f011878b53b885f35524df98b5570
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 5 15:16:53 2018 +0200

    core: Apply GPGME_EXPORT_MODE_NOUID also to keyserver exports.
    
    * src/engine-gpg.c (export_common): Add keyserver-options to the
    send-keys commands.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 9a5927c..2833374 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -2255,6 +2255,8 @@ export_common (engine_gpg_t gpg, gpgme_export_mode_t mode,
   else if ((mode & GPGME_EXPORT_MODE_EXTERN))
     {
       err = add_arg (gpg, "--send-keys");
+      if (!err && (mode & GPGME_EXPORT_MODE_NOUID))
+        err = add_arg (gpg, "--keyserver-options=export-drop-uids");
     }
   else
     {

commit ecfa48fffa93f3d1b66354d2d46872ff614c4a68
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 5 15:14:58 2018 +0200

    build: Move config.h to conf/config.h
    
    * conf/: New dir.
    * configure.ac (AC_CONFIG_HEADER): Move header to conf dir.
    * doc/Makefile.am (mkdefsinc): Adjust rule.
    * lang/python/Makefile.am (copystamp): Ditto.
    --
    
    C++ uses those stupid files without a suffix and thus the new standard
    header <version> as included by newer other libc++ versions may
    conflict with the VERSION file in out top directory.   This change
    should solve the problem.
    
    GnuPG-bug-id: 4168
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index 1813cc5..b190e4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ VERSION_MICRO=mym4_version_micro
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/gpgme.h.in)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(conf/config.h)
 AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
diff --git a/doc/Makefile.am b/doc/Makefile.am
index db8a1a2..2b4730e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,9 +34,9 @@ gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
 
 gpgme.texi : defs.inc
 
-mkdefsinc: mkdefsinc.c Makefile ../config.h
-	$(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
-	   -o $@ $(srcdir)/mkdefsinc.c
+mkdefsinc: mkdefsinc.c Makefile $(top_builddir)/conf/config.h
+	$(CC_FOR_BUILD) -I. -I$(top_builddir)/conf  -I$(srcdir) \
+	   $(AM_CPPFLAGS) -o $@ $(srcdir)/mkdefsinc.c
 
 dist-hook: defsincdate
 
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 6df17ce..6988faf 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -34,7 +34,7 @@ prepare: copystamp
 # distutils are not VPATH-aware.
 copystamp:
 	ln -sf "$(top_srcdir)/src/data.h" .
-	ln -sf "$(top_builddir)/config.h" .
+	ln -sf "$(top_builddir)/conf/config.h" .
 	ln -sf "$(srcdir)/src" gpg
 	touch $@
 

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

Summary of changes:
 configure.ac            | 2 +-
 doc/Makefile.am         | 6 +++---
 lang/python/Makefile.am | 2 +-
 src/engine-gpg.c        | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org