rpms/GConf2/devel GConf2.spec,1.107,1.108 polkit1.patch,1.2,1.3
Matthias Clasen
mclasen at fedoraproject.org
Fri Jun 12 18:33:38 UTC 2009
- Previous message (by thread): rpms/openttd/F-11 .cvsignore, 1.2, 1.3 openttd.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/abiword/devel abiword.keys, NONE, 1.1 abiword.xml, NONE, 1.1 abiword.spec, 1.76, 1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25123
Modified Files:
GConf2.spec polkit1.patch
Log Message:
Improve polkit port
Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- GConf2.spec 10 Jun 2009 03:30:36 -0000 1.107
+++ GConf2.spec 12 Jun 2009 18:33:07 -0000 1.108
@@ -7,7 +7,7 @@
Summary: A process-transparent configuration system
Name: GConf2
Version: 2.26.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Base
Source: http://download.gnome.org/sources/GConf/2.26/GConf-%{version}.tar.bz2
@@ -37,7 +37,8 @@ Patch0: GConf-2.18.0.1-reload.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=568845
Patch1: GConf-gettext.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=498370
+# http://bugzilla.redhat.com/show_bug.cgi?id=498370
+# http://bugzilla.gnome.org/show_bug.cgi?id=585303
Patch2: polkit1.patch
@@ -153,6 +154,9 @@ fi
%{_libdir}/pkgconfig/*
%changelog
+* Tue Jun 9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-3
+- Improve the port
+
* Tue Jun 9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-2
- Port to PolicyKit 1
polkit1.patch:
Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/polkit1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- polkit1.patch 10 Jun 2009 03:30:36 -0000 1.2
+++ polkit1.patch 12 Jun 2009 18:33:07 -0000 1.3
@@ -1,6 +1,6 @@
diff -up GConf-2.26.2/configure.in.polkit1 GConf-2.26.2/configure.in
--- GConf-2.26.2/configure.in.polkit1 2009-05-14 11:18:34.000000000 -0400
-+++ GConf-2.26.2/configure.in 2009-06-09 21:12:21.335927355 -0400
++++ GConf-2.26.2/configure.in 2009-06-12 13:00:27.978836073 -0400
@@ -181,7 +181,7 @@ AC_ARG_ENABLE(defaults_service,
, enable_defaults_service=auto)
@@ -26,7 +26,7 @@ diff -up GConf-2.26.2/configure.in.polki
AM_CONDITIONAL(ENABLE_DEFAULTS_SERVICE, [test "x$enable_defaults_service" != "xno"])
diff -up GConf-2.26.2/defaults/gconf-defaults.c.polkit1 GConf-2.26.2/defaults/gconf-defaults.c
--- GConf-2.26.2/defaults/gconf-defaults.c.polkit1 2009-05-14 11:13:40.000000000 -0400
-+++ GConf-2.26.2/defaults/gconf-defaults.c 2009-06-09 21:07:45.472634301 -0400
++++ GConf-2.26.2/defaults/gconf-defaults.c 2009-06-12 14:21:50.117398713 -0400
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
@@ -242,7 +242,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
*p = 0;
}
-@@ -323,56 +315,158 @@ polkit_action_for_gconf_path (GConfDefau
+@@ -323,56 +315,160 @@ polkit_action_for_gconf_path (GConfDefau
return action;
}
@@ -296,6 +296,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ gpointer user_data;
+ GDestroyNotify destroy;
+ PolkitSubject *subject;
++ gboolean challenge;
+} CheckAuthData;
- /* Check that caller is privileged */
@@ -442,12 +443,13 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ data->user_data = user_data;
+ data->destroy = destroy;
+ data->subject = polkit_system_bus_name_new (dbus_g_method_get_sender (context));
++ data->challenge = FALSE;
+
+ check_next_action (data);
}
static char *
-@@ -398,11 +492,11 @@ gconf_address_for_caller (GConfDefaults
+@@ -398,11 +494,11 @@ gconf_address_for_caller (GConfDefaults
dbus_error_free (&error);
return NULL;
}
@@ -462,7 +464,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
"Failed to get passwd information for uid %d", uid);
return NULL;
}
-@@ -434,13 +528,13 @@ copy_tree (GConfClient *src,
+@@ -434,13 +530,13 @@ copy_tree (GConfClient *src,
GSList *list, *l;
GConfEntry *entry;
@@ -478,7 +480,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
gconf_change_set_set (changes, entry->key, entry->value);
}
g_slist_foreach (list, (GFunc)gconf_entry_free, NULL);
-@@ -461,7 +555,7 @@ copy_entry (GConfClient *src,
+@@ -461,7 +557,7 @@ copy_entry (GConfClient *src,
{
GConfValue *value;
@@ -487,7 +489,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
return;
value = gconf_client_get (src, path, NULL);
-@@ -471,69 +565,66 @@ copy_entry (GConfClient *src,
+@@ -471,69 +567,66 @@ copy_entry (GConfClient *src,
}
}
@@ -599,7 +601,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
goto cleanup;
source = gconf_client_get_for_engine (engine);
-@@ -542,45 +633,175 @@ do_copy (GConfDefaults *mechani
+@@ -542,45 +635,175 @@ do_copy (GConfDefaults *mechani
changes = gconf_change_set_new ();
/* recursively copy each include, leaving out the excludes */
@@ -793,7 +795,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
}
static void
-@@ -594,20 +815,13 @@ append_key (GConfChangeSet *cs,
+@@ -594,20 +817,13 @@ append_key (GConfChangeSet *cs,
g_ptr_array_add (keys, (gpointer) key);
}
@@ -818,7 +820,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
keys = g_ptr_array_new ();
gconf_change_set_foreach (changes, append_key, keys);
g_ptr_array_add (keys, NULL);
-@@ -615,7 +829,15 @@ gconf_defaults_set_system (GConfDefaults
+@@ -615,7 +831,15 @@ gconf_defaults_set_system (GConfDefaults
g_signal_emit (mechanism, signals[SYSTEM_SET], 0, keys->pdata);
g_ptr_array_free (keys, TRUE);
@@ -835,7 +837,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
}
void
-@@ -624,7 +846,7 @@ gconf_defaults_set_mandatory (GConfDefau
+@@ -624,7 +848,7 @@ gconf_defaults_set_mandatory (GConfDefau
const char **excludes,
DBusGMethodInvocation *context)
{
@@ -844,7 +846,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
}
static void
-@@ -636,13 +858,13 @@ unset_tree (GConfClient *dest,
+@@ -636,13 +860,13 @@ unset_tree (GConfClient *dest,
GSList *list, *l;
GConfEntry *entry;
@@ -860,7 +862,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
gconf_change_set_unset (changes, entry->key);
}
g_slist_foreach (list, (GFunc)gconf_entry_free, NULL);
-@@ -654,25 +876,25 @@ unset_tree (GConfClient *dest,
+@@ -654,25 +878,25 @@ unset_tree (GConfClient *dest,
g_slist_foreach (list, (GFunc)g_free, NULL);
g_slist_free (list);
}
@@ -894,7 +896,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
{
GConfEngine *engine;
GConfClient *dest = NULL;
-@@ -680,7 +902,7 @@ unset_in_db (GConfDefaults *mechanism,
+@@ -680,7 +904,7 @@ unset_in_db (GConfDefaults *mechanism,
int i;
engine = gconf_engine_get_local (address, error);
@@ -903,7 +905,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
goto out;
dest = gconf_client_get_for_engine (engine);
-@@ -706,48 +928,219 @@ out:
+@@ -706,48 +930,224 @@ out:
gconf_change_set_unref (changes);
}
@@ -1041,6 +1043,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ g_debug ("result for '%s': challenge\n",
+ data->actions[data->id]);
+ is_authorized = TRUE;
++ data->challenge = TRUE;
+ }
+ else {
+ g_debug ("result for '%s': not authorized\n",
@@ -1054,8 +1057,11 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ if (is_authorized) {
+ data->id++;
+ if (data->actions[data->id] == NULL) {
-+ g_debug ("return TRUE\n");
-+ dbus_g_method_return (data->context, TRUE);
++ gint result;
++
++ result = data->challenge ? 1 : 2;
++ g_debug ("return %d\n", result);
++ dbus_g_method_return (data->context, result);
+ }
+ else {
+ check_next_action (data);
@@ -1065,8 +1071,8 @@ diff -up GConf-2.26.2/defaults/gconf-def
- else
- dbus_g_method_return (context);
+ else {
-+ g_debug ("return FALSE\n");
-+ dbus_g_method_return (data->context, FALSE);
++ g_debug ("return 0\n");
++ dbus_g_method_return (data->context, 0);
+ }
+
out:
@@ -1097,6 +1103,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ data->user_data = NULL;
+ data->destroy = NULL;
+ data->subject = polkit_system_bus_name_new (dbus_g_method_get_sender (context));
++ data->challenge = FALSE;
+
+ check_next_action (data);
+}
@@ -1153,7 +1160,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
+
diff -up GConf-2.26.2/defaults/gconf-defaults.h.polkit1 GConf-2.26.2/defaults/gconf-defaults.h
--- GConf-2.26.2/defaults/gconf-defaults.h.polkit1 2009-05-14 11:13:40.000000000 -0400
-+++ GConf-2.26.2/defaults/gconf-defaults.h 2009-06-09 21:07:45.474639261 -0400
++++ GConf-2.26.2/defaults/gconf-defaults.h 2009-06-12 13:00:27.984836059 -0400
@@ -83,6 +83,14 @@ void gconf_defaults_unset_mand
const char **excludes,
DBusGMethodInvocation *context);
@@ -1171,7 +1178,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
#endif /* GCONF_DEFAULTS_H */
diff -up GConf-2.26.2/defaults/gconf-defaults-main.c.polkit1 GConf-2.26.2/defaults/gconf-defaults-main.c
--- GConf-2.26.2/defaults/gconf-defaults-main.c.polkit1 2009-05-05 20:37:32.000000000 -0400
-+++ GConf-2.26.2/defaults/gconf-defaults-main.c 2009-06-09 21:07:45.475644220 -0400
++++ GConf-2.26.2/defaults/gconf-defaults-main.c 2009-06-12 13:00:27.987836052 -0400
@@ -122,6 +122,29 @@ get_system_bus (void)
return bus;
}
@@ -1236,7 +1243,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
diff -up GConf-2.26.2/defaults/gconf-defaults.xml.polkit1 GConf-2.26.2/defaults/gconf-defaults.xml
--- GConf-2.26.2/defaults/gconf-defaults.xml.polkit1 2009-05-14 11:13:40.000000000 -0400
-+++ GConf-2.26.2/defaults/gconf-defaults.xml 2009-06-09 21:07:45.476638353 -0400
++++ GConf-2.26.2/defaults/gconf-defaults.xml 2009-06-12 14:21:43.646401662 -0400
@@ -2,12 +2,12 @@
<node name="/">
<interface name="org.gnome.GConf.Defaults">
@@ -1260,7 +1267,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ <method name="CanSetSystem">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg name="includes" direction="in" type="as"/>
-+ <arg name="result" direction="out" type="b"/>
++ <arg name="result" direction="out" type="u"/>
+ </method>
+
<signal name="SystemSet">
@@ -1279,13 +1286,7 @@ diff -up GConf-2.26.2/defaults/gconf-def
recursively, skipping the excluded subtrees.
To decide which PolicyKit privilege to require for the copying of
each path in includes, the mechanism looks for a privilege with an
-@@ -41,12 +47,12 @@
- <method name="SetMandatory">
- <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
- <arg name="includes" direction="in" type="as"/>
-- <arg name="excludes" direction="in" type="as"/>
-+ <arg name="result" direction="out" type="b"/>
- </method>
+@@ -46,7 +52,7 @@
<!--
Unsets keys in the system-wide mandatory GConf database, making the
@@ -1303,14 +1304,14 @@ diff -up GConf-2.26.2/defaults/gconf-def
+ <method name="CanSetMandatory">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg name="includes" direction="in" type="as"/>
-+ <arg name="result" direction="out" type="b"/>
++ <arg name="result" direction="out" type="u"/>
+ </method>
+
</interface>
</node>
diff -up GConf-2.26.2/defaults/Makefile.am.polkit1 GConf-2.26.2/defaults/Makefile.am
--- GConf-2.26.2/defaults/Makefile.am.polkit1 2009-04-25 02:44:06.000000000 -0400
-+++ GConf-2.26.2/defaults/Makefile.am 2009-06-09 21:07:45.478662799 -0400
++++ GConf-2.26.2/defaults/Makefile.am 2009-06-12 13:00:27.990835416 -0400
@@ -20,13 +20,13 @@ INCLUDES = \
gconf_defaults_mechanism_LDADD = \
- Previous message (by thread): rpms/openttd/F-11 .cvsignore, 1.2, 1.3 openttd.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rpms/abiword/devel abiword.keys, NONE, 1.1 abiword.xml, NONE, 1.1 abiword.spec, 1.76, 1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list