diff options
7 files changed, 70 insertions, 3 deletions
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 342207bac..9b85b647b 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -3,12 +3,12 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse-plugins/Makefile,v 1.13 2009/05/09 18:53:29 marcus Exp $ +# $MCom: ports/security/seahorse-plugins/Makefile,v 1.14 2009/07/19 09:06:09 kwm Exp $ # PORTNAME= seahorse-plugins PORTVERSION= 2.27.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c new file mode 100644 index 000000000..70d1c9261 --- /dev/null +++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c @@ -0,0 +1,10 @@ +--- agent/seahorse-agent-cache.c.orig 2009-08-01 15:25:55.000000000 -0400 ++++ agent/seahorse-agent-cache.c 2009-08-01 15:23:38.000000000 -0400 +@@ -237,6 +237,7 @@ seahorse_agent_cache_init () + g_cache = + g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item); + ++ gpgme_check_version (NULL); + err = gpgme_engine_check_version (proto); + g_return_if_fail (GPG_IS_OK (err)); + diff --git a/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c b/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c new file mode 100644 index 000000000..16c64303b --- /dev/null +++ b/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c @@ -0,0 +1,10 @@ +--- libseahorse/seahorse-pgp-operation.c.orig 2009-08-01 15:26:28.000000000 -0400 ++++ libseahorse/seahorse-pgp-operation.c 2009-08-01 15:23:41.000000000 -0400 +@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGP + gpgme_error_t err; + gpgme_ctx_t ctx; + ++ gpgme_check_version (NULL); + err = gpgme_engine_check_version (proto); + g_return_if_fail (GPG_IS_OK (err)); + diff --git a/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c b/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c new file mode 100644 index 000000000..d423b6b59 --- /dev/null +++ b/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c @@ -0,0 +1,23 @@ +--- plugins/nautilus/seahorse-tool.c.orig 2009-08-01 15:27:07.000000000 -0400 ++++ plugins/nautilus/seahorse-tool.c 2009-08-01 15:23:46.000000000 -0400 +@@ -171,6 +171,9 @@ prompt_recipients (gpgme_key_t *signkey) + + if (recips) { + ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + +@@ -327,6 +330,10 @@ prompt_signer () + + id = cryptui_keyset_key_raw_keyid (keyset, signer); + g_free (signer); ++ ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); 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); + |