diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-12-24 02:25:56 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-12-24 02:25:56 +0800 |
| commit | 8f7699a916274225e82d9a825d324067d3d3c40a (patch) | |
| tree | d7cdaca330513a8dcf0111ae92fe50e5c142485c /security/seahorse/files | |
| parent | 6d31b38de8b1d460e30241e3dd051a065465b5d1 (diff) | |
| download | marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar.gz marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar.bz2 marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar.lz marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar.xz marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.tar.zst marcuscom-ports-8f7699a916274225e82d9a825d324067d3d3c40a.zip | |
Add and update to 2.21.4
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9991 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/seahorse/files')
| -rw-r--r-- | security/seahorse/files/patch-agent_seahorse-agent-io.c | 32 | ||||
| -rw-r--r-- | security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c | 10 |
2 files changed, 42 insertions, 0 deletions
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 000000000..4ecd84940 --- /dev/null +++ b/security/seahorse/files/patch-agent_seahorse-agent-io.c @@ -0,0 +1,32 @@ +--- agent/seahorse-agent-io.c.orig Sun Aug 28 15:52:02 2005 ++++ agent/seahorse-agent-io.c Fri Oct 7 21:51:25 2005 +@@ -412,12 +412,18 @@ io_handler (GIOChannel *source, GIOCondi + 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); +@@ -434,7 +440,7 @@ io_handler (GIOChannel *source, GIOCondi + g_free (string); + } + +- if (cn && condition & G_IO_HUP) { ++ else if (cn && condition & G_IO_HUP) { + free_conn (cn); + ret = FALSE; /* removes watch */ + } diff --git a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c new file mode 100644 index 000000000..e7a7e4f60 --- /dev/null +++ b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c @@ -0,0 +1,10 @@ +--- libseahorse/seahorse-ssh-operation.c.orig Sun Dec 3 23:21:01 2006 ++++ libseahorse/seahorse-ssh-operation.c Sun Dec 3 23:21:10 2006 +@@ -24,6 +24,7 @@ + #include <sys/socket.h> + #include <gnome.h> + #include <fcntl.h> ++#include <signal.h> + + #include "seahorse-ssh-operation.h" + #include "seahorse-util.h" |