2011-06-02 Brian Cameron <
[email protected]>
* specs/SUNWgnome-display-mgr.spec: base-specs/gdm.spec: Bump to 2.30.7
and update packaging.
* patches/gdm-05-default.diff, patches/gdm-21-xauth.diff: Rework so
patches apply.
* patches/gdm-30-no-warning.diff: Remove upstream hunk.
* patches/gdm-31-post-session.diff, patches/gdm-32-docs.diff,
patches/gdm-34-double-free.diff: Remove upstream patches.
* patches/gdm-31-audit.diff: Renumber from patch 33.
--- a/ChangeLog Thu Jun 02 02:39:00 2011 +0000
+++ b/ChangeLog Thu Jun 02 21:50:44 2011 +0000
@@ -1,11 +1,21 @@
+2011-06-02 Brian Cameron <[email protected]>
+
+ * specs/SUNWgnome-display-mgr.spec: base-specs/gdm.spec: Bump to 2.30.7
+ and update packaging.
+ * patches/gdm-05-default.diff, patches/gdm-21-xauth.diff: Rework so
+ patches apply.
+ * patches/gdm-30-no-warning.diff: Remove upstream hunk.
+ * patches/gdm-31-post-session.diff, patches/gdm-32-docs.diff,
+ patches/gdm-34-double-free.diff: Remove upstream patches.
+ * patches/gdm-31-audit.diff: Renumber from patch 33.
+
2011-06-02 Yong Sun <[email protected]>
Fixed CR #7020655: gettext domain issue in libcryptui.
-
* base-specs/seahorse.spec:
* patches/seahorse-02-libcryptui-l10n.diff:
- * specs/SUNWseahorse.spec: set LD=$CC, #pragma init(...) is only supported
- by compiler driver.
+ * specs/SUNWseahorse.spec: set LD=$CC, #pragma init(...) is only
+ supported by compiler driver.
2011-06-01 Ghee Teo <[email protected]>
--- a/base-specs/gdm.spec Thu Jun 02 02:39:00 2011 +0000
+++ b/base-specs/gdm.spec Thu Jun 02 21:50:44 2011 +0000
@@ -13,7 +13,7 @@
Name: gdm
License: GPL v2, LGPL v2, MIT
Group: System/GUI/GNOME
-Version: 2.30.6
+Version: 2.30.7
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
@@ -96,15 +96,8 @@
Patch29: gdm-29-remove-gok.diff
# date:2011-03-29 owner:yippi type:bug bugster:7026714,7046515
Patch30: gdm-30-no-warning.diff
-# Fix NULL assertion.
-# date:2011-05-09 owner:yippi type:bug
-Patch31: gdm-31-post-session.diff
-# date:2011-05-09 owner:yippi type:bug bugster:7042508 state:upstream
-Patch32: gdm-32-docs.diff
# date:2011-05-19 owner:yippi type:bug bugster:7046505
-Patch33: gdm-33-audit.diff
-# date:2011-05-23 owner:yippi type:bug bugzilla:650659
-Patch34: gdm-34-double-free.diff
+Patch31: gdm-31-audit.diff
URL: http://projects.gnome.org/gdm/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -147,9 +140,6 @@
%patch29 -p1
%patch30 -p1
%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
cp %SOURCE1 gui/simple-greeter
cp %SOURCE2 gui/simple-greeter
@@ -261,6 +251,8 @@
%{_localstatedir}/lib/gdm
%changelog
+* Thu Jun 02 2011 - [email protected]
+- Bump to 2.30.7.
* Mon May 23 2011 - [email protected]
- Add patch gdm-34-double-free.diff to fix bug #650659.
* Thu May 19 2011 - [email protected]
--- a/patches/gdm-05-default.diff Thu Jun 02 02:39:00 2011 +0000
+++ b/patches/gdm-05-default.diff Thu Jun 02 21:50:44 2011 +0000
@@ -49,19 +49,18 @@
+
--- gdm-2.30.1/daemon/gdm-session-direct.c-orig 2010-04-26 14:52:23.950164465 -0500
+++ gdm-2.30.1/daemon/gdm-session-direct.c 2010-04-26 14:52:49.618142348 -0500
-@@ -2014,6 +2014,9 @@ gdm_session_direct_set_environment_varia
+@@ -2118,6 +2118,8 @@ gdm_session_direct_set_environment_varia
static void
setup_session_environment (GdmSessionDirect *session)
{
+ struct passwd *passwd_entry;
+ char *path_str = NULL;
-+
+ char *windowpath;
+
gdm_session_direct_set_environment_variable (session,
- "GDMSESSION",
- get_session_name (session));
-@@ -2050,15 +2053,20 @@ setup_session_environment (GdmSessionDir
- g_getenv ("WINDOWPATH"));
-
+@@ -2158,15 +2160,20 @@ setup_session_environment (GdmSessionDir
+ windowpath);
+ }
+ passwd_entry = getpwnam (session->priv->selected_user);
+ if (passwd_entry != NULL && passwd_entry->pw_uid == 0)
--- a/patches/gdm-21-xauth.diff Thu Jun 02 02:39:00 2011 +0000
+++ b/patches/gdm-21-xauth.diff Thu Jun 02 21:50:44 2011 +0000
@@ -1,7 +1,7 @@
--- gdm-2.30.2/data/Makefile.am-orig 2010-05-14 13:30:20.924722341 -0500
+++ gdm-2.30.2/data/Makefile.am 2010-05-14 13:33:45.306375555 -0500
-@@ -116,8 +116,10 @@ uninstall-hook:
- $(DESTDIR)$(workingdir)/.gconf.path \
+@@ -120,8 +120,10 @@ uninstall-hook:
+ $(DESTDIR)$(workingdir)/.local/share/applications/mimeapps.list \
-rf \
$(DESTDIR)$(workingdir)/.gconf.mandatory \
- $(DESTDIR)$(screenshotdir) \
@@ -13,7 +13,7 @@
install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
if test '!' -d $(DESTDIR)$(gdmconfdir); then \
-@@ -194,9 +196,11 @@ install-data-hook: gdm.conf-custom Xsess
+@@ -198,9 +200,11 @@ install-data-hook: gdm.conf-custom Xsess
fi
if test '!' -d $(DESTDIR)$(xauthdir); then \
--- a/patches/gdm-30-no-warning.diff Thu Jun 02 02:39:00 2011 +0000
+++ b/patches/gdm-30-no-warning.diff Thu Jun 02 21:50:44 2011 +0000
@@ -9,30 +9,3 @@
error->message);
g_error_free (error);
goto out;
---- gdm-2.30.6/daemon/gdm-session-direct.c-orig 2011-05-19 15:11:17.984857041 -0500
-+++ gdm-2.30.6/daemon/gdm-session-direct.c 2011-05-19 15:12:57.249899494 -0500
-@@ -2176,6 +2176,7 @@ setup_session_environment (GdmSessionDir
- {
- struct passwd *passwd_entry;
- char *path_str = NULL;
-+ char *windowpath = NULL;
-
- gdm_session_direct_set_environment_variable (session,
- "GDMSESSION",
-@@ -2208,10 +2209,12 @@ setup_session_environment (GdmSessionDir
- session->priv->user_x11_authority_file);
- }
-
-- gdm_session_direct_set_environment_variable (session,
-- "WINDOWPATH",
-- g_getenv ("WINDOWPATH"));
--
-+ windowpath = g_getenv ("WINDOWPATH");
-+ if (windowpath != NULL) {
-+ gdm_session_direct_set_environment_variable (session,
-+ "WINDOWPATH",
-+ g_getenv ("WINDOWPATH"));
-+ }
-
- passwd_entry = getpwnam (session->priv->selected_user);
- if (passwd_entry != NULL && passwd_entry->pw_uid == 0)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-31-audit.diff Thu Jun 02 21:50:44 2011 +0000
@@ -0,0 +1,73 @@
+--- gdm-2.30.6/daemon/gdm-session-worker.c-orig 2011-05-19 19:15:23.380543852 -0500
++++ gdm-2.30.6/daemon/gdm-session-worker.c 2011-05-19 19:22:36.793718077 -0500
+@@ -696,6 +696,10 @@ send_dbus_void_method (DBusConnection *c
+ return TRUE;
+ }
+
++/*
++ * This function is called with username set to NULL to update the
++ * auditor username value.
++ */
+ static gboolean
+ gdm_session_worker_get_username (GdmSessionWorker *worker,
+ char **username)
+@@ -714,6 +718,11 @@ gdm_session_worker_get_username (GdmSess
+ g_debug ("GdmSessionWorker: username is '%s'",
+ *username != NULL ? *username : "<unset>");
+ }
++
++ if (worker->priv->auditor != NULL) {
++ gdm_session_auditor_set_username (worker->priv->auditor, (char *)item);
++ }
++
+ return TRUE;
+ }
+
+@@ -1345,6 +1354,8 @@ gdm_session_worker_uninitialize_pam (Gdm
+ if (worker->priv->pam_handle == NULL)
+ return;
+
++ gdm_session_worker_get_username (worker, NULL);
++
+ if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
+ pid_t pid;
+
+@@ -1366,12 +1377,6 @@ gdm_session_worker_uninitialize_pam (Gdm
+ pam_close_session (worker->priv->pam_handle, 0);
+ gdm_session_auditor_report_logout (worker->priv->auditor);
+ } else {
+- const void *p;
+-
+- if ((pam_get_item (worker->priv->pam_handle, PAM_USER, &p)) == PAM_SUCCESS) {
+- gdm_session_auditor_set_username (worker->priv->auditor, (const char *)p);
+- }
+-
+ gdm_session_auditor_report_login_failure (worker->priv->auditor,
+ status,
+ pam_strerror (worker->priv->pam_handle, status));
+@@ -1661,6 +1666,8 @@ gdm_session_worker_authorize_user (GdmSe
+
+ error_code = pam_chauthtok (worker->priv->pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
+
++ gdm_session_worker_get_username (worker, NULL);
++
+ if (error_code != PAM_SUCCESS) {
+ gdm_session_auditor_report_password_change_failure (worker->priv->auditor);
+ } else {
+@@ -2069,6 +2076,8 @@ gdm_session_worker_accredit_user (GdmSes
+ if (ret) {
+ g_debug ("GdmSessionWorker: state ACCREDITED");
+ ret = TRUE;
++
++ gdm_session_worker_get_username (worker, NULL);
+ gdm_session_auditor_report_user_accredited (worker->priv->auditor);
+ worker->priv->state = GDM_SESSION_WORKER_STATE_ACCREDITED;
+ } else {
+@@ -2458,6 +2467,7 @@ gdm_session_worker_open_user_session (Gd
+ return FALSE;
+ }
+
++ gdm_session_worker_get_username (worker, NULL);
+ gdm_session_auditor_report_login (worker->priv->auditor);
+
+ return TRUE;
--- a/patches/gdm-31-post-session.diff Thu Jun 02 02:39:00 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- gdm-2.30.6/daemon/gdm-simple-slave.c-orig 2011-04-19 18:16:06.009201044 -0500
-+++ gdm-2.30.6/daemon/gdm-simple-slave.c 2011-04-19 18:17:01.608530735 -0500
-@@ -444,7 +444,10 @@ stop_greeter (GdmSimpleSlave *slave)
- }
-
- /* Run the PostLogin script. gdmslave suspends until script has terminated */
-- username = gdm_session_direct_get_username (slave->priv->session);
-+ username = NULL;
-+ if (slave->priv->session != NULL) {
-+ username = gdm_session_direct_get_username (slave->priv->session);
-+ }
-
- if (username != NULL) {
- gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", username);
--- a/patches/gdm-32-docs.diff Thu Jun 02 02:39:00 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
---- gdm-2.30.6/docs/C/gdm.xml-orig 2011-05-09 15:11:27.285401614 -0500
-+++ gdm-2.30.6/docs/C/gdm.xml 2011-05-09 17:49:05.695214321 -0500
-@@ -54,7 +54,7 @@
- <author role="maintainer">
- <firstname>Brian</firstname><surname>Cameron</surname>
- <affiliation>
-- <address><email>[email protected]</email></address>
-+ <address><email>[email protected]</email></address>
- </affiliation>
- </author>
- </authorgroup>
-@@ -77,12 +77,8 @@
- </copyright>
- <copyright>
- <year>2003</year>
-- <year>2004</year>
-- <year>2005</year>
-- <year>2006</year>
-- <year>2007</year>
-- <year>2008</year>
-- <holder>Sun Microsystems, Inc.</holder>
-+ <year>2011</year>
-+ <holder>Oracle and/or its affiliates. All rights reserved.</holder>
- </copyright>
-
- &legal;
-@@ -328,9 +324,9 @@
- The greeter program also provides buttons which allow the user to
- shutdown or restart the system. It is possible to configure GDM to not
- provide the shutdown and restart buttons, if desired. GDM can also be
-- configured via PolicyKit (or via RBAC on Solaris) to require the user
-- have appropriate authorization before accepting the shutdown or restart
-- request.
-+ configured via PolicyKit (or via RBAC on Oracle Solaris) to require the
-+ user have appropriate authorization before accepting the shutdown or
-+ restart request.
- </para>
-
- <para>
-@@ -870,7 +866,7 @@ gdm: .your.domain
- </para>
-
- <para>
-- For example, on Solaris, the "solaris.system.shutdown"
-+ For example, on Oracle Solaris, the "solaris.system.shutdown"
- authorization is used to control this. Simply modify the
- <filename>/etc/user_attr</filename> file so that the "gdm"
- user has this authorization.
-@@ -1311,14 +1307,15 @@ TimedLogin=you
- <para>
- When this key is true, GDM will call fgetpwent() to get a list
- of local users on the system. Any users with a user id less
-- than 500 (or 100 if running on Solaris) are filtered out. The
-- Face Browser also will display any users that have previously
-- logged in on the system (for example NIS/LDAP users). It gets
-- this list via calling the <command>ck-history</command>
-- ConsoleKit interface. It will also filter out any users which
-- do not have a valid shell (valid shells are any shell that
-- getusershell() returns - /sbin/nologin or /bin/false are
-- considered invalid shells even if getusershell() returns them).
-+ than 500 (or 100 if running on Oracle Solaris) are filtered
-+ out. The Face Browser also will display any users that have
-+ previously logged in on the system (for example NIS/LDAP
-+ users). It gets this list via calling the
-+ <command>ck-history</command> ConsoleKit interface. It will
-+ also filter out any users which do not have a valid shell
-+ (valid shells are any shell that getusershell() returns -
-+ /sbin/nologin or /bin/false are considered invalid shells even
-+ if getusershell() returns them).
- </para>
-
- <para>
--- a/patches/gdm-33-audit.diff Thu Jun 02 02:39:00 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
---- gdm-2.30.6/daemon/gdm-session-worker.c-orig 2011-05-19 19:15:23.380543852 -0500
-+++ gdm-2.30.6/daemon/gdm-session-worker.c 2011-05-19 19:22:36.793718077 -0500
-@@ -696,6 +696,10 @@ send_dbus_void_method (DBusConnection *c
- return TRUE;
- }
-
-+/*
-+ * This function is called with username set to NULL to update the
-+ * auditor username value.
-+ */
- static gboolean
- gdm_session_worker_get_username (GdmSessionWorker *worker,
- char **username)
-@@ -714,6 +718,11 @@ gdm_session_worker_get_username (GdmSess
- g_debug ("GdmSessionWorker: username is '%s'",
- *username != NULL ? *username : "<unset>");
- }
-+
-+ if (worker->priv->auditor != NULL) {
-+ gdm_session_auditor_set_username (worker->priv->auditor, (char *)item);
-+ }
-+
- return TRUE;
- }
-
-@@ -1345,6 +1354,8 @@ gdm_session_worker_uninitialize_pam (Gdm
- if (worker->priv->pam_handle == NULL)
- return;
-
-+ gdm_session_worker_get_username (worker, NULL);
-+
- if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
- pid_t pid;
-
-@@ -1366,12 +1377,6 @@ gdm_session_worker_uninitialize_pam (Gdm
- pam_close_session (worker->priv->pam_handle, 0);
- gdm_session_auditor_report_logout (worker->priv->auditor);
- } else {
-- const void *p;
--
-- if ((pam_get_item (worker->priv->pam_handle, PAM_USER, &p)) == PAM_SUCCESS) {
-- gdm_session_auditor_set_username (worker->priv->auditor, (const char *)p);
-- }
--
- gdm_session_auditor_report_login_failure (worker->priv->auditor,
- status,
- pam_strerror (worker->priv->pam_handle, status));
-@@ -1661,6 +1666,8 @@ gdm_session_worker_authorize_user (GdmSe
-
- error_code = pam_chauthtok (worker->priv->pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
-
-+ gdm_session_worker_get_username (worker, NULL);
-+
- if (error_code != PAM_SUCCESS) {
- gdm_session_auditor_report_password_change_failure (worker->priv->auditor);
- } else {
-@@ -2069,6 +2076,8 @@ gdm_session_worker_accredit_user (GdmSes
- if (ret) {
- g_debug ("GdmSessionWorker: state ACCREDITED");
- ret = TRUE;
-+
-+ gdm_session_worker_get_username (worker, NULL);
- gdm_session_auditor_report_user_accredited (worker->priv->auditor);
- worker->priv->state = GDM_SESSION_WORKER_STATE_ACCREDITED;
- } else {
-@@ -2458,6 +2467,7 @@ gdm_session_worker_open_user_session (Gd
- return FALSE;
- }
-
-+ gdm_session_worker_get_username (worker, NULL);
- gdm_session_auditor_report_login (worker->priv->auditor);
-
- return TRUE;
--- a/patches/gdm-34-double-free.diff Thu Jun 02 02:39:00 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gdm-2.30.6/gui/simple-greeter/gdm-chooser-widget.c-orig 2011-05-23 14:33:50.033988295 -0500
-+++ gdm-2.30.6/gui/simple-greeter/gdm-chooser-widget.c 2011-05-23 14:34:16.783565007 -0500
-@@ -2360,6 +2360,7 @@ gdm_chooser_widget_lookup_item (GdmChoos
-
- if (active_item_id == NULL || strcmp (active_item_id, id) != 0) {
- g_free (active_item_id);
-+ active_item_id = NULL;
-
- if (!find_item (widget, id, &iter)) {
- return FALSE;
--- a/specs/SUNWgnome-display-mgr.spec Thu Jun 02 02:39:00 2011 +0000
+++ b/specs/SUNWgnome-display-mgr.spec Thu Jun 02 21:50:44 2011 +0000
@@ -271,6 +271,7 @@
%dir %attr (0770, root, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory
%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/.gconf.path
%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*
+%attr (1640, root, gdm) %{_localstatedir}/lib/gdm/.local/*
%if %build_l10n
%files l10n