diff options
Diffstat (limited to 'security/seahorse/files')
5 files changed, 0 insertions, 122 deletions
diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse/files/patch-agent_seahorse-agent-io.c deleted file mode 100644 index 4ecd84940..000000000 --- a/security/seahorse/files/patch-agent_seahorse-agent-io.c +++ /dev/null @@ -1,32 +0,0 @@ ---- 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-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c deleted file mode 100644 index 25531909e..000000000 --- a/security/seahorse/files/patch-agent_seahorse-agent.c +++ /dev/null @@ -1,40 +0,0 @@ ---- agent/seahorse-agent.c.orig Thu May 19 00:15:36 2005 -+++ agent/seahorse-agent.c Thu Jul 28 01:32:39 2005 -@@ -273,18 +273,18 @@ main (int argc, char **argv) - const char *sockname; - GnomeProgram *program = NULL; - -- secmem_init (65536); -- - /* We need to drop privileges completely for security */ - #if defined(HAVE_SETRESUID) && defined(HAVE_SETRESGID) - - /* Not in header files for all OSs, even where present */ - int setresuid(uid_t ruid, uid_t euid, uid_t suid); - int setresgid(gid_t rgid, gid_t egid, gid_t sgid); -+ secmem_init (65536); - - if (setresuid (getuid (), getuid (), getuid ()) == -1 || - setresgid (getgid (), getgid (), getgid ()) == -1) - #else -+ secmem_init (65536); - if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1) - #endif - err (1, _("couldn't drop privileges properly")); -@@ -301,7 +301,6 @@ main (int argc, char **argv) - * All functions after this point have to print messages - * nicely and not just called exit() - */ -- daemonize (sockname); - - /* Handle some signals */ - signal (SIGINT, on_quit); -@@ -314,6 +313,8 @@ main (int argc, char **argv) - /* 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-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c deleted file mode 100644 index fc8b7af60..000000000 --- a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libseahorse/seahorse-key-store.c.orig Wed Dec 22 15:18:27 2004 -+++ libseahorse/seahorse-key-store.c Wed Dec 22 15:19:48 2004 -@@ -184,6 +184,8 @@ - { - GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props); - SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj); -+ guint cols; -+ GType* types; - - /* init private vars */ - skstore->priv = g_new0 (SeahorseKeyStorePriv, 1); -@@ -191,8 +193,8 @@ - NULL, (GDestroyNotify)seahorse_key_row_free); - - /* Setup the store */ -- guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns; -- GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types; -+ cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns; -+ types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types; - gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types); - - /* Setup the sort and filter */ diff --git a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c deleted file mode 100644 index d7422de5e..000000000 --- a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libseahorse/seahorse-server-source.c.orig Fri Mar 11 22:17:43 2005 -+++ libseahorse/seahorse-server-source.c Fri Mar 11 22:17:55 2005 -@@ -518,11 +518,11 @@ - seahorse_server_source_get_state (SeahorseKeySource *src) - { - SeahorseServerSource *ssrc; -+ guint state = SEAHORSE_KEY_SOURCE_REMOTE; - - g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0); - ssrc = SEAHORSE_SERVER_SOURCE (src); - -- guint state = SEAHORSE_KEY_SOURCE_REMOTE; - if (!seahorse_operation_is_done (ssrc->priv->operation)) - state |= SEAHORSE_KEY_SOURCE_LOADING; - return state; diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c deleted file mode 100644 index 9e356ed1a..000000000 --- a/security/seahorse/files/patch-src_seahorse-generate-druid.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/seahorse-generate-druid.c.orig Wed Dec 22 15:22:02 2004 -+++ src/seahorse-generate-druid.c Wed Dec 22 15:22:22 2004 -@@ -173,8 +173,9 @@ - gboolean - on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget) - { -+ GtkWidget *druidpage; - g_print("go to finish\n"); -- GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1"); -+ druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1"); - - gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage)); - gtk_widget_show (druidpage); |