r16089 - in /desktop/unstable/gnome-system-tools/debian: changelog control control.in patches/18_disable_uid.patch patches/22_root_only.patch patches/40_more-groups.patch patches/50_min-max-gid.patch patches/more-groups.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 28 13:03:28 UTC 2008
Author: joss
Date: Wed May 28 13:03:28 2008
New Revision: 16089
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16089
Log:
* New upstream release.
* Massive update to build-dependencies.
* Refresh and update patches to apply cleanly.
* 22_root_only.patch: don't switch uid for shares-admin, it does not
connect to the session bus.
* more-groups.patch renamed to 40_more-groups.patch.
Added:
desktop/unstable/gnome-system-tools/debian/patches/40_more-groups.patch
- copied unchanged from r16081, desktop/unstable/gnome-system-tools/debian/patches/more-groups.patch
Removed:
desktop/unstable/gnome-system-tools/debian/patches/more-groups.patch
Modified:
desktop/unstable/gnome-system-tools/debian/changelog
desktop/unstable/gnome-system-tools/debian/control
desktop/unstable/gnome-system-tools/debian/control.in
desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch
desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch
desktop/unstable/gnome-system-tools/debian/patches/50_min-max-gid.patch
desktop/unstable/gnome-system-tools/debian/patches/series
Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog Wed May 28 13:03:28 2008
@@ -1,3 +1,14 @@
+gnome-system-tools (2.22.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Massive update to build-dependencies.
+ * Refresh and update patches to apply cleanly.
+ * 22_root_only.patch: don't switch uid for shares-admin, it does not
+ connect to the session bus.
+ * more-groups.patch renamed to 40_more-groups.patch.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 May 2008 13:59:23 +0200
+
gnome-system-tools (2.20.0-6) unstable; urgency=low
* Upload to unstable.
Modified: desktop/unstable/gnome-system-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control (original)
+++ desktop/unstable/gnome-system-tools/debian/control Wed May 28 13:03:28 2008
@@ -2,28 +2,27 @@
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Dafydd Harries <daf at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>,
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>,
Niv Sardi <xaiki at debian.org>
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
intltool (>= 0.35.0),
quilt,
debhelper (>= 5),
- libglade2-dev (>= 1:2.5.1),
- libgnome2-dev (>= 2.10.0),
+ liboobs-1-dev (>= 2.21.3),
+ libgtk2.0-dev (>= 2.11.3),
+ cracklib2-dev,
+ libglib2.0-dev (>= 2.15.2),
+ libgconf2-dev (>= 2.2.0),
+ libdbus-1-dev (>= 0.32),
+ libiw-dev,
+ libnautilus-extension-dev (>= 2.9.3),
gettext,
- libgconf2-dev (>= 2.10.0),
libxml-parser-perl,
gnome-pkg-tools,
- scrollkeeper (>= 0.3.14-9.1),
- libnautilus-extension-dev (>= 2.10.0),
+ scrollkeeper,
gnome-doc-utils (>= 0.3.2),
- libgtk2.0-dev (>= 2.9.0),
- pkg-config,
- liboobs-1-dev (>= 2.17.5),
- libart-2.0-dev,
- libiw-dev,
- libdbus-1-dev (>= 0.32)
+ pkg-config
Standards-Version: 3.7.3
Package: gnome-system-tools
@@ -34,7 +33,6 @@
gksu,
system-tools-backends
Recommends: gnome-control-center (>= 1:2.10.1-1)
-Conflicts: system-tools-backends (<< 2.2)
Suggests: ntp,
samba-common,
wvdial
Modified: desktop/unstable/gnome-system-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control.in?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control.in (original)
+++ desktop/unstable/gnome-system-tools/debian/control.in Wed May 28 13:03:28 2008
@@ -9,21 +9,20 @@
intltool (>= 0.35.0),
quilt,
debhelper (>= 5),
- libglade2-dev (>= 1:2.5.1),
- libgnome2-dev (>= 2.10.0),
+ liboobs-1-dev (>= 2.21.3),
+ libgtk2.0-dev (>= 2.11.3),
+ cracklib2-dev,
+ libglib2.0-dev (>= 2.15.2),
+ libgconf2-dev (>= 2.2.0),
+ libdbus-1-dev (>= 0.32),
+ libiw-dev,
+ libnautilus-extension-dev (>= 2.9.3),
gettext,
- libgconf2-dev (>= 2.10.0),
libxml-parser-perl,
gnome-pkg-tools,
- scrollkeeper (>= 0.3.14-9.1),
- libnautilus-extension-dev (>= 2.10.0),
+ scrollkeeper,
gnome-doc-utils (>= 0.3.2),
- libgtk2.0-dev (>= 2.9.0),
- pkg-config,
- liboobs-1-dev (>= 2.17.5),
- libart-2.0-dev,
- libiw-dev,
- libdbus-1-dev (>= 0.32)
+ pkg-config
Standards-Version: 3.7.3
Package: gnome-system-tools
@@ -34,7 +33,6 @@
gksu,
system-tools-backends
Recommends: gnome-control-center (>= 1:2.10.1-1)
-Conflicts: system-tools-backends (<< 2.2)
Suggests: ntp,
samba-common,
wvdial
Modified: desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch Wed May 28 13:03:28 2008
@@ -1,16 +1,16 @@
-Index: gnome-system-tools-2.20.0/src/users/user-settings.c
+Index: gnome-system-tools-2.22.0/src/users/user-settings.c
===================================================================
---- gnome-system-tools-2.20.0.orig/src/users/user-settings.c 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/users/user-settings.c 2007-11-25 14:09:45.965238454 +0100
-@@ -297,6 +297,7 @@ user_settings_dialog_new (OobsUser *user
+--- gnome-system-tools-2.22.0.orig/src/users/user-settings.c 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/users/user-settings.c 2008-05-28 14:08:26.498847549 +0200
+@@ -332,6 +332,7 @@ user_settings_dialog_new (OobsUser *user
uid = find_new_uid (GST_USERS_TOOL (tool)->minimum_uid,
GST_USERS_TOOL (tool)->maximum_uid);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), uid);
+ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), TRUE);
setup_profiles_visibility (tool, TRUE);
} else {
- g_object_set_data (G_OBJECT (dialog), "is_new", GINT_TO_POINTER (FALSE));
-@@ -313,6 +314,7 @@ user_settings_dialog_new (OobsUser *user
+ g_object_set_data_full (G_OBJECT (dialog), "user",
+@@ -351,6 +352,7 @@ user_settings_dialog_new (OobsUser *user
widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user));
Modified: desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch Wed May 28 13:03:28 2008
@@ -1,14 +1,14 @@
-Index: gnome-system-tools-2.20.0/src/network/network.desktop.in.in
+Index: gnome-system-tools-2.22.0/src/network/network.desktop.in.in
===================================================================
---- gnome-system-tools-2.20.0.orig/src/network/network.desktop.in.in 2007-09-14 11:25:28.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/network/network.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/network/network.desktop.in.in 2008-03-09 17:07:02.000000000 +0100
++++ gnome-system-tools-2.22.0/src/network/network.desktop.in.in 2008-05-28 14:10:03.260319259 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Network
_Comment=Configure network devices and connections
-Exec=network-admin
+Exec=gksu network-admin
- Icon=gnome-fs-network
+ Icon=preferences-system-network
Terminal=false
Type=Application
@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
@@ -17,17 +17,17 @@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-Index: gnome-system-tools-2.20.0/src/services/services.desktop.in.in
+Index: gnome-system-tools-2.22.0/src/services/services.desktop.in.in
===================================================================
---- gnome-system-tools-2.20.0.orig/src/services/services.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/services/services.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/services/services.desktop.in.in 2008-03-09 17:07:02.000000000 +0100
++++ gnome-system-tools-2.22.0/src/services/services.desktop.in.in 2008-05-28 14:10:21.011352001 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Services
_Comment=Configure which services will be run when the system starts
-Exec=services-admin
+Exec=gksu services-admin
- Icon=gnome-fs-server
+ Icon=network-server
Terminal=false
Type=Application
@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
@@ -36,69 +36,29 @@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-Index: gnome-system-tools-2.20.0/src/shares/nautilus/nautilus-shares.c
+Index: gnome-system-tools-2.22.0/src/shares/nautilus/nautilus-shares.c
===================================================================
---- gnome-system-tools-2.20.0.orig/src/shares/nautilus/nautilus-shares.c 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/shares/nautilus/nautilus-shares.c 2007-11-25 14:09:50.753511322 +0100
-@@ -82,7 +82,7 @@ on_menu_item_activate (NautilusMenuItem
- GString *cmd;
- gchar *dir;
-
-- cmd = g_string_new ("shares-admin ");
-+ cmd = g_string_new ("gksu -- shares-admin ");
- info = g_object_get_data (G_OBJECT (menu_item), "file");
+--- gnome-system-tools-2.22.0.orig/src/shares/nautilus/nautilus-shares.c 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/shares/nautilus/nautilus-shares.c 2008-05-28 14:12:57.076340219 +0200
+@@ -96,9 +96,11 @@ on_menu_item_activate (NautilusMenuItem
+ shares = g_object_get_data (G_OBJECT (menu_item), "shares");
dir = get_path_from_file_info (info);
-Index: gnome-system-tools-2.20.0/src/shares/shares-tool.c
+- args = g_new0 (char *, 3);
+- args[0] = g_strdup ("shares-admin");
+- args[1] = g_strdup_printf ("--add-share=%s", dir);
++ args = g_new0 (char *, 5);
++ args[0] = g_strdup ("gksu");
++ args[1] = g_strdup ("--");
++ args[2] = g_strdup ("shares-admin");
++ args[3] = g_strdup_printf ("--add-share=%s", dir);
+
+ g_spawn_async (NULL, args, NULL,
+ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
+Index: gnome-system-tools-2.22.0/src/shares/shares.desktop.in.in
===================================================================
---- gnome-system-tools-2.20.0.orig/src/shares/shares-tool.c 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/shares/shares-tool.c 2007-11-25 14:09:50.753511322 +0100
-@@ -23,6 +23,9 @@
- #include <glib/gi18n.h>
- #include "gst.h"
-
-+#include <unistd.h>
-+#include <stdlib.h>
-+
- static void gst_shares_tool_class_init (GstSharesToolClass *class);
- static void gst_shares_tool_init (GstSharesTool *tool);
- static void gst_shares_tool_finalize (GObject *object);
-@@ -50,6 +53,21 @@ gst_shares_tool_init (GstSharesTool *too
- {
- GstTool *gst_tool = GST_TOOL (tool);
-
-+ /* temporarily switch to real user's uid to connect to his session bus
-+ * instead of root's */
-+ gboolean uid_changed = FALSE;
-+ if (geteuid() == 0) {
-+ const char* sudo_uid_str = getenv("SUDO_UID");
-+ int sudo_uid;
-+ if (sudo_uid_str) {
-+ sudo_uid = atoi(sudo_uid_str);
-+ if (sudo_uid > 0) {
-+ setreuid (sudo_uid, sudo_uid);
-+ uid_changed = TRUE;
-+ }
-+ }
-+ }
-+
- tool->nfs_config = oobs_nfs_config_get (gst_tool->session);
- tool->smb_config = oobs_smb_config_get (gst_tool->session);
-
-@@ -58,6 +76,9 @@ gst_shares_tool_init (GstSharesTool *too
- tool->ifaces_config = oobs_ifaces_config_get (gst_tool->session);
-
- gst_shares_tool_update_services_availability (tool);
-+
-+ if (uid_changed)
-+ setreuid (0, 0);
- }
-
- static void
-Index: gnome-system-tools-2.20.0/src/shares/shares.desktop.in.in
-===================================================================
---- gnome-system-tools-2.20.0.orig/src/shares/shares.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/shares/shares.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/shares/shares.desktop.in.in 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/shares/shares.desktop.in.in 2008-05-28 14:09:18.479351705 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Shared Folders
@@ -115,10 +75,10 @@
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-Index: gnome-system-tools-2.20.0/src/time/time-tool.c
+Index: gnome-system-tools-2.22.0/src/time/time-tool.c
===================================================================
---- gnome-system-tools-2.20.0.orig/src/time/time-tool.c 2007-09-14 11:25:29.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/time/time-tool.c 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/time/time-tool.c 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/time/time-tool.c 2008-05-28 14:20:49.334852544 +0200
@@ -19,6 +19,8 @@
* Authors: Carlos Garnacho Parro <carlosg at gnome.org>
*/
@@ -128,43 +88,49 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
-@@ -120,7 +122,25 @@ gst_time_tool_init (GstTimeTool *tool)
- OobsList *list;
+@@ -121,6 +123,21 @@ gst_time_tool_init (GstTimeTool *tool)
+ DBusError error;
GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
-+ /* temporarily switch to real user's uid to connect to his session bus
-+ * instead of root's */
-+ gboolean uid_changed = FALSE;
-+ if (geteuid() == 0) {
-+ const char* sudo_uid_str = getenv("SUDO_UID");
-+ int sudo_uid;
-+ if (sudo_uid_str) {
-+ sudo_uid = atoi(sudo_uid_str);
-+ if (sudo_uid > 0) {
-+ setreuid (sudo_uid, -1);
-+ uid_changed = TRUE;
-+ }
-+ }
-+ }
++ /* temporarily switch to real user's uid to connect to his session bus
++ * instead of root's */
++ gboolean uid_changed = FALSE;
++ if (geteuid() == 0) {
++ const char* sudo_uid_str = getenv("SUDO_UID");
++ int sudo_uid;
++ if (sudo_uid_str) {
++ sudo_uid = atoi(sudo_uid_str);
++ if (sudo_uid > 0) {
++ setreuid (sudo_uid, -1);
++ uid_changed = TRUE;
++ }
++ }
++ }
+
- priv->bus_connection = dbus_bus_get (DBUS_BUS_SESSION, NULL);
-+ if (uid_changed)
-+ setreuid (0, -1);
+ dbus_error_init (&error);
+ priv->bus_connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
+ priv->cookie = 0;
+@@ -130,6 +147,9 @@ gst_time_tool_init (GstTimeTool *tool)
+ dbus_error_free (&error);
+ }
+
++ if (uid_changed)
++ setreuid (0, -1);
+
- priv->cookie = 0;
+ tool->time_config = oobs_time_config_get ();
+ gst_tool_add_configuration_object (GST_TOOL (tool), tool->time_config);
- tool->time_config = oobs_time_config_get (GST_TOOL (tool)->session);
-Index: gnome-system-tools-2.20.0/src/time/time.desktop.in.in
+Index: gnome-system-tools-2.22.0/src/time/time.desktop.in.in
===================================================================
---- gnome-system-tools-2.20.0.orig/src/time/time.desktop.in.in 2007-09-14 11:25:29.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/time/time.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/time/time.desktop.in.in 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/time/time.desktop.in.in 2008-05-28 14:21:15.035347231 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Time and Date
_Comment=Change system time, date, and timezone
-Exec=time-admin
+Exec=gksu time-admin
- Icon=config-date
+ Icon=time-admin
Terminal=false
Type=Application
@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
@@ -173,10 +139,10 @@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-Index: gnome-system-tools-2.20.0/src/users/users.desktop.in.in
+Index: gnome-system-tools-2.22.0/src/users/users.desktop.in.in
===================================================================
---- gnome-system-tools-2.20.0.orig/src/users/users.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
-+++ gnome-system-tools-2.20.0/src/users/users.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
+--- gnome-system-tools-2.22.0.orig/src/users/users.desktop.in.in 2008-03-09 17:07:03.000000000 +0100
++++ gnome-system-tools-2.22.0/src/users/users.desktop.in.in 2008-05-28 14:09:18.483349350 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Users and Groups
Modified: desktop/unstable/gnome-system-tools/debian/patches/50_min-max-gid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/50_min-max-gid.patch?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/50_min-max-gid.patch (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/50_min-max-gid.patch Wed May 28 13:03:28 2008
@@ -1,14 +1,16 @@
fixes Minimum versus Maximum GID in users-admin; thanks Kenrick Bingham and
Goswin von Brederlow; GNOME #526590; closes: #305842.
---- a/interfaces/users.glade.in 2008-04-06 23:14:19.000000000 +0200
-+++ b/interfaces/users.glade.in 2008-04-06 23:14:35.000000000 +0200
-@@ -3163,7 +3163,7 @@
- <child>
- <widget class="GtkLabel" id="label301">
- <property name="visible">True</property>
-- <property name="label" translatable="yes">Minimum GID:</property>
-+ <property name="label" translatable="yes">Maximum GID:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+Index: gnome-system-tools-2.22.0/interfaces/users.ui
+===================================================================
+--- gnome-system-tools-2.22.0.orig/interfaces/users.ui 2008-05-28 14:30:51.619345824 +0200
++++ gnome-system-tools-2.22.0/interfaces/users.ui 2008-05-28 14:31:08.518848415 +0200
+@@ -3114,7 +3114,7 @@
+ <child>
+ <object class="GtkLabel" id="label301">
+ <property name="visible">True</property>
+- <property name="label" translatable="yes">Minimum GID:</property>
++ <property name="label" translatable="yes">Maximum GID:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: desktop/unstable/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=16089&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/series (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series Wed May 28 13:03:28 2008
@@ -1,4 +1,4 @@
18_disable_uid.patch
22_root_only.patch
-more-groups.patch
+40_more-groups.patch
50_min-max-gid.patch
More information about the pkg-gnome-commits
mailing list