Hello community, here is the log from the commit of package glib2 checked in at Thu May 1 14:15:27 CEST 2008. -------- --- GNOME/glib2/glib2.changes 2008-04-29 17:15:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/glib2/glib2.changes 2008-05-01 12:47:26.989049000 +0200 @@ -1,0 +2,7 @@ +Thu May 1 12:52:01 CEST 2008 - vuntz@suse.de + +- Add glib2-bnc379332-desktop-su.patch to launch .desktop files as + root when X-KDE-SubstituteUID and X-KDE-RootOnly are there. + Fix bnc#379332. + +------------------------------------------------------------------- New: ---- glib2-bnc379332-desktop-su.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.M21870/_old 2008-05-01 14:14:49.000000000 +0200 +++ /var/tmp/diff_new_pack.M21870/_new 2008-05-01 14:14:49.000000000 +0200 @@ -18,7 +18,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: 2.16.3 -Release: 8 +Release: 10 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2 @@ -44,6 +44,8 @@ Patch6: glib2-libtool.diff # PATCH-FIX-UPSTREAM glib2-fix-bookmark-leak.diff federico@novell.com -- Don't leak apps_by_name in GBookmarkFile metadata items Patch7: glib2-fix-bookmark-leak.diff +# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID +Patch8: glib2-bnc379332-desktop-su.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} # For temporary %%pre script only. @@ -372,6 +374,7 @@ %patch5 -p1 %patch6 %patch7 -p1 +%patch8 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then @@ -502,6 +505,10 @@ %dir %{_datadir}/gtk-doc/html %changelog +* Thu May 01 2008 vuntz@suse.de +- Add glib2-bnc379332-desktop-su.patch to launch .desktop files as + root when X-KDE-SubstituteUID and X-KDE-RootOnly are there. + Fix bnc#379332. * Tue Apr 29 2008 cthiel@suse.de - obsolete glib2-<arch> via baselibs.conf * Tue Apr 22 2008 hpj@suse.de ++++++ glib2-bnc379332-desktop-su.patch ++++++ Index: gio/gdesktopappinfo.c =================================================================== --- gio/gdesktopappinfo.c (révision 6873) +++ gio/gdesktopappinfo.c (copie de travail) @@ -259,7 +259,20 @@ g_desktop_app_info_new_from_filename (co info->only_show_in = g_key_file_get_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, NULL, NULL); info->not_show_in = g_key_file_get_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, NULL, NULL); info->try_exec = try_exec; - info->exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL); + if (g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, + "X-KDE-SubstituteUID", NULL) && + g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, + "X-KDE-RootOnly", NULL)) + { + char *real_exec; + real_exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL); + info->exec = g_strdup_printf ("gnomesu -- %s", real_exec); + g_free (real_exec); + } + else + { + info->exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL); + } info->path = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_PATH, NULL); info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de