[gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/

[Alexandre Restovtsev]

commit:     eead68890752403db4978902746689f1fafc68ec
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 20:03:25 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 20:03:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eead6889

gnome-base/gnome-keyring: 3.1.4 → 3.1.90

Version bump, lots of improvements including a new gcr-viewer tool.

---
 .../files/gnome-keyring-3.1.90-debug.patch         |  138 ++++++++++++++++++++
 ...ng-3.1.4.ebuild => gnome-keyring-3.1.90.ebuild} |    6 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    3 +-
 3 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
new file mode 100644
index 0000000..478c796
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
@@ -0,0 +1,138 @@
+From f591c2326710dbc685a39eb6056eb7734219f181 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@××××××××××××.uk>
+Date: Tue, 30 Aug 2011 11:36:15 +0000
+Subject: Fix compile warnings when building with --disable-debug
+
+---
+diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-property.c
+index cd2104e..35c7d38 100644
+--- a/daemon/dbus/gkd-secret-property.c
++++ b/daemon/dbus/gkd-secret-property.c
+@@ -377,8 +377,8 @@ static void
+ iter_append_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
+ {
+ 	DBusMessageIter sub;
+-	IterAppendFunc func;
+-	const gchar *sig;
++	IterAppendFunc func = NULL;
++	const gchar *sig = NULL;
+ 
+ 	g_assert (iter);
+ 	g_assert (attr);
+@@ -414,9 +414,9 @@ static gboolean
+ iter_get_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
+ {
+ 	DBusMessageIter variant;
+-	IterGetFunc func;
++	IterGetFunc func = NULL;
+ 	gboolean ret;
+-	const gchar *sig;
++	const gchar *sig = NULL;
+ 	char *signature;
+ 
+ 	g_assert (iter);
+diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
+index 7e2e9fe..691ebe0 100644
+--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
++++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
+@@ -983,7 +983,7 @@ op_sign_request (GkdSshAgentCall *call)
+ 	gsize n_data, n_result;
+ 	guint32 flags;
+ 	gsize offset;
+-	gboolean ret;
++	gboolean ret = FALSE;
+ 	guint blobpos, sz;
+ 	guint8 *hash;
+ 	gulong algo, mech;
+diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
+index aae8ddd..46d302c 100644
+--- a/egg/egg-asn1x.c
++++ b/egg/egg-asn1x.c
+@@ -1579,10 +1579,8 @@ anode_encode_prepare_choice (GNode *node, gboolean want)
+ {
+ 	Atlv *tlv;
+ 	GNode *child;
+-	gint type;
+ 
+-	type = anode_def_type (node);
+-	g_assert (type == TYPE_CHOICE);
++	g_assert (anode_def_type (node) == TYPE_CHOICE);
+ 
+ 	child = egg_asn1x_get_choice (node);
+ 	if (!child)
+diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
+index f699203..facc9fe 100644
+--- a/egg/egg-secure-memory.c
++++ b/egg/egg-secure-memory.c
+@@ -263,6 +263,8 @@ pool_free (void* item)
+ 	unused_push (&pool->unused, item);
+ }
+ 
++#ifndef G_DISABLE_ASSERT
++
+ static int
+ pool_valid (void* item)
+ {
+@@ -282,6 +284,8 @@ pool_valid (void* item)
+ 	return 0;
+ }
+ 
++#endif /* G_DISABLE_ASSERT */
++
+ /* -----------------------------------------------------------------------------
+  * SEC ALLOCATION
+  * 
+diff --git a/gcr/gcr-certificate-renderer.c b/gcr/gcr-certificate-renderer.c
+index 5f53cb6..6c8535d 100644
+--- a/gcr/gcr-certificate-renderer.c
++++ b/gcr/gcr-certificate-renderer.c
+@@ -330,7 +330,7 @@ on_parsed_dn_part (guint index, GQuark oid, const guchar *value,
+ 	GcrDisplayView *view = ((on_parsed_dn_args*)user_data)->view;
+ 	const gchar *attr;
+ 	const gchar *desc;
+-	gchar *field;
++	gchar *field = NULL;
+ 	gchar *display;
+ 
+ 	g_return_if_fail (GCR_IS_CERTIFICATE_RENDERER (self));
+diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
+index 1766e06..2162b98 100644
+--- a/gcr/gcr-parser.c
++++ b/gcr/gcr-parser.c
+@@ -1671,7 +1671,7 @@ gcr_parser_parse_data (GcrParser *self, gconstpointer data,
+                        gsize n_data, GError **error)
+ {
+ 	ForeachArgs args = { self, data, n_data, GCR_ERROR_UNRECOGNIZED };
+-	const gchar *message;
++	const gchar *message = NULL;
+ 	gint i;
+ 	
+ 	g_return_val_if_fail (GCR_IS_PARSER (self), FALSE);
+diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.c b/pkcs11/gnome2-store/gkm-gnome2-storage.c
+index 6c8ef7f..feaf252 100644
+--- a/pkcs11/gnome2-store/gkm-gnome2-storage.c
++++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c
+@@ -387,7 +387,7 @@ begin_modification_state (GkmGnome2Storage *self, GkmTransaction *transaction)
+ {
+ 	GkmDataResult res;
+ 	struct stat sb;
+-	CK_RV rv;
++	CK_RV rv = CKR_OK;
+ 
+ 	if (!begin_write_state (self, transaction))
+ 		return FALSE;
+diff --git a/pkcs11/secret-store/gkm-secret-collection.c b/pkcs11/secret-store/gkm-secret-collection.c
+index 0aedc5c..c8906d9 100644
+--- a/pkcs11/secret-store/gkm-secret-collection.c
++++ b/pkcs11/secret-store/gkm-secret-collection.c
+@@ -473,7 +473,7 @@ gkm_secret_collection_real_unlock (GkmObject *obj, GkmCredential *cred)
+ 	GkmDataResult res;
+ 	GkmSecretData *sdata;
+ 	GkmSecret *master;
+-	CK_RV rv;
++	CK_RV rv = CKR_GENERAL_ERROR;
+ 
+ 	master = gkm_credential_get_secret (cred);
+ 
+--
+cgit v0.9.0.2

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
similarity index 92%
rename from gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
index e0d5921..0f18bcb 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
@@ -55,7 +55,8 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
 		--enable-ssh-agent
-		--enable-gpg-agent"
+		--enable-gpg-agent
+		--disable-update-mime"
 #		$(use_enable valgrind)
 }
 
@@ -65,6 +66,9 @@ src_prepare() {
 	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
 		-i gcr/Makefile.* || die "sed failed"
 
+	# Upstream patch to initialize variables properly, will be in next release
+	epatch "${FILESDIR}/${P}-debug.patch"
+
 	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
 	epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
 	[[ ${PV} = 9999 ]] || eautoreconf

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index e0d5921..f1d6944 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -55,7 +55,8 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
 		--enable-ssh-agent
-		--enable-gpg-agent"
+		--enable-gpg-agent
+		--disable-update-mime"
 #		$(use_enable valgrind)
 }