diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-02-01 21:26:59 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-02-01 21:26:59 +0000 |
| commit | 6a68d2a6501095a7dc55c7fd87d513263562ef6f (patch) | |
| tree | 83c08240656e82f283c4fd2e23cbd85dba534eab /security/seahorse | |
| parent | 8cf9cd521fa6b57a6af06e4c9821742cfdb51d7d (diff) | |
Notes
Diffstat (limited to 'security/seahorse')
| -rw-r--r-- | security/seahorse/Makefile | 3 | ||||
| -rw-r--r-- | security/seahorse/files/patch-agent_seahorse-agent-io.c | 32 | ||||
| -rw-r--r-- | security/seahorse/files/patch-agent_seahorse-agent.c | 19 | ||||
| -rw-r--r-- | security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c | 11 |
4 files changed, 64 insertions, 1 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index e320a2aaa9ff..30b3d25a8e06 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -7,12 +7,13 @@ PORTNAME= seahorse PORTVERSION= 0.7.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7 DIST_SUBDIR= gnome2 -MAINTAINER= asa@gascom.ru +MAINTAINER= asa@agava.com COMMENT= A front end for GnuPG BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse/files/patch-agent_seahorse-agent-io.c new file mode 100644 index 000000000000..73f68960ed3f --- /dev/null +++ b/security/seahorse/files/patch-agent_seahorse-agent-io.c @@ -0,0 +1,32 @@ +--- agent/seahorse-agent-io.c.orig Fri Jan 28 15:52:18 2005 ++++ agent/seahorse-agent-io.c Fri Jan 28 15:54:19 2005 +@@ -377,12 +377,18 @@ + gsize length; + GError *err = NULL; + gboolean ret = TRUE; ++ GIOStatus status; + + if (condition & G_IO_IN) { + /* Read 1 line from the io channel, including newline character */ +- g_io_channel_read_line (source, &string, &length, NULL, &err); ++ status = g_io_channel_read_line (source, &string, &length, NULL, &err); + +- if (err != NULL) { ++ if (status == G_IO_STATUS_EOF) { ++ free_conn (cn); ++ ret = FALSE; ++ } ++ ++ else if (err != NULL) { + g_critical ("couldn't read from socket: %s", err->message); + g_clear_error (&err); + free_conn (cn); +@@ -398,7 +404,7 @@ + g_free (string); + } + +- if (condition & G_IO_HUP) { ++ else if (condition & G_IO_HUP) { + free_conn (cn); + ret = FALSE; /* removes watch */ + } diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c new file mode 100644 index 000000000000..577649bbf7a2 --- /dev/null +++ b/security/seahorse/files/patch-agent_seahorse-agent.c @@ -0,0 +1,19 @@ +--- agent/seahorse-agent.c.orig Mon Jan 31 11:14:02 2005 ++++ agent/seahorse-agent.c Mon Jan 31 11:14:48 2005 +@@ -309,7 +309,6 @@ + * All functions after this point have to print messages + * nicely and not just called exit() + */ +- daemonize (sockname); + + /* Handle some signals */ + signal (SIGINT, on_quit); +@@ -322,6 +321,8 @@ + /* Initialize our sub systems */ + seahorse_agent_actions_init (); + seahorse_agent_cache_init (); ++ ++ daemonize (sockname); + + if (seahorse_agent_io_init () == -1) + return 1; /* message already printed */ diff --git a/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c b/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c new file mode 100644 index 000000000000..2eca53c2d888 --- /dev/null +++ b/security/seahorse/files/patch-libseahorse_seahorse-gpg-options.c @@ -0,0 +1,11 @@ +--- libseahorse/seahorse-gpg-options.c.orig Wed Jan 26 12:11:42 2005 ++++ libseahorse/seahorse-gpg-options.c Wed Jan 26 12:11:57 2005 +@@ -31,7 +31,7 @@ + #include "seahorse-gpg-options.h" + + #define GPG_CONF_HEADER "# FILE CREATED BY SEAHORSE\n\n" +-#define GPG_VERSION_PREFIX "1.2." ++#define GPG_VERSION_PREFIX "1.4." + + static gchar gpg_homedir[MAXPATHLEN]; + static gboolean gpg_options_inited = FALSE; |