6 files changed, 39 insertions, 4 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 6f6fb4065821..dac4b57fcc49 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.28.1
+PORTVERSION=	2.28.2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 7c047bb5a2de..3a115b6dbf63 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.28.1.tar.bz2) = 1139f46c99a1b0c01009ed2eae3f4a0a
-SHA256 (gnome2/gnome-keyring-2.28.1.tar.bz2) = 549a85092d4bbd08cbae4becd9be0a9f40f371498303eda1aa9aa3a27458aa91
-SIZE (gnome2/gnome-keyring-2.28.1.tar.bz2) = 2759424
+MD5 (gnome2/gnome-keyring-2.28.2.tar.bz2) = 97ea6823e88b39284187764c1ca95a59
+SHA256 (gnome2/gnome-keyring-2.28.2.tar.bz2) = d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
+SIZE (gnome2/gnome-keyring-2.28.2.tar.bz2) = 3009480
diff --git a/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c
new file mode 100644
index 000000000000..fd4ca0d28a34
--- /dev/null
+++ b/security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c
@@ -0,0 +1,10 @@
+--- daemon/keyrings/gkr-keyrings.c.orig	2009-12-16 23:41:18.000000000 -0500
++++ daemon/keyrings/gkr-keyrings.c	2009-12-16 23:41:38.000000000 -0500
+@@ -38,6 +38,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
diff --git a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
new file mode 100644
index 000000000000..0c910a4c453a
--- /dev/null
+++ b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
@@ -0,0 +1,11 @@
+--- gcr/gcr-certificate.c.orig	2009-12-16 23:36:19.000000000 -0500
++++ gcr/gcr-certificate.c	2009-12-16 23:36:28.000000000 -0500
+@@ -156,7 +156,7 @@ calculate_key_size (GcrCertificateInfo *
+ 	const guchar *data, *params;
+ 	gsize n_data, n_params, n_key;
+ 	guint key_size = 0;
+-	guchar *key;
++	guchar *key = NULL;
+ 	GQuark oid;
+ 	
+ 	data = egg_asn1_read_element (info->asn1, info->der, info->n_der, "tbsCertificate.subjectPublicKeyInfo", &n_data);
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
new file mode 100644
index 000000000000..0fdeef6bc040
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/gck-rpc-dispatch.c.orig	2009-12-16 23:37:26.000000000 -0500
++++ pkcs11/rpc-layer/gck-rpc-dispatch.c	2009-12-16 23:38:10.000000000 -0500
+@@ -783,7 +783,7 @@ rpc_C_Finalize (CallState *cs)
+ {
+ 	CK_SLOT_ID_PTR slots;
+ 	CK_ULONG n_slots, i;
+-	CK_RV ret;
++	CK_RV ret = CKR_OK;
+ 
+ 	debug (("C_Finalize: enter"));
+ 
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 95a3ba266728..9c579006e301 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -127,6 +127,7 @@ share/locale/da/LC_MESSAGES/gnome-keyring.mo
 share/locale/de/LC_MESSAGES/gnome-keyring.mo
 share/locale/dz/LC_MESSAGES/gnome-keyring.mo
 share/locale/el/LC_MESSAGES/gnome-keyring.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
 share/locale/es/LC_MESSAGES/gnome-keyring.mo
@@ -219,6 +220,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES