r52362 - in /desktop/unstable/seahorse/debian: changelog control control.in patches/01_ignore_KEY_CONSIDERED.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Apr 24 20:25:34 UTC 2017
Author: pochu
Date: Mon Apr 24 20:25:34 2017
New Revision: 52362
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52362
Log:
include NMU changes
Added:
desktop/unstable/seahorse/debian/patches/01_ignore_KEY_CONSIDERED.patch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/patches/series
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=52362&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Mon Apr 24 20:25:34 2017
@@ -1,3 +1,14 @@
+seahorse (3.20.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 01_ignore_KEY_CONSIDERED.patch: new patch, cherry-picked from upstream Git,
+ to Ignore KEY_CONSIDERED line introduced in GnuPG 2.1.13 (Closes: #859336).
+ Fixes key signing and editing trust (regression since Jessie).
+ * Bump libgpgme-dev build-dependency to >= 1.7.0, as required
+ by the new patch cherry-picked from upstream.
+
+ -- Kjö Hansi Glaz <kjo at a4nancy.net.eu.org> Sat, 01 Apr 2017 16:06:42 +0200
+
seahorse (3.20.0-3) unstable; urgency=medium
* Switch libgpgme11-dev build-dependency to libgpgme-dev.
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=52362&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Mon Apr 24 20:25:34 2017
@@ -16,7 +16,7 @@
libgck-1-dev (>= 3.11.91),
libgcr-3-dev (>= 3.11.91),
libglib2.0-dev (>= 2.10.0),
- libgpgme-dev (>= 1.0.0),
+ libgpgme-dev (>= 1.7.0),
libgtk-3-dev (>= 3.16),
libldap2-dev,
libsecret-1-dev (>= 0.16),
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=52362&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Mon Apr 24 20:25:34 2017
@@ -12,7 +12,7 @@
libgck-1-dev (>= 3.11.91),
libgcr-3-dev (>= 3.11.91),
libglib2.0-dev (>= 2.10.0),
- libgpgme-dev (>= 1.0.0),
+ libgpgme-dev (>= 1.7.0),
libgtk-3-dev (>= 3.16),
libldap2-dev,
libsecret-1-dev (>= 0.16),
Added: desktop/unstable/seahorse/debian/patches/01_ignore_KEY_CONSIDERED.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/01_ignore_KEY_CONSIDERED.patch?rev=52362&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/01_ignore_KEY_CONSIDERED.patch (added)
+++ desktop/unstable/seahorse/debian/patches/01_ignore_KEY_CONSIDERED.patch [utf-8] Mon Apr 24 20:25:34 2017
@@ -0,0 +1,56 @@
+From cdfc5b297d7420e47b9c973e8b8cb1b0fb576421 Mon Sep 17 00:00:00 2001
+From: Tobias Mueller <muelli at cryptobitch.de>
+Date: Tue, 14 Feb 2017 22:05:19 +0100
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=778607
+Bug-Debian: https://bugs.debian.org/859336
+Origin: https://git.gnome.org/browse/seahorse/commit/?id=cdfc5b297d7420e47b9c973e8b8cb1b0fb576421
+Subject: gpg: Ignore KEY_CONSIDERED line introduced in gpg 2.1.13
+
+gpg 2.1.13 introduced a new status line, KEY_CONSIDERED:
+https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html
+gpgme 1.7.0 supported it:
+https://lists.gnupg.org/pipermail/gnupg-commits/2016-May/012130.html
+
+The line seems innocent in the sense that it tells you what keys GnuPG
+looked at without doing anything. We can probably safely ignore that
+line, as we ignore many other lines already.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=778607
+
+Signed-off-by: Stef Walter <stefw at redhat.com>
+ * Fixed this so it compiles
+---
+ configure.ac | 2 +-
+ pgp/seahorse-gpgme-key-op.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0f748e3..fc4493c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ GTK_REQ=3.4.0
+ GTK_MAX=GTK_VERSION_3_4
+
+ GNUPG_ACCEPTED="2.0.12 2.1.4"
+-GPGME_REQUIRED=1.0.0
++GPGME_REQUIRED=1.7.0
+ LIBSECRET_REQUIRED=0.16
+ AVAHI_GLIB_REQUIRED=0.6
+
+diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
+index a765033..3f81850 100644
+--- a/pgp/seahorse-gpgme-key-op.c
++++ b/pgp/seahorse-gpgme-key-op.c
+@@ -330,7 +330,8 @@ seahorse_gpgme_key_op_edit (gpointer data, gpgme_status_code_t status,
+ status == GPGME_STATUS_BAD_PASSPHRASE || status == GPGME_STATUS_USERID_HINT ||
+ status == GPGME_STATUS_SIGEXPIRED || status == GPGME_STATUS_KEYEXPIRED ||
+ status == GPGME_STATUS_PROGRESS || status == GPGME_STATUS_KEY_CREATED ||
+- status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE)
++ status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE ||
++ status == GPGME_STATUS_KEY_CONSIDERED)
+ return parms->err;
+
+ g_debug ("[edit key] state: %d / status: %d / args: %s",
+--
+cgit v0.12
+
Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=52362&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Mon Apr 24 20:25:34 2017
@@ -0,0 +1 @@
+01_ignore_KEY_CONSIDERED.patch
More information about the pkg-gnome-commits
mailing list