[mate-keyring] patch with latest upstream fixes

[leigh123linux]

commit 3deec228d523046babcd8bc8b5aad6f62dfa1e0e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 8 17:47:56 2012 +0000

    patch with latest upstream fixes

 mate-keyring.spec      |   10 +++++-
 upstream_commits.patch |   85 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletions(-)
---
diff --git a/mate-keyring.spec b/mate-keyring.spec
index a2fffeb..218e512 100644
--- a/mate-keyring.spec
+++ b/mate-keyring.spec
@@ -1,11 +1,15 @@
 Summary:        Framework for managing passwords and other secrets
 Name:           mate-keyring
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+# upstream commits
+# https://github.com/mate-desktop/mate-keyring/commit/0269af132af17ecea87f869cda26100cd9b724a8
+# https://github.com/mate-desktop/mate-keyring/commit/de7a2884feb7acd6abcd7f0bcb7eac963c787f4f
+Patch0:         upstream_commits.patch
 
 
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -47,6 +51,7 @@ Shared library for MATE Desktop pam auth
 
 %prep
 %setup -q -n mate-keyring-%{version}
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -115,6 +120,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-2
+- patch with latest upstream fixes
+
 * Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
 - update to 1.5.0 release
 - drop upstream patch
diff --git a/upstream_commits.patch b/upstream_commits.patch
new file mode 100644
index 0000000..f536b2c
--- /dev/null
+++ b/upstream_commits.patch
@@ -0,0 +1,85 @@
+--- a/egg/egg-hkdf.c
++++ b/egg/egg-hkdf.c
+@@ -40,7 +40,7 @@ egg_hkdf_perform (const gchar *hash_algo
+ 	gcry_md_hd_t md1, md2;
+ 	guint hash_len;
+ 	guchar i;
+-	gint flags, algo;
++	gint algo;
+ 	gsize step, n_buffer;
+ 	guchar *at;
+ 	gcry_error_t gcry;
+@@ -54,10 +54,8 @@ egg_hkdf_perform (const gchar *hash_algo
+ 
+ 	/* Buffer we need to for intermediate stuff */
+ 	if (gcry_is_secure (input)) {
+-		flags = GCRY_MD_FLAG_SECURE;
+ 		buffer = gcry_malloc_secure (hash_len);
+ 	} else {
+-		flags = 0;
+ 		buffer = gcry_malloc (hash_len);
+ 	}
+ 
+--- a/gcr/gcr-parser.c
++++ b/gcr/gcr-parser.c
+@@ -723,7 +723,7 @@ handle_pkcs12_cert_bag (GcrParser *self,
+ {
+ 	GNode *asn = NULL;
+ 	GNode *asn_content = NULL;
+-	guchar *certificate;
++	guchar *certificate = NULL;
+ 	const guchar *element;
+ 	gsize n_certificate, n_element;
+ 	gint ret;
+--- a/pkcs11/wrap-layer/gkm-wrap-prompt.c
++++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c
+@@ -537,7 +537,7 @@ get_unlock_options_from_prompt (GkmWrapP
+ static void
+ set_unlock_options_on_prompt (GkmWrapPrompt *self, CK_ATTRIBUTE_PTR options, CK_ULONG n_options)
+ {
+-	const gchar *choice;
++	const gchar *choice = NULL;
+ 	gboolean have_ttl = FALSE;
+ 	gboolean bval;
+ 	gulong uval;
+@@ -561,8 +561,9 @@ set_unlock_options_on_prompt (GkmWrapPro
+ 		have_ttl = TRUE;
+ 		ttl = uval;
+ 	}
+-
+-	gku_prompt_set_unlock_choice (GKU_PROMPT (self), choice);
++        
++        if (choice != NULL)
++	        gku_prompt_set_unlock_choice (GKU_PROMPT (self), choice);
+ 	if (have_ttl)
+ 		gku_prompt_set_unlock_ttl (GKU_PROMPT (self), ttl);
+ }
+--- a/pkcs11/xdg-store/gkm-xdg-trust.c
++++ b/pkcs11/xdg-store/gkm-xdg-trust.c
+@@ -271,7 +271,7 @@ create_assertions (void)
+ static GkmAssertion*
+ create_assertion (GkmXdgTrust *self, GNode *asn)
+ {
+-	CK_X_ASSERTION_TYPE type;
++	CK_X_ASSERTION_TYPE type = 0UL;
+ 	GkmAssertion *assertion;
+ 	GQuark level;
+ 	gchar *purpose;
+--- a/schema/org.mate.crypto.cache.gschema.xml
++++ b/schema/org.mate.crypto.cache.gschema.xml
+@@ -1,5 +1,5 @@
+ <schemalist>
+-	<schema id="org.mate.crypto.cache" path="/desktop/mate/crypto/cache/">
++	<schema id="org.mate.crypto.cache" path="/org/mate/desktop/crypto/cache/">
+ 		<key name="gpg-cache-method" type="s">
+ 			<default>'session'</default>
+ 			<summary>Cache Method</summary>
+--- a/schema/org.mate.crypto.pgp.gschema.xml
++++ b/schema/org.mate.crypto.pgp.gschema.xml
+@@ -1,5 +1,5 @@
+ <schemalist>
+-	<schema id="org.mate.crypto.pgp" path="/desktop/mate/crypto/pgp/">
++	<schema id="org.mate.crypto.pgp" path="/org/mate/desktop/crypto/pgp/">
+ 		<key name="default-key" type="s">
+ 			<default>''</default>
+ 			<summary>Default PGP Key</summary>