summaryrefslogtreecommitdiffstats
path: root/security/seahorse
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-02 03:34:00 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-08-02 03:34:00 +0800
commit1dafd3894dcbc11864e1347671475099f7ba8cc5 (patch)
treec0b2f9714a027b79db1d593471ee4edd08509889 /security/seahorse
parentcb618168e15f6e0bd618231327d766ba2fc4a74f (diff)
downloadmarcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar.gz
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar.bz2
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar.lz
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar.xz
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.tar.zst
marcuscom-ports-1dafd3894dcbc11864e1347671475099f7ba8cc5.zip
Sync with FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12556 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/seahorse')
-rw-r--r--security/seahorse/Makefile3
-rw-r--r--security/seahorse/files/patch-daemon_seahorse-hkp-server.c13
-rw-r--r--security/seahorse/files/patch-pgp_seahorse-gpgme-source.c10
3 files changed, 25 insertions, 1 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 26ec338d9..c40136a3d 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,11 +3,12 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.82 2009/07/19 09:06:08 kwm Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.83 2009/07/28 12:42:30 avl Exp $
#
PORTNAME= seahorse
PORTVERSION= 2.27.5
+PORTREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/seahorse/files/patch-daemon_seahorse-hkp-server.c b/security/seahorse/files/patch-daemon_seahorse-hkp-server.c
new file mode 100644
index 000000000..1880aad32
--- /dev/null
+++ b/security/seahorse/files/patch-daemon_seahorse-hkp-server.c
@@ -0,0 +1,13 @@
+--- daemon/seahorse-hkp-server.c.orig 2009-08-01 15:25:02.000000000 -0400
++++ daemon/seahorse-hkp-server.c 2009-08-01 15:23:27.000000000 -0400
+@@ -467,7 +467,9 @@ seahorse_hkp_server_start(GError **err)
+ /* Initialize GPGME context */
+ if (gpgme_ctx == NULL) {
+ gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
+- gpgme_error_t err = gpgme_engine_check_version (proto);
++ gpgme_error_t err;
++ gpgme_check_version (NULL);
++ err = gpgme_engine_check_version (proto);
+ g_return_val_if_fail (GPG_IS_OK (err), FALSE);
+
+ err = gpgme_new (&gpgme_ctx);
diff --git a/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c b/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c
new file mode 100644
index 000000000..b036a8157
--- /dev/null
+++ b/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c
@@ -0,0 +1,10 @@
+--- pgp/seahorse-gpgme-source.c.orig 2009-08-01 15:24:28.000000000 -0400
++++ pgp/seahorse-gpgme-source.c 2009-08-01 15:23:24.000000000 -0400
+@@ -139,6 +139,7 @@ init_gpgme (gpgme_ctx_t *ctx)
+ gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
+ gpgme_error_t err;
+
++ gpgme_check_version (NULL);
+ err = gpgme_engine_check_version (proto);
+ g_return_val_if_fail (GPG_IS_OK (err), err);
+