Package: gnome-keyring Version: 3.4.1-5 Severity: wishlist Tags: patch Here's some updated packaging for the GNOME 3.6 version.
--- gnome-keyring-3.4.1/debian/changelog 2012-08-19 21:02:52.000000000 +0100
+++ gnome-keyring-3.6.1/debian/changelog 2012-10-19 17:03:31.000000000 +0100
@@ -1,3 +1,14 @@
+gnome-keyring (3.6.1-0+g36+1) UNRELEASED; urgency=low
+
+ * Local package
+ * New upstream release
+ - update build-dependencies
+ - drop patches that are in the upstream version
+ - deal with renamed PKCS#11 integration conffile with a mv_conffile
+ maintscript helper (LP: #1038577)
+
+ -- Simon McVittie <s...@debian.org> Fri, 19 Oct 2012 16:45:16 +0100
+
gnome-keyring (3.4.1-5) unstable; urgency=low
* d/p/0001-schema-Update-description-for-gpg-cache-method.patch,
--- gnome-keyring-3.4.1/debian/control 2012-08-19 21:06:19.000000000 +0100
+++ gnome-keyring-3.6.1/debian/control 2012-10-19 17:05:11.000000000 +0100
@@ -18,9 +18,9 @@
libcap-ng-dev [linux-any],
libdbus-1-dev (>= 1.0),
libgck-1-dev (>= 3.3.4),
- libgcr-3-dev (>= 3.3.3),
+ libgcr-3-dev (>= 3.5.3),
libgcrypt11-dev (>= 1.2.2),
- libglib2.0-dev (>= 2.28.0),
+ libglib2.0-dev (>= 2.32.0),
libgtk-3-dev (>= 3.0),
libp11-kit-dev (>= 0.6),
libpam0g-dev,
@@ -35,6 +35,7 @@
Package: gnome-keyring
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
gcr (>= 3.4),
--- gnome-keyring-3.4.1/debian/control.in 2012-08-19 13:24:48.000000000 +0100
+++ gnome-keyring-3.6.1/debian/control.in 2012-10-19 17:03:31.000000000 +0100
@@ -13,9 +13,9 @@
libcap-ng-dev [linux-any],
libdbus-1-dev (>= 1.0),
libgck-1-dev (>= 3.3.4),
- libgcr-3-dev (>= 3.3.3),
+ libgcr-3-dev (>= 3.5.3),
libgcrypt11-dev (>= 1.2.2),
- libglib2.0-dev (>= 2.28.0),
+ libglib2.0-dev (>= 2.32.0),
libgtk-3-dev (>= 3.0),
libp11-kit-dev (>= 0.6),
libpam0g-dev,
@@ -30,6 +30,7 @@
Package: gnome-keyring
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
gcr (>= 3.4),
--- gnome-keyring-3.4.1/debian/gnome-keyring.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.6.1/debian/gnome-keyring.maintscript 2012-10-19 17:03:31.000000000 +0100
@@ -0,0 +1 @@
+mv_conffile /etc/pkcs11/modules/gnome-keyring-module /etc/pkcs11/modules/gnome-keyring.module 3.6.0-0ubuntu1~
--- gnome-keyring-3.4.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch 2012-08-19 13:29:37.000000000 +0100
+++ gnome-keyring-3.6.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From 24dcc36fb999418b1d13f76bc6bee4c7f59a5ec0 Mon Sep 17 00:00:00 2001
-From: Stef Walter <st...@gnome.org>
-Date: Wed, 8 Aug 2012 06:06:24 +0200
-Subject: [PATCH 1/3] schema: Update description for gpg-cache-method
-
- * Document the various method strings that can be present here
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681081
----
- schema/org.gnome.crypto.cache.gschema.xml | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/schema/org.gnome.crypto.cache.gschema.xml b/schema/org.gnome.crypto.cache.gschema.xml
-index 9a431eb..4547399 100644
---- a/schema/org.gnome.crypto.cache.gschema.xml
-+++ b/schema/org.gnome.crypto.cache.gschema.xml
-@@ -3,7 +3,10 @@
- <key name="gpg-cache-method" type="s">
- <default>'session'</default>
- <summary>Cache Method</summary>
-- <description>The method to use for caching passphrases typed into the GPG agent.</description>
-+ <description>The method to use for caching passphrases typed into the GPG agent.
-+ Should be one of: 'always' caches permanently, 'session' caches until session end,
-+ 'idle' caches until the not used for gpg-cache-ttl seconds, 'timeout' caches until
-+ gpg-cache-ttl seconds.</description>
- </key>
- <key name="gpg-cache-ttl" type="i">
- <default>300</default>
---
-1.7.10.4
-
--- gnome-keyring-3.4.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch 2012-08-19 13:29:37.000000000 +0100
+++ gnome-keyring-3.6.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-From 51606f299e5ee9d48096db0a5957efe26cbf7cc3 Mon Sep 17 00:00:00 2001
-From: Stef Walter <st...@gnome.org>
-Date: Wed, 8 Aug 2012 06:06:58 +0200
-Subject: [PATCH 2/3] gpg-agent: Hook up the TTL cache option
-
- * So that when the gsettings gpg-cache-method is 'idle' or 'timeout'
- we use gpg-cache-ttl to control how long the passphrase is cached
- for.
- * This is a regression from 3.3.x
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681081
----
- daemon/gpg-agent/gkd-gpg-agent-ops.c | 40 +++++++++++++++++++++-------------
- 1 file changed, 25 insertions(+), 15 deletions(-)
-
-diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-index a0e8731..c8414fe 100644
---- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
-+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-@@ -322,17 +322,6 @@ load_unlock_options (GcrPrompt *prompt)
- g_free (method);
- }
-
--static void
--save_unlock_options (GcrPrompt *prompt)
--{
-- GSettings *settings;
--
-- settings = gkd_gpg_agent_settings ();
--
-- if (gcr_prompt_get_choice_chosen (prompt))
-- g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS);
--}
--
- static GcrPrompt *
- open_password_prompt (GckSession *session,
- const gchar *keyid,
-@@ -405,11 +394,14 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
- const gchar *prompt_text, const gchar *description, gboolean confirm)
- {
- GckBuilder builder = GCK_BUILDER_INIT;
-+ GSettings *settings;
- GckAttributes *attrs;
- gchar *password = NULL;
- GcrPrompt *prompt;
- gboolean chosen;
- GError *error = NULL;
-+ gint lifetime;
-+ gchar *method;
-
- g_assert (GCK_IS_SESSION (session));
-
-@@ -430,21 +422,39 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
- }
-
- if (password != NULL && keyid != NULL) {
-+ settings = gkd_gpg_agent_settings ();
-
- /* Load up the save options */
- chosen = gcr_prompt_get_choice_chosen (prompt);
-
-- if (chosen)
-+ if (chosen) {
-+ g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS);
- gck_builder_add_string (&builder, CKA_G_COLLECTION, "login");
-- else
-+
-+ } else {
-+ method = g_settings_get_string (settings, "gpg-cache-method");
-+ lifetime = g_settings_get_int (settings, "gpg-cache-ttl");
-+
-+ if (g_strcmp0 (method, GCR_UNLOCK_OPTION_IDLE) == 0) {
-+ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
-+ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_IDLE, lifetime);
-+
-+ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_TIMEOUT) == 0) {
-+ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
-+ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_AFTER, lifetime);
-+
-+ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_SESSION)){
-+ g_message ("Unsupported gpg-cache-method setting: %s", method);
-+ }
-+
- gck_builder_add_string (&builder, CKA_G_COLLECTION, "session");
-+ g_free (method);
-+ }
-
- /* Now actually save the password */
- attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
- do_save_password (session, keyid, description, password, attrs);
- gck_attributes_unref (attrs);
--
-- save_unlock_options (prompt);
- }
-
- g_clear_object (&prompt);
---
-1.7.10.4
-
--- gnome-keyring-3.4.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch 2012-08-19 13:29:37.000000000 +0100
+++ gnome-keyring-3.6.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-From 5dff623470b859e332dbe12afb0dc57b292832d2 Mon Sep 17 00:00:00 2001
-From: Stef Walter <st...@gnome.org>
-Date: Wed, 8 Aug 2012 15:08:22 +0200
-Subject: [PATCH 3/3] secret-store: Mark a secret item as 'used' when accessed
-
- * This makes the gpg-agent idle feature work correctly
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681081
----
- pkcs11/secret-store/gkm-secret-item.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pkcs11/secret-store/gkm-secret-item.c b/pkcs11/secret-store/gkm-secret-item.c
-index d03c4a8..15791a9 100644
---- a/pkcs11/secret-store/gkm-secret-item.c
-+++ b/pkcs11/secret-store/gkm-secret-item.c
-@@ -224,6 +224,7 @@ gkm_secret_item_real_get_attribute (GkmObject *base, GkmSession *session, CK_ATT
- identifier = gkm_secret_object_get_identifier (GKM_SECRET_OBJECT (self));
- secret = gkm_secret_data_get_raw (sdata, identifier, &n_secret);
- rv = gkm_attribute_set_data (attr, secret, n_secret);
-+ gkm_object_mark_used (base);
- g_object_unref (sdata);
- return rv;
-
---
-1.7.10.4
-
--- gnome-keyring-3.4.1/debian/patches/series 2012-08-19 13:30:21.000000000 +0100
+++ gnome-keyring-3.6.1/debian/patches/series 2012-10-19 17:03:31.000000000 +0100
@@ -1,4 +1 @@
03_kfreebsd.patch
-0001-schema-Update-description-for-gpg-cache-method.patch
-0002-gpg-agent-Hook-up-the-TTL-cache-option.patch
-0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch
gnome-keyring_3.6.1-0+g36+1.debian.tar.gz
Description: Binary data
