cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a couple of fixes from upstream.

Browse Source
This commit is contained in:
ajacoutot 2014-08-17 06:47:39 +00:00
parent 3637298e68
commit f41d5db51d
3 changed files with 120 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/polkit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.58 2014/03/27 17:51:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.59 2014/08/17 06:47:39 ajacoutot Exp $
COMMENT= framework for granting privileged operations to users
DISTNAME= polkit-0.112
REVISION= 6
REVISION= 7
SHARED_LIBS += polkit-gobject-1 2.0 # .0.0
SHARED_LIBS += polkit-agent-1 2.0 # .0.0

100
sysutils/polkit/patches/patch-src_polkitagent_polkitagentsession_c Normal file
View File

@ -0,0 +1,100 @@
$OpenBSD: patch-src_polkitagent_polkitagentsession_c,v 1.1 2014/08/17 06:47:39 ajacoutot Exp $
From 7650ad1e08ab13bdb461783c4995d186d9392840 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Thu, 6 Feb 2014 18:41:18 +0100
Subject: PolkitAgentSession: fix race between child and io watches
--- src/polkitagent/polkitagentsession.c.orig Mon Apr 29 19:28:57 2013
+++ src/polkitagent/polkitagentsession.c Sun Aug 17 08:40:32 2014
@@ -92,7 +92,6 @@ struct _PolkitAgentSession
int child_stdout;
GPid child_pid;
- GSource *child_watch_source;
GSource *child_stdout_watch_source;
GIOChannel *child_stdout_channel;
@@ -377,13 +376,6 @@ kill_helper (PolkitAgentSession *session)
session->child_pid = 0;
}
- if (session->child_watch_source != NULL)
- {
- g_source_destroy (session->child_watch_source);
- g_source_unref (session->child_watch_source);
- session->child_watch_source = NULL;
- }
-
if (session->child_stdout_watch_source != NULL)
{
g_source_destroy (session->child_stdout_watch_source);
@@ -429,26 +421,6 @@ complete_session (PolkitAgentSession *session,
}
}
-static void
-child_watch_func (GPid pid,
- gint status,
- gpointer user_data)
-{
- PolkitAgentSession *session = POLKIT_AGENT_SESSION (user_data);
-
- if (G_UNLIKELY (_show_debug ()))
- {
- g_print ("PolkitAgentSession: in child_watch_func for pid %d (WIFEXITED=%d WEXITSTATUS=%d)\n",
- (gint) pid,
- WIFEXITED(status),
- WEXITSTATUS(status));
- }
-
- /* kill all the watches we have set up, except for the child since it has exited already */
- session->child_pid = 0;
- complete_session (session, FALSE);
-}
-
static gboolean
io_watch_have_data (GIOChannel *channel,
GIOCondition condition,
@@ -475,10 +447,13 @@ io_watch_have_data (GIOChannel *channel,
NULL,
NULL,
&error);
- if (error != NULL)
+ if (error != NULL || line == NULL)
{
- g_warning ("Error reading line from helper: %s", error->message);
- g_error_free (error);
+ /* In case we get just G_IO_HUP, line is NULL but error is
+ unset.*/
+ g_warning ("Error reading line from helper: %s",
+ error ? error->message : "nothing to read");
+ g_clear_error (&error);
complete_session (session, FALSE);
goto out;
@@ -540,6 +515,9 @@ io_watch_have_data (GIOChannel *channel,
g_free (line);
g_free (unescaped);
+ if (condition & (G_IO_ERR | G_IO_HUP))
+ complete_session (session, FALSE);
+
/* keep the IOChannel around */
return TRUE;
}
@@ -650,12 +628,9 @@ polkit_agent_session_initiate (PolkitAgentSession *ses
if (G_UNLIKELY (_show_debug ()))
g_print ("PolkitAgentSession: spawned helper with pid %d\n", (gint) session->child_pid);
- session->child_watch_source = g_child_watch_source_new (session->child_pid);
- g_source_set_callback (session->child_watch_source, (GSourceFunc) child_watch_func, session, NULL);
- g_source_attach (session->child_watch_source, g_main_context_get_thread_default ());
-
session->child_stdout_channel = g_io_channel_unix_new (session->child_stdout);
- session->child_stdout_watch_source = g_io_create_watch (session->child_stdout_channel, G_IO_IN);
+ session->child_stdout_watch_source = g_io_create_watch (session->child_stdout_channel,
+ G_IO_IN | G_IO_ERR | G_IO_HUP);
g_source_set_callback (session->child_stdout_watch_source, (GSourceFunc) io_watch_have_data, session, NULL);
g_source_attach (session->child_stdout_watch_source, g_main_context_get_thread_default ());

18
sysutils/polkit/patches/patch-src_polkitbackend_polkitd_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_polkitbackend_polkitd_c,v 1.1 2014/08/17 06:47:39 ajacoutot Exp $
From 3ca4e00c7e003ea80aa96b499bc7cd83246d7108 Mon Sep 17 00:00:00 2001
From: Lukasz Skalski <l.skalski@samsung.com>
Date: Tue, 22 Apr 2014 11:11:20 +0200
Subject: polkitd: Fix problem with removing non-existent source
--- src/polkitbackend/polkitd.c.orig Mon Apr 29 19:28:57 2013
+++ src/polkitbackend/polkitd.c Sun Aug 17 08:40:30 2014
@@ -92,7 +92,7 @@ on_sigint (gpointer user_data)
{
g_print ("Handling SIGINT\n");
g_main_loop_quit (loop);
- return FALSE;
+ return TRUE;
}
static gboolean