rpms/gnome-panel/devel gnome-panel.spec, 1.364, 1.365 polkit1.patch, 1.1, 1.2
Matthias Clasen
mclasen at fedoraproject.org
Thu Aug 13 18:26:39 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22631
Modified Files:
gnome-panel.spec polkit1.patch
Log Message:
Stricter clock applet policy
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -p -r1.364 -r1.365
--- gnome-panel.spec 6 Aug 2009 00:24:40 -0000 1.364
+++ gnome-panel.spec 13 Aug 2009 18:26:38 -0000 1.365
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 7%{?dist}
+Release: 8%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
@@ -370,6 +370,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Aug 13 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-8
+- Stricter clock-applet PolicyKit policy
+
* Wed Aug 5 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-7
- Make 'Clear Recent Documents' follow the menu-images setting
polkit1.patch:
applets/clock/Makefile.am | 10
applets/clock/clock-location.c | 3
applets/clock/clock.c | 4
applets/clock/gnome-clock-applet-mechanism.c | 146 ++++----
applets/clock/gnome-clock-applet-mechanism.h | 5
applets/clock/gnome-clock-applet-mechanism.xml | 8
applets/clock/org.gnome.clockapplet.mechanism.policy.in | 6
applets/clock/set-timezone.c | 274 +++-------------
applets/clock/set-timezone.h | 2
configure.in | 20 -
10 files changed, 169 insertions(+), 309 deletions(-)
Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- polkit1.patch 10 Jun 2009 04:20:34 -0000 1.1
+++ polkit1.patch 13 Aug 2009 18:26:38 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1 gnome-panel-2.26.1/applets/clock/clock.c
---- gnome-panel-2.26.1/applets/clock/clock.c.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock.c 2009-05-13 17:53:57.490936276 -0400
-@@ -1707,7 +1707,7 @@ update_set_time_button (ClockData *cd)
+diff -up gnome-panel-2.27.4/applets/clock/clock.c.polkit1 gnome-panel-2.27.4/applets/clock/clock.c
+--- gnome-panel-2.27.4/applets/clock/clock.c.polkit1 2009-07-01 09:06:23.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/clock.c 2009-08-13 14:09:17.734209990 -0400
+@@ -1617,7 +1617,7 @@ update_set_time_button (ClockData *cd)
{
gint can_set;
@@ -10,7 +10,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
if (cd->time_settings_button)
gtk_widget_set_sensitive (cd->time_settings_button, can_set);
-@@ -1770,7 +1770,7 @@ set_time (GtkWidget *widget, ClockData *
+@@ -1680,7 +1680,7 @@ set_time (GtkWidget *widget, ClockData *
tim = mktime (&t);
@@ -19,9 +19,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
}
static void
-diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1 gnome-panel-2.26.1/applets/clock/clock-location.c
---- gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1 2009-05-13 17:53:57.477962768 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-05-13 17:53:57.491936414 -0400
+diff -up gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1 gnome-panel-2.27.4/applets/clock/clock-location.c
+--- gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1 2009-08-13 14:09:17.708956705 -0400
++++ gnome-panel-2.27.4/applets/clock/clock-location.c 2009-08-13 14:09:17.737208766 -0400
@@ -537,8 +537,7 @@ clock_location_make_current (ClockLocati
filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
@@ -32,9 +32,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
mcdata,
free_make_current_data);
g_free (filename);
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c 2009-05-13 18:00:51.818938425 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c 2009-08-13 14:09:17.739206856 -0400
@@ -37,7 +37,7 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -233,9 +233,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
+ return TRUE;
}
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h 2009-05-13 17:53:57.493994728 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h 2009-08-13 14:09:17.740206913 -0400
@@ -69,9 +69,14 @@ gboolean gnome_clock_applet_m
const char *zone_file,
DBusGMethodInvocation *context);
@@ -251,9 +251,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
gboolean gnome_clock_applet_mechanism_adjust_time (GnomeClockAppletMechanism *mechanism,
gint64 seconds_to_add,
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml 2009-05-13 17:53:57.494962879 -0400
+diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml
+--- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml 2009-08-13 14:09:17.741205993 -0400
@@ -5,10 +5,18 @@
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg name="zonefile" direction="in" type="s"/>
@@ -273,10 +273,10 @@ diff -up gnome-panel-2.26.1/applets/cloc
<method name="AdjustTime">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg name="seconds_to_add" direction="in" type="x"/>
-diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1 gnome-panel-2.26.1/applets/clock/Makefile.am
---- gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/Makefile.am 2009-05-13 17:53:57.495947232 -0400
-@@ -7,7 +7,7 @@ INCLUDES = \
+diff -up gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1 gnome-panel-2.27.4/applets/clock/Makefile.am
+--- gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1 2009-07-01 09:06:23.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/Makefile.am 2009-08-13 14:09:17.742205491 -0400
+@@ -9,7 +9,7 @@ INCLUDES = \
$(GNOME_INCLUDEDIR) \
$(WARN_CFLAGS) \
$(CLOCK_CFLAGS) \
@@ -285,7 +285,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
$(LIBPANEL_APPLET_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGLADEDIR=\""$(datadir)/gnome-panel/glade"\" \
-@@ -66,7 +66,7 @@ CLOCK_LDADD = \
+@@ -67,7 +67,7 @@ CLOCK_LDADD = \
../../libpanel-applet/libpanel-applet-2.la \
$(CLOCK_LIBS) \
$(LIBPANEL_APPLET_LIBS) \
@@ -294,7 +294,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
-lgweather
BUILT_SOURCES = \
-@@ -128,11 +128,11 @@ endif
+@@ -132,11 +132,11 @@ endif
gnome_clock_applet_mechanism_INCLUDES = \
$(CLOCK_MECHANISM_CFLAGS) \
@@ -308,7 +308,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
if CLOCK_INPROCESS
APPLET_TYPE = shlib
-@@ -201,7 +201,7 @@ endif
+@@ -206,7 +206,7 @@ endif
dbus_servicesdir = $(datadir)/dbus-1/system-services
dbus_confdir = $(sysconfdir)/dbus-1/system.d
@@ -317,15 +317,15 @@ diff -up gnome-panel-2.26.1/applets/cloc
dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
-diff -up gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in
---- gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in 2009-05-13 17:53:57.496936685 -0400
+diff -up gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in
+--- gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in 2009-08-13 14:21:10.175979956 -0400
@@ -13,7 +13,7 @@
<_message>Privileges are required to change the system time zone.</_message>
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_always</allow_active>
-+ <allow_active>auth_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
@@ -334,7 +334,7 @@ diff -up gnome-panel-2.26.1/applets/cloc
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_always</allow_active>
-+ <allow_active>auth_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
@@ -343,13 +343,13 @@ diff -up gnome-panel-2.26.1/applets/cloc
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_always</allow_active>
-+ <allow_active>auth_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1 gnome-panel-2.26.1/applets/clock/set-timezone.c
---- gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.c 2009-05-13 17:53:57.497965108 -0400
+diff -up gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.c
+--- gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/set-timezone.c 2009-08-13 14:09:17.744960941 -0400
@@ -32,31 +32,8 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -719,9 +719,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
data->callback = callback;
data->data = d;
data->notify = notify;
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1 gnome-panel-2.26.1/applets/clock/set-timezone.h
---- gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.h 2009-05-13 17:53:57.498936332 -0400
+diff -up gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.h
+--- gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1 2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.27.4/applets/clock/set-timezone.h 2009-08-13 14:09:17.745957855 -0400
@@ -28,13 +28,11 @@ gint can_set_system_timezone (void);
gint can_set_system_time (void);
@@ -736,9 +736,9 @@ diff -up gnome-panel-2.26.1/applets/cloc
GFunc callback,
gpointer data,
GDestroyNotify notify);
-diff -up gnome-panel-2.26.1/configure.in.polkit1 gnome-panel-2.26.1/configure.in
---- gnome-panel-2.26.1/configure.in.polkit1 2009-04-14 16:15:50.000000000 -0400
-+++ gnome-panel-2.26.1/configure.in 2009-05-13 17:53:57.498936332 -0400
+diff -up gnome-panel-2.27.4/configure.in.polkit1 gnome-panel-2.27.4/configure.in
+--- gnome-panel-2.27.4/configure.in.polkit1 2009-07-15 11:05:33.000000000 -0400
++++ gnome-panel-2.27.4/configure.in 2009-08-13 14:09:17.746976770 -0400
@@ -129,24 +129,21 @@ PKG_CHECK_MODULES(CLOCK_MECHANISM, [ gth
AC_SUBST(CLOCK_MECHANISM_CFLAGS)
AC_SUBST(CLOCK_MECHANISM_LIBS)
More information about the scm-commits
mailing list