2009-12-03 Brian Cameron <
[email protected]>
* SUNWgnome-display-mgr.spec: Fix packaging to reflect changes in new
patches.
* base-specs/gdm.spec, patches/gdm-16-gconf.diff,
patches/gdm-17-runtime.diff: Add patch gdm-16-gconf.diff to fix doo
bug #10915, bugzilla bug #594818. Add patch gdm-17-runtime.diff to
fix bugzilla bug #603756.
--- a/ChangeLog Thu Dec 03 15:03:29 2009 +0000
+++ b/ChangeLog Fri Dec 04 02:52:43 2009 +0000
@@ -1,3 +1,12 @@
+2009-12-03 Brian Cameron <[email protected]>
+
+ * SUNWgnome-display-mgr.spec: Fix packaging to reflect changes in new
+ patches.
+ * base-specs/gdm.spec, patches/gdm-16-gconf.diff,
+ patches/gdm-17-runtime.diff: Add patch gdm-16-gconf.diff to fix doo
+ bug #10915, bugzilla bug #594818. Add patch gdm-17-runtime.diff to
+ fix bugzilla bug #603756.
+
2009-12-03 Erwann Chenede - <[email protected]>
* base-specs/pango.spec: bumped to 1.26.1 fixes 11733
@@ -5,7 +14,6 @@
2009-12-03 Wang Xin <[email protected]>
Fixes python 2.6 problem.
-
* SUNWgnome-panel.spec:
* base-specs/gnome-menus.spec:
* patches/gnome-menus-06-python2.6.diff:
@@ -13,7 +21,7 @@
2009-12-03 Li Yuan <[email protected]>
* patches/ipython-02-python-version.diff:
- Also handle "/usr/bin/env python".
+ Also handle "/usr/bin/env python".
2009-12-03 Laszlo (Laca) Peter <[email protected]>
@@ -31,29 +39,29 @@
* ext-sources/avahi-bridge-dsd.xml: Do not enable by default
* SUNWavahi-bridge-dsd.spec: Remove postinstall script which
- enables SMF service. Fix for bug 6902607.
+ enables SMF service. Fix for bug 6902607.
2009-12-03 Li Yuan <[email protected]>
* base-specs/ipython.spec:
* patches/ipython-02-python-version.diff:
- Use /usr/bin/python2.6 instead of /usr/bin/python.
+ Use /usr/bin/python2.6 instead of /usr/bin/python.
2009-12-03 Dave Lin <[email protected]>
- * SUNWsun-gdm-themes.spec:
- * SUNWopensolaris-gdm-themes.spec: Fix the default attribute to
- (root, bin).
+ * SUNWsun-gdm-themes.spec:
+ * SUNWopensolaris-gdm-themes.spec: Fix the default attribute to
+ (root, bin).
2009-12-03 Jeff Cai <[email protected]>
* manpages-roff/Makefile:
- Add man page for seahorse-plugins
+ Add man page for seahorse-plugins
2009-12-03 Li Yuan <[email protected]>
* SUNWgnome-a11y-reader.spec:
- Requires SUNWdbus-python26.
+ Requires SUNWdbus-python26.
2009-12-03 Jerry Tan <[email protected]>
@@ -63,18 +71,18 @@
* SUNWseahorse-plugins.spec:
* SUNWseahorse.spec:
- Make the summary shorter
+ Make the summary shorter
2009-12-02 Ghee Teo <[email protected]>
- Fixes 6886658. provide text console for PV.
- * base-specs/virt-manager.spec:
- * patches/virt-manager-16-pv-serial-console.diff:
+ Fixes 6886658. provide text console for PV.
+ * base-specs/virt-manager.spec:
+ * patches/virt-manager-16-pv-serial-console.diff:
2009-12-02 Wang Xin <[email protected]>
* base-specs/evolution-data-server.spec: Add 04-a11y-crash.diff to fix
- bugzilla 603557, doo 12904.
+ bugzilla 603557, doo 12904.
* patches/evolution-data-server-04-a11y-crash.diff: New patch.
2009-12-02 Ginn Chen <[email protected]>
@@ -84,7 +92,8 @@
2009-12-02 Ginn Chen <[email protected]>
* copyright/SUNWfirefox.copyright: Update copyright for Firefox 3.5.
- * copyright/SUNWthunderbird.copyright: Update copyright for Thunderbird 3.0.
+ * copyright/SUNWthunderbird.copyright: Update copyright for Thunderbird
+ 3.0.
2009-12-02 Brian Cameron <[email protected]>
@@ -96,7 +105,6 @@
* patches/gdm-16-fixfocus.diff: Fix patch so that it completely
removes references to DIALOG_HIDDEN.
->>>>>>> .r20054
2009-12-01 Erwann Chenede - <[email protected]>
* SUNWgnome-display-mgr.spec
--- a/SUNWgnome-display-mgr.spec Thu Dec 03 15:03:29 2009 +0000
+++ b/SUNWgnome-display-mgr.spec Fri Dec 04 02:52:43 2009 +0000
@@ -225,7 +225,7 @@
%dir %attr (0755, root, other) %{_localstatedir}/lib
%dir %attr (1770, root, gdm) %{_localstatedir}/lib/gdm
%dir %attr (1750, root, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/.gconf.path
+%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/gconf.path
%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*
%if %build_l10n
--- a/base-specs/gdm.spec Thu Dec 03 15:03:29 2009 +0000
+++ b/base-specs/gdm.spec Fri Dec 04 02:52:43 2009 +0000
@@ -79,6 +79,10 @@
Patch21: gdm-21-atspi.diff
# date:2009-11-26 owner:yippi type:bug state:upstream
Patch22: gdm-22-a11y-label.diff
+# date:2009-12-03 owner:yippi type:bug bugzilla:594818 doo:10915
+Patch23: gdm-23-gconf.diff
+# date:2009-12-03 owner:yippi type:bug bugzilla:603756
+Patch24: gdm-24-runtime.diff
URL: http://projects.gnome.org/gdm/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -113,6 +117,8 @@
%patch20 -p1
%patch21 -p1
%patch22 -p1
+%patch23 -p1
+%patch24 -p1
%build
%ifos linux
@@ -216,6 +222,9 @@
%{_localstatedir}/lib/gdm
%changelog
+* Wed Dec 03 2009 - [email protected]
+- Add patch gdm-23-gconf.diff to fix doo bug #10915, bugzilla bug #594818. Add
+ patch gdm-24-runtime.diff to fix bugzilla bug #603756.
* Tue Dec 01 2009 - [email protected]
- Remove patch gconf-12-gconf.diff since this patch does not fix the problem.
* Mon Nov 30 2009 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-23-gconf.diff Fri Dec 04 02:52:43 2009 +0000
@@ -0,0 +1,143 @@
+--- gdm-2.29.1/data/gconf.path-orig 2009-12-02 21:53:40.640164300 -0600
++++ gdm-2.29.1/data/gconf.path 2009-12-02 21:52:43.303731247 -0600
+@@ -1,3 +1,6 @@
++xml:readonly:/etc/gconf/gconf.xml.mandatory
++include /etc/gconf/2/local-mandatory.path
++
+ # treat system-wide settings as mandatory
+ # We don't use this default mechanism on opensolaris.
+ # xml:readonly:/etc/gconf/gconf.xml.system
+@@ -7,3 +10,9 @@
+ # owned by GDM. Sysadmins should create
+ # another source if they wish to override them.
+ xml:readonly:$(HOME)/.gconf.mandatory
++
++# Set per-seat configuration directory
++xml:readwrite:$(HOME)/$(ENV_GDM_SEAT_ID)/.gconf
++
++include /etc/gconf/2/local-defaults.path
++xml:readonly:/etc/gconf/gconf.xml.defaults
+--- gdm-2.29.1/data/Makefile.am-orig 2009-12-02 21:51:17.509082145 -0600
++++ gdm-2.29.1/data/Makefile.am 2009-12-02 21:51:32.599564304 -0600
+@@ -124,7 +124,7 @@ uninstall-hook:
+ $(DESTDIR)$(postdir)/Default \
+ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \
+ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
+- $(DESTDIR)$(workingdir)/.gconf.path \
++ $(DESTDIR)$(workingdir)/gconf.path \
+ -rf \
+ $(DESTDIR)$(workingdir)/.gconf.mandatory \
+ $(DESTDIR)$(xauthdir)
+@@ -228,7 +228,7 @@ install-data-hook: gdm.conf-custom Xsess
+ chown root:gdm $(DESTDIR)$(cachedir) || : ; \
+ fi
+
+- $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
++ $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/gconf.path
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
+ chown -R root:gdm $(DESTDIR)$(workingdir)/.gconf.mandatory || :
+--- gdm-2.29.1/daemon/gdm-welcome-session.c-orig 2009-12-02 21:48:12.369321575 -0600
++++ gdm-2.29.1/daemon/gdm-welcome-session.c 2009-12-02 21:50:27.297039840 -0600
+@@ -337,6 +337,18 @@ get_welcome_environment (GdmWelcomeSessi
+ g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell));
+ }
+
++ if (welcome_session->priv->x11_display_seat_id != NULL) {
++ char *seat_id;
++ char *source_path;
++
++ seat_id = welcome_session->priv->x11_display_seat_id +
++ strlen ("/org/freedesktop/ConsoleKit/");
++ source_path = g_strdup_printf ("/var/lib/gdm/gconf.path");
++
++ g_hash_table_insert (hash, g_strdup ("GCONF_DEFAULT_SOURCE_PATH"), g_strdup (source_path));
++ g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
++ g_free (source_path);
++ }
+
+ g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
+
+@@ -432,6 +444,7 @@ typedef struct {
+ const char *group_name;
+ const char *runtime_dir;
+ const char *log_file;
++ const char *seat_id;
+ } SpawnChildData;
+
+ static void
+@@ -458,6 +471,26 @@ spawn_child_setup (SpawnChildData *data)
+ _exit (1);
+ }
+
++ if (pwent->pw_dir != NULL) {
++ struct stat statbuf;
++ const char *seat_id;
++ char *gconf_dir;
++ int r;
++
++ seat_id = data->seat_id + strlen ("/org/freedesktop/ConsoleKit/");
++ gconf_dir = g_strdup_printf ("%s/%s", pwent->pw_dir, seat_id);
++
++ /* Verify per-seat gconf directory exists, create if needed */
++ r = g_stat (gconf_dir, &statbuf);
++ if (r < 0) {
++ g_debug ("Making per-seat gconf directory %s", gconf_dir);
++ g_mkdir (gconf_dir, S_IRWXU | S_IXGRP | S_IRGRP);
++ g_chmod (gconf_dir, S_IRWXU | S_IXGRP | S_IRGRP);
++ chown (gconf_dir, pwent->pw_uid, grent->gr_gid);
++ }
++ g_free (gconf_dir);
++ }
++
+ g_debug ("GdmWelcomeSession: Setting up run time dir %s", data->runtime_dir);
+ g_mkdir (data->runtime_dir, 0755);
+ chown (data->runtime_dir, pwent->pw_uid, pwent->pw_gid);
+@@ -523,6 +556,7 @@ static gboolean
+ spawn_command_line_sync_as_user (const char *command_line,
+ const char *user_name,
+ const char *group_name,
++ const char *seat_id,
+ const char *log_file,
+ char **env,
+ char **std_output,
+@@ -549,6 +583,7 @@ spawn_command_line_sync_as_user (const c
+ data.user_name = user_name;
+ data.group_name = group_name;
+ data.log_file = log_file;
++ data.seat_id = seat_id;
+
+ local_error = NULL;
+ res = g_spawn_sync (NULL,
+@@ -579,6 +614,7 @@ static gboolean
+ spawn_command_line_async_as_user (const char *command_line,
+ const char *user_name,
+ const char *group_name,
++ const char *seat_id,
+ const char *runtime_dir,
+ const char *log_file,
+ char **env,
+@@ -605,6 +641,7 @@ spawn_command_line_async_as_user (const
+ data.group_name = group_name;
+ data.runtime_dir = runtime_dir;
+ data.log_file = log_file;
++ data.seat_id = seat_id;
+
+ local_error = NULL;
+ res = g_spawn_async (NULL,
+@@ -723,6 +760,7 @@ start_dbus_daemon (GdmWelcomeSession *we
+ res = spawn_command_line_sync_as_user (DBUS_LAUNCH_COMMAND,
+ welcome_session->priv->user_name,
+ welcome_session->priv->group_name,
++ welcome_session->priv->x11_display_seat_id,
+ NULL, /* log file */
+ (char **)env->pdata,
+ &std_out,
+@@ -811,6 +849,7 @@ gdm_welcome_session_spawn (GdmWelcomeSes
+ ret = spawn_command_line_async_as_user (welcome_session->priv->command,
+ welcome_session->priv->user_name,
+ welcome_session->priv->group_name,
++ welcome_session->priv->x11_display_seat_id,
+ welcome_session->priv->runtime_dir,
+ log_path,
+ (char **)env->pdata,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-24-runtime.diff Fri Dec 04 02:52:43 2009 +0000
@@ -0,0 +1,26 @@
+--- gdm-2.29.1/daemon/gdm-welcome-session.c-orig 2009-12-02 23:35:06.951551437 -0600
++++ gdm-2.29.1/daemon/gdm-welcome-session.c 2009-12-02 23:35:17.038879114 -0600
+@@ -557,6 +557,7 @@ spawn_command_line_sync_as_user (const c
+ const char *user_name,
+ const char *group_name,
+ const char *seat_id,
++ const char *runtime_dir,
+ const char *log_file,
+ char **env,
+ char **std_output,
+@@ -582,6 +583,7 @@ spawn_command_line_sync_as_user (const c
+
+ data.user_name = user_name;
+ data.group_name = group_name;
++ data.runtime_dir = runtime_dir;
+ data.log_file = log_file;
+ data.seat_id = seat_id;
+
+@@ -761,6 +763,7 @@ start_dbus_daemon (GdmWelcomeSession *we
+ welcome_session->priv->user_name,
+ welcome_session->priv->group_name,
+ welcome_session->priv->x11_display_seat_id,
++ welcome_session->priv->runtime_dir,
+ NULL, /* log file */
+ (char **)env->pdata,
+ &std_out,