r9680 - in /desktop/experimental/gnome-system-tools: ./ debian/
debian/patches/
giskard at users.alioth.debian.org
giskard at users.alioth.debian.org
Tue Apr 10 21:17:14 UTC 2007
Author: giskard
Date: Tue Apr 10 21:17:14 2007
New Revision: 9680
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9680
Log:
* New upstream release.
* Bumped debhelper compatibility to 5.
* Dropped 64_gksu-in-desktop-files.dpatch in favour of
22_root_only.dpatch
* Added 18_disable_uid.dpatch.
* Added libboobs build-dep, bumped libgtk2.0 build-dep
according to configure
Added:
desktop/experimental/gnome-system-tools/
- copied from r9679, desktop/unstable/gnome-system-tools/
desktop/experimental/gnome-system-tools/debian/patches/18_disable_uid.dpatch
desktop/experimental/gnome-system-tools/debian/patches/22_root_only.dpatch
Removed:
desktop/experimental/gnome-system-tools/debian/patches/64_gksu-in-desktop-files.dpatch
Modified:
desktop/experimental/gnome-system-tools/debian/changelog
desktop/experimental/gnome-system-tools/debian/compat
desktop/experimental/gnome-system-tools/debian/control
desktop/experimental/gnome-system-tools/debian/control.in
desktop/experimental/gnome-system-tools/debian/patches/00list
Modified: desktop/experimental/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/changelog?rev=9680&op=diff
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/changelog (original)
+++ desktop/experimental/gnome-system-tools/debian/changelog Tue Apr 10 21:17:14 2007
@@ -1,3 +1,15 @@
+gnome-system-tools (2.18.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Bumped debhelper compatibility to 5.
+ * Dropped 64_gksu-in-desktop-files.dpatch in favour of
+ 22_root_only.dpatch
+ * Added 18_disable_uid.dpatch.
+ * Added libboobs build-dep, bumped libgtk2.0 build-dep
+ according to configure
+
+ -- Riccardo Setti <giskard at debian.org> Tue, 10 Apr 2007 23:12:33 +0200
+
gnome-system-tools (2.14.0-4) UNRELEASED; urgency=low
* Build-depend on pkg-config.
Modified: desktop/experimental/gnome-system-tools/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/compat?rev=9680&op=diff
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/compat (original)
+++ desktop/experimental/gnome-system-tools/debian/compat Tue Apr 10 21:17:14 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: desktop/experimental/gnome-system-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/control?rev=9680&op=diff
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/control (original)
+++ desktop/experimental/gnome-system-tools/debian/control Tue Apr 10 21:17:14 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 4.2.21), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), system-tools-backends-dev (>= 1.3.0), system-tools-backends-dev (<< 1.9.0), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils (>= 0.3.2), libgtk2.0-dev (>= 2.6.0), pkg-config
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 5), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), system-tools-backends-dev (>= 1.3.0), system-tools-backends-dev (<< 1.9.0), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils (>= 0.3.2), libgtk2.0-dev (>= 2.9.0), pkg-config, liboobs-1-dev (>= 2.17.5)
Standards-Version: 3.7.2
Package: gnome-system-tools
Modified: desktop/experimental/gnome-system-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/control.in?rev=9680&op=diff
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/control.in (original)
+++ desktop/experimental/gnome-system-tools/debian/control.in Tue Apr 10 21:17:14 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 4.2.21), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), system-tools-backends-dev (>= 1.3.0), system-tools-backends-dev (<< 1.9.0), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils (>= 0.3.2), libgtk2.0-dev (>= 2.6.0), pkg-config
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, dpatch, patchutils, debhelper (>= 5), libglade2-dev (>= 1:2.5.1-1), libgnome2-dev (>= 2.10.0-1), zlib1g-dev, libpopt-dev, gettext, libgnomeui-dev (>= 2.10.0-1), python, libxml2-dev, libgconf2-dev (>= 2.10.0-1), libxml-parser-perl, gnome-pkg-tools, scrollkeeper (>= 0.3.14-9.1), system-tools-backends-dev (>= 1.3.0), system-tools-backends-dev (<< 1.9.0), libnautilus-extension-dev (>= 2.10.0-1), gnome-doc-utils (>= 0.3.2), libgtk2.0-dev (>= 2.9.0), pkg-config, liboobs-1-dev (>= 2.17.5)
Standards-Version: 3.7.2
Package: gnome-system-tools
Modified: desktop/experimental/gnome-system-tools/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/patches/00list?rev=9680&op=diff
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/patches/00list (original)
+++ desktop/experimental/gnome-system-tools/debian/patches/00list Tue Apr 10 21:17:14 2007
@@ -1,1 +1,2 @@
-64_gksu-in-desktop-files.dpatch
+18_disable_uid.dpatch
+22_root_only.dpatch
Added: desktop/experimental/gnome-system-tools/debian/patches/18_disable_uid.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/patches/18_disable_uid.dpatch?rev=9680&op=file
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/patches/18_disable_uid.dpatch (added)
+++ desktop/experimental/gnome-system-tools/debian/patches/18_disable_uid.dpatch Tue Apr 10 21:17:14 2007
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_disable_uid.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-system-tools-2.15.3~/src/users/user-settings.c gnome-system-tools-2.15.3/src/users/user-settings.c
+--- gnome-system-tools-2.15.3~/src/users/user-settings.c 2006-08-28 03:58:40.000000000 +0200
++++ gnome-system-tools-2.15.3/src/users/user-settings.c 2006-09-06 12:32:35.000000000 +0200
+@@ -293,6 +293,7 @@
+ 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));
+@@ -309,6 +310,7 @@
+
+ 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));
++ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE);
+ setup_profiles_visibility (tool, FALSE);
+ }
+
Added: desktop/experimental/gnome-system-tools/debian/patches/22_root_only.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-tools/debian/patches/22_root_only.dpatch?rev=9680&op=file
==============================================================================
--- desktop/experimental/gnome-system-tools/debian/patches/22_root_only.dpatch (added)
+++ desktop/experimental/gnome-system-tools/debian/patches/22_root_only.dpatch Tue Apr 10 21:17:14 2007
@@ -1,0 +1,193 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_root_only.dpatch by <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gnome-system-tools-2.17.3~/src/network/network.desktop.in.in gnome-system-tools-2.17.3/src/network/network.desktop.in.in
+--- gnome-system-tools-2.17.3~/src/network/network.desktop.in.in 2006-11-16 13:33:15.000000000 +0100
++++ gnome-system-tools-2.17.3/src/network/network.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+@@ -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
+ Terminal=false
+ Type=Application
+@@ -11,4 +11,5 @@
+ X-GNOME-Bugzilla-Component=network-admin
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-KDE-SubstituteUID=true
+ Encoding=UTF-8
+diff -urNad gnome-system-tools-2.17.3~/src/services/services.desktop.in.in gnome-system-tools-2.17.3/src/services/services.desktop.in.in
+--- gnome-system-tools-2.17.3~/src/services/services.desktop.in.in 2006-05-27 17:28:45.000000000 +0200
++++ gnome-system-tools-2.17.3/src/services/services.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+@@ -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
+ Terminal=false
+ Type=Application
+@@ -11,4 +11,5 @@
+ X-GNOME-Bugzilla-Component=runlevel-admin
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-KDE-SubstituteUID=true
+ Encoding=UTF-8
+diff -urNad gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c
+--- gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c 2006-10-02 17:23:26.000000000 +0200
++++ gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c 2007-01-03 19:35:23.000000000 +0100
+@@ -82,7 +82,7 @@
+ 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");
+ dir = get_path_from_file_info (info);
+
+diff -urNad gnome-system-tools-2.17.3~/src/shares/shares-tool.c gnome-system-tools-2.17.3/src/shares/shares-tool.c
+--- gnome-system-tools-2.17.3~/src/shares/shares-tool.c 2006-11-10 13:51:26.000000000 +0100
++++ gnome-system-tools-2.17.3/src/shares/shares-tool.c 2007-01-03 19:35:08.000000000 +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 @@
+ {
+ 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 @@
+ 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
+diff -urNad gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in
+--- gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in 2006-05-27 17:29:09.000000000 +0200
++++ gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Shared Folders
+ _Comment=Configure which folders are available for your network neighborhood
+-Exec=shares-admin
++Exec=gksu shares-admin
+ Icon=gnome-fs-share
+ Terminal=false
+ Type=Application
+@@ -11,5 +11,6 @@
+ X-GNOME-Bugzilla-Component=shares-admin
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-KDE-SubstituteUID=true
+ Encoding=UTF-8
+
+diff -urNad gnome-system-tools-2.17.3~/src/time/time-tool.c gnome-system-tools-2.17.3/src/time/time-tool.c
+--- gnome-system-tools-2.17.3~/src/time/time-tool.c 2007-01-03 19:32:57.000000000 +0100
++++ gnome-system-tools-2.17.3/src/time/time-tool.c 2007-01-03 19:32:58.000000000 +0100
+@@ -19,6 +19,8 @@
+ * Authors: Carlos Garnacho Parro <carlosg at gnome.org>
+ */
+
++#include <unistd.h>
++#include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <dbus/dbus.h>
+@@ -108,7 +110,25 @@
+ OobsList *list;
+ 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;
++ }
++ }
++ }
++
+ priv->bus_connection = dbus_bus_get (DBUS_BUS_SESSION, NULL);
++ if (uid_changed)
++ setreuid (0, -1);
++
+ priv->cookie = 0;
+
+ tool->time_config = oobs_time_config_get (GST_TOOL (tool)->session);
+diff -urNad gnome-system-tools-2.17.3~/src/time/time.desktop.in.in gnome-system-tools-2.17.3/src/time/time.desktop.in.in
+--- gnome-system-tools-2.17.3~/src/time/time.desktop.in.in 2006-11-15 19:50:19.000000000 +0100
++++ gnome-system-tools-2.17.3/src/time/time.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+@@ -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
+ Terminal=false
+ Type=Application
+@@ -11,4 +11,5 @@
+ X-GNOME-Bugzilla-Component=time-admin
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-KDE-SubstituteUID=true
+ Encoding=UTF-8
+diff -urNad gnome-system-tools-2.17.3~/src/users/users.desktop.in.in gnome-system-tools-2.17.3/src/users/users.desktop.in.in
+--- gnome-system-tools-2.17.3~/src/users/users.desktop.in.in 2006-05-27 17:30:28.000000000 +0200
++++ gnome-system-tools-2.17.3/src/users/users.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Users and Groups
+ _Comment=Add or remove users and groups
+-Exec=users-admin
++Exec=gksu users-admin
+ Icon=config-users
+ Terminal=false
+ Type=Application
+@@ -11,4 +11,5 @@
+ X-GNOME-Bugzilla-Component=users-admin
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-KDE-SubstituteUID=true
+ Encoding=UTF-8
More information about the pkg-gnome-commits
mailing list