[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.26-4-g07006c9

[by Kristian Fiskerstrand]

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, STABLE-BRANCH-2-0 has been updated
       via  07006c9916ea194ce6047d252421c08489068c4c (commit)
      from  d91db67e5180fcbda2f3fb7667ffd1b99cac51c6 (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 07006c9916ea194ce6047d252421c08489068c4c
Author: Kristian Fiskerstrand <kf at sumptuouscapital.com>
Date:   Wed Aug 13 11:13:34 2014 +0200

    gpg: Need to init the trustdb for import.
    
    * g10/trustdb.c (clear_ownertrusts): Init trustdb.
    
    --
    
    This was fixed in 1.4 branch in commit
    23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
    2.0 branch that exhibits the same problem. This is actually a hack
    to fix a bug introduced with commit 2528178.
    
    GnuPG-bug-id: 1622

diff --git a/g10/trustdb.c b/g10/trustdb.c
index f96701a..7bfef25 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
   TRUSTREC rec;
   int rc;
 
+  init_trustdb();
+
   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
     return 0;
 

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

Summary of changes:
 g10/trustdb.c |    2 ++
 1 file changed, 2 insertions(+)


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