summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-06-26 01:46:22 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-06-26 01:46:22 +0800
commit82598f1d315744c69e7e3a9d61262dc2efe585f8 (patch)
treeb9cc5b30f49a27b5364f517cf9bc3352d4e20af1
parentd42cf027890c20340f3f321da3cc186cb9d5616d (diff)
downloadmarcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar.gz
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar.bz2
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar.lz
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar.xz
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.tar.zst
marcuscom-ports-82598f1d315744c69e7e3a9d61262dc2efe585f8.zip
Add a patch from SVN to fix an abort in gnome-keyring when trying to
access keyrings. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9074 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--security/gnome-keyring/Makefile3
-rw-r--r--security/gnome-keyring/files/patch-library_gnome-keyring-memory.c11
2 files changed, 13 insertions, 1 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index e67e1dd70..13d1b5add 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnome-keyring/Makefile,v 1.36 2007/06/19 01:17:03 marcus Exp $
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.37 2007/06/19 06:43:13 marcus Exp $
#
PORTNAME= gnome-keyring
PORTVERSION= 2.19.4.1
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/security/gnome-keyring/files/patch-library_gnome-keyring-memory.c b/security/gnome-keyring/files/patch-library_gnome-keyring-memory.c
new file mode 100644
index 000000000..3bd394c93
--- /dev/null
+++ b/security/gnome-keyring/files/patch-library_gnome-keyring-memory.c
@@ -0,0 +1,11 @@
+--- library/gnome-keyring-memory.c.orig 2007-06-25 13:42:22.000000000 -0400
++++ library/gnome-keyring-memory.c 2007-06-25 13:42:38.000000000 -0400
+@@ -219,7 +219,7 @@ gnome_keyring_memory_free (gpointer p)
+ return;
+ else if (!gkr_secure_memory_check (p))
+ g_free (p);
+-
++ else
+ gkr_secure_memory_free (p);
+ }
+