[Pkg-gnupg-commit] r380 - in /gnupg/trunk/debian: changelog patches/revert_trustdb_changes patches/series

[thijs at users.alioth.debian.org]

Author: thijs
Date: Thu Dec 12 19:30:58 2013
New Revision: 380

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=380
Log:
import 1.4.15-1.1 nmu

Added:
    gnupg/trunk/debian/patches/revert_trustdb_changes
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/patches/series

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=380&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog	(original)
+++ gnupg/trunk/debian/changelog	Thu Dec 12 19:30:58 2013
@@ -1,3 +1,12 @@
+gnupg (1.4.15-1.1) unstable; urgency=high
+
+  * Non-maintainer upload, by request of Thijs Kinkhorst.
+  * Add patch revert_trustdb_changes:
+   - Revert upstream GIT a1a59e6a539e597996976d0afb6aa3062e954188
+     which breaks popularity-contest (closes: #725889).
+
+ -- Bill Allombert <ballombe at debian.org>  Wed, 16 Oct 2013 13:02:26 +0200
+
 gnupg (1.4.15-1) unstable; urgency=high
 
   * New upstream release (closes: #725718).

Added: gnupg/trunk/debian/patches/revert_trustdb_changes
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/revert_trustdb_changes?rev=380&op=file
==============================================================================
--- gnupg/trunk/debian/patches/revert_trustdb_changes	(added)
+++ gnupg/trunk/debian/patches/revert_trustdb_changes	Thu Dec 12 19:30:58 2013
@@ -0,0 +1,46 @@
+Description: Revert broken trustdb creation change
+ Revert the following upstream patch that causes --always-trust not to
+ create trustdb because GnuPG then complains that the file is required.
+ This breaks popularity-contest 1.60.
+ Next upstream release will include a patch 
+ (2528178e7e2fac6454dd988121167305db7c71d9) that remove the check for
+ trustdb when --always-trust is used (the file is not actually used).
+
+Author: Bill Allombert <ballombe at debian.org>
+Origin: upstream-reverted
+Bug-Debian: http://bugs.debian.org/725889
+Last-Update: 2013-10-16
+
+From a1a59e6a539e597996976d0afb6aa3062e954188 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk at gnupg.org>
+Date: Fri, 2 Aug 2013 09:17:52 +0200
+Subject: [PATCH 1/1] gpg: No need to create a trustdb when encrypting with
+ --always-trust.
+
+* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
+--
+
+(back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+---
+ g10/gpg.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: gnupg-1.4.15/g10/gpg.c
+===================================================================
+--- gnupg-1.4.15.orig/g10/gpg.c	2013-10-04 20:34:26.000000000 +0200
++++ gnupg-1.4.15/g10/gpg.c	2013-10-16 13:11:38.999258014 +0200
+@@ -3318,12 +3318,6 @@
+       case aFixTrustDB:
+       case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
+       case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
+-      case aEncr:
+-      case aEncrFiles:
+-        /* No need to create the trust model if we are using the
+-         * always trust model.  */
+-        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
+-        break;
+       default: rc = setup_trustdb(1, trustdb_name ); break;
+     }
+     if( rc )

Modified: gnupg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/series?rev=380&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/series	(original)
+++ gnupg/trunk/debian/patches/series	Thu Dec 12 19:30:58 2013
@@ -0,0 +1 @@
+revert_trustdb_changes