[git] GnuPG - branch, master, updated. gnupg-2.1.11-112-g6060ea8

[by Justus Winter]

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  6060ea898fda499211c9d5030fff41d58f899fb0 (commit)
       via  b74185b6eaeaae4754726ff203e11977777f568c (commit)
      from  e7171f559590422cc52dbcb8d78d94569b31012f (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 6060ea898fda499211c9d5030fff41d58f899fb0
Author: Justus Winter <justus at g10code.com>
Date:   Fri Apr 1 14:53:48 2016 +0200

    build: Check for conflicting trust model options.
    
    * configure.ac: Disable TOFU if configured without trust models, and
    check for conflicting options.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 003e509..0163dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,8 +263,11 @@ AC_MSG_CHECKING([whether to enable TOFU])
 AC_ARG_ENABLE(tofu,
                 AC_HELP_STRING([--disable-tofu],
                                [disable the TOFU trust model]),
-              use_tofu=$enableval, use_tofu=yes)
+              use_tofu=$enableval, use_tofu=$use_trust_models)
 AC_MSG_RESULT($use_tofu)
+if test "$use_trust_models" = no && test "$use_tofu" = yes; then
+    AC_MSG_ERROR([both --disable-trust-models and --enable-tofu given])
+fi
 
 
 

commit b74185b6eaeaae4754726ff203e11977777f568c
Author: Justus Winter <justus at g10code.com>
Date:   Fri Apr 1 14:51:56 2016 +0200

    g10: Remove option --always-trust if compiled without trust models.
    
    * g10/gpg.c (opts): Remove option --always-trust if compiled without
    trust models.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/gpg.c b/g10/gpg.c
index 330d5a3..b9d69a7 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -681,7 +681,9 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
   ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
   ARGPARSE_s_i (oDefCertLevel, "default-cert-check-level", "@"), /* old */
+#ifndef NO_TRUST_MODELS
   ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
+#endif
   ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
   ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
   ARGPARSE_s_s (oTOFUDBFormat, "tofu-db-format", "@"),

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

Summary of changes:
 configure.ac | 5 ++++-
 g10/gpg.c    | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)


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