This commit is contained in:
parent
a327a8df86
commit
7573a6cbe3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34b9e36eaaa004f47b3e67924537cba1bdfe6ae467d8f0d30028ae7e6ef34627
|
||||
size 2552457
|
3
gdm-2.26.1.tar.bz2
Normal file
3
gdm-2.26.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
|
||||
size 2526832
|
@ -1,49 +0,0 @@
|
||||
Index: gdm-2.24.0/daemon/gdm-session-worker-job.c
|
||||
===================================================================
|
||||
--- gdm-2.24.0.orig/daemon/gdm-session-worker-job.c
|
||||
+++ gdm-2.24.0/daemon/gdm-session-worker-job.c
|
||||
@@ -119,10 +119,36 @@ listify_hash (const char *key,
|
||||
GPtrArray *env)
|
||||
{
|
||||
char *str;
|
||||
+
|
||||
+ if (value == NULL)
|
||||
+ value = "";
|
||||
+
|
||||
str = g_strdup_printf ("%s=%s", key, value);
|
||||
g_ptr_array_add (env, str);
|
||||
}
|
||||
|
||||
+static void
|
||||
+copy_environment_to_hash (GHashTable *hash)
|
||||
+{
|
||||
+ gchar **env_strv;
|
||||
+ gint i;
|
||||
+
|
||||
+ env_strv = g_listenv ();
|
||||
+
|
||||
+ for (i = 0; env_strv [i]; i++) {
|
||||
+ gchar *key = env_strv [i];
|
||||
+ const gchar *value;
|
||||
+
|
||||
+ value = g_getenv (key);
|
||||
+ if (!value)
|
||||
+ continue;
|
||||
+
|
||||
+ g_hash_table_insert (hash, g_strdup (key), g_strdup (value));
|
||||
+ }
|
||||
+
|
||||
+ g_strfreev (env_strv);
|
||||
+}
|
||||
+
|
||||
static GPtrArray *
|
||||
get_job_environment (GdmSessionWorkerJob *job)
|
||||
{
|
||||
@@ -133,6 +159,7 @@ get_job_environment (GdmSessionWorkerJob
|
||||
|
||||
/* create a hash table of current environment, then update keys has necessary */
|
||||
hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
|
||||
+ copy_environment_to_hash (hash);
|
||||
|
||||
g_hash_table_insert (hash, g_strdup ("GDM_SESSION_DBUS_ADDRESS"), g_strdup (job->priv->server_address));
|
||||
|
@ -1,79 +0,0 @@
|
||||
diff -upr gdm-2.23.92-pre/daemon/gdm-display-access-file.c gdm-2.23.92-post/daemon/gdm-display-access-file.c
|
||||
--- gdm-2.23.92-pre/daemon/gdm-display-access-file.c 2008-08-26 14:04:00.000000000 -0500
|
||||
+++ gdm-2.23.92-post/daemon/gdm-display-access-file.c 2008-10-07 22:58:45.000000000 -0500
|
||||
@@ -410,7 +410,7 @@ _get_auth_info_for_display (GdmDisplayAc
|
||||
|
||||
if (is_local) {
|
||||
*family = FamilyLocal;
|
||||
- *address = g_strdup (g_get_host_name ());
|
||||
+ *address = g_strdup ("localhost");
|
||||
} else {
|
||||
*family = FamilyWild;
|
||||
gdm_display_get_remote_hostname (display, address, NULL);
|
||||
Only in gdm-2.23.92-post/daemon: gdm-display-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-factory-slave-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-local-display-factory-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-manager-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-product-display-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-product-slave-glue.h
|
||||
diff -upr gdm-2.23.92-pre/daemon/gdm-session-direct.c gdm-2.23.92-post/daemon/gdm-session-direct.c
|
||||
--- gdm-2.23.92-pre/daemon/gdm-session-direct.c 2008-08-26 14:04:00.000000000 -0500
|
||||
+++ gdm-2.23.92-post/daemon/gdm-session-direct.c 2008-10-07 22:58:45.000000000 -0500
|
||||
@@ -1985,6 +1985,12 @@ setup_session_environment (GdmSessionDir
|
||||
session->priv->user_x11_authority_file);
|
||||
}
|
||||
|
||||
+ if (session->priv->display_is_local) {
|
||||
+ gdm_session_direct_set_environment_variable (session,
|
||||
+ "XAUTHLOCALHOSTNAME",
|
||||
+ "localhost");
|
||||
+ }
|
||||
+
|
||||
/* FIXME: We do this here and in the session worker. We should consolidate
|
||||
* somehow.
|
||||
*/
|
||||
Only in gdm-2.23.92-post/daemon: gdm-session-direct-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-simple-slave-glue.h
|
||||
diff -upr gdm-2.23.92-pre/daemon/gdm-slave.c gdm-2.23.92-post/daemon/gdm-slave.c
|
||||
--- gdm-2.23.92-pre/daemon/gdm-slave.c 2008-08-26 14:04:00.000000000 -0500
|
||||
+++ gdm-2.23.92-post/daemon/gdm-slave.c 2008-10-07 22:58:45.000000000 -0500
|
||||
@@ -220,6 +220,10 @@ get_script_environment (GdmSlave *slav
|
||||
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname));
|
||||
}
|
||||
|
||||
+ if (slave->priv->display_is_local) {
|
||||
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
|
||||
+ }
|
||||
+
|
||||
/* Runs as root */
|
||||
g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
|
||||
g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
|
||||
@@ -372,6 +376,7 @@ gdm_slave_connect_to_x11_display (GdmSla
|
||||
|
||||
g_setenv ("DISPLAY", slave->priv->display_name, TRUE);
|
||||
g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE);
|
||||
+ g_setenv ("XAUTHLOCALHOSTNAME", "localhost", TRUE);
|
||||
|
||||
sigemptyset (&mask);
|
||||
sigaddset (&mask, SIGCHLD);
|
||||
Only in gdm-2.23.92-post/daemon: gdm-slave-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-static-display-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-static-factory-display-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-transient-display-glue.h
|
||||
diff -upr gdm-2.23.92-pre/daemon/gdm-welcome-session.c gdm-2.23.92-post/daemon/gdm-welcome-session.c
|
||||
--- gdm-2.23.92-pre/daemon/gdm-welcome-session.c 2008-09-08 17:09:05.000000000 -0500
|
||||
+++ gdm-2.23.92-post/daemon/gdm-welcome-session.c 2008-10-07 22:58:45.000000000 -0500
|
||||
@@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi
|
||||
g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell));
|
||||
}
|
||||
|
||||
+ if (welcome_session->priv->x11_display_is_local) {
|
||||
+ g_hash_table_remove (hash, "XAUTHLOCALHOSTNAME");
|
||||
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
|
||||
+ }
|
||||
|
||||
g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
|
||||
|
||||
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-chooser-display-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-chooser-slave-glue.h
|
||||
Only in gdm-2.23.92-post/daemon: gdm-xdmcp-greeter-display-glue.h
|
19
gdm.changes
19
gdm.changes
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 20 13:41:41 CEST 2009 - vuntz@novell.com
|
||||
|
||||
- Update to version 2.26.1:
|
||||
+ Use O_APPEND when opening log files
|
||||
+ Don't depend on gnome-power-manager registering with session
|
||||
manager - Give greeter and slave access to the display even
|
||||
after the hostname changes
|
||||
+ Give greeter and slave access to display independent of
|
||||
hostname
|
||||
+ Clean up stale auth temporary directories
|
||||
+ Fix double free crasher in user switcher applet
|
||||
+ Load saved settings after user types username into Other box
|
||||
+ Pass environment to PAM worker processes so messages are
|
||||
localized
|
||||
+ Fix up auditing for Solaris auditor
|
||||
- Drop gdm-xauthlocalhostname.patch: fixed another way upstream.
|
||||
- Drop gdm-propagate-env-to-jobs.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 27 10:55:04 CET 2009 - vuntz@novell.com
|
||||
|
||||
|
51
gdm.spec
51
gdm.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gdm (Version 2.26.0)
|
||||
# spec file for package gdm (Version 2.26.1)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -41,8 +41,8 @@ BuildRequires: xorg-x11-server-extra
|
||||
BuildRequires: zenity
|
||||
License: GPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.26.0
|
||||
Release: 2
|
||||
Version: 2.26.1
|
||||
Release: 1
|
||||
Summary: The GNOME 2.x Display Manager
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gdm.pamd
|
||||
@ -52,7 +52,6 @@ Source3: SuSEconfig.gdm
|
||||
Source5: sysconfig.displaymanager-gdm
|
||||
Patch1: gdm-consolekit-helper-subdir.patch
|
||||
Patch2: gdm-2.21.9-no-fatal-warnings.patch
|
||||
Patch3: gdm-xauthlocalhostname.patch
|
||||
Patch4: gdm-vt-allocation-hack.patch
|
||||
Patch5: gdm-2.23.92-gsd-path.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
|
||||
@ -76,8 +75,6 @@ Patch22: gdm-hide-lonely-other.patch
|
||||
Patch23: gdm-accreditation-failed-log.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-session-worker-check-states.patch bnc470714 vuntz@novell.com -- Make sure we have consistent states in gdm-session-worker
|
||||
Patch24: gdm-session-worker-check-states.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-propagate-env-to-jobs.patch bnc440860 bgo568590 vuntz@novell.com -- Forward the environment to gdm-session-worker to have translated PAM messages
|
||||
Patch25: gdm-propagate-env-to-jobs.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-fix-locale-listing.patch bnc446446 vuntz@novell.com -- Fix locale listing so that all locales are listed in the language chooser
|
||||
Patch26: gdm-fix-locale-listing.patch
|
||||
Patch28: gdm-X_SERVER.patch
|
||||
@ -153,7 +150,6 @@ translation-update-upstream
|
||||
gnome-patch-translation-prepare
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
@ -167,7 +163,6 @@ gnome-patch-translation-prepare
|
||||
%patch22 -p0
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
%patch28
|
||||
%patch30 -p1
|
||||
@ -278,6 +273,22 @@ fi
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Mon Apr 20 2009 vuntz@novell.com
|
||||
- Update to version 2.26.1:
|
||||
+ Use O_APPEND when opening log files
|
||||
+ Don't depend on gnome-power-manager registering with session
|
||||
manager - Give greeter and slave access to the display even
|
||||
after the hostname changes
|
||||
+ Give greeter and slave access to display independent of
|
||||
hostname
|
||||
+ Clean up stale auth temporary directories
|
||||
+ Fix double free crasher in user switcher applet
|
||||
+ Load saved settings after user types username into Other box
|
||||
+ Pass environment to PAM worker processes so messages are
|
||||
localized
|
||||
+ Fix up auditing for Solaris auditor
|
||||
- Drop gdm-xauthlocalhostname.patch: fixed another way upstream.
|
||||
- Drop gdm-propagate-env-to-jobs.patch: fixed upstream.
|
||||
* Fri Mar 27 2009 vuntz@novell.com
|
||||
- Use pwdutils for PreReq instead of directly listing the programs.
|
||||
* Mon Mar 16 2009 mboman@suse.de
|
||||
@ -327,7 +338,7 @@ fi
|
||||
- Add gdm-session-worker-check-states.patch to fix bnc#470714. We
|
||||
were handling late a setup signal, while we were already doing
|
||||
something else.
|
||||
* Thu Jan 29 2009 vuntz@novell.com
|
||||
* Fri Jan 30 2009 vuntz@novell.com
|
||||
- Add gdm-accreditation-failed-log.patch to improve logging in the
|
||||
case of accreditation failure.
|
||||
* Wed Jan 28 2009 vuntz@novell.com
|
||||
@ -342,7 +353,7 @@ fi
|
||||
- Drop gdm-fix-xdmcp.patch: fixed another way upstream.
|
||||
- Add gdm-bnc468374-dbus-send-dest.patch to add send_destination in
|
||||
the dbus policy. Fix bnc#468374.
|
||||
* Thu Jan 22 2009 mxwu@novell.com
|
||||
* Fri Jan 23 2009 mxwu@novell.com
|
||||
- Add gdm-selecting-desktop-environment.patch to select right
|
||||
desktop environment (bnc#460691)
|
||||
* Mon Jan 12 2009 mauro@suse.de
|
||||
@ -505,7 +516,7 @@ fi
|
||||
up in /usr/lib64 correctly
|
||||
- Remove the empty %%post section
|
||||
- Mark several files as config files.
|
||||
* Fri Aug 01 2008 hpj@suse.de
|
||||
* Sat Aug 02 2008 hpj@suse.de
|
||||
- Major upgrade to GDM 2.22.0, which is pretty much a complete rewrite upstream:
|
||||
+ Added gdm-consolekit-helper-subdir.patch, which lets GDM find ConsoleKit's
|
||||
helper executable in the subdir where it's installed.
|
||||
@ -722,7 +733,7 @@ fi
|
||||
- The greeter.dtd file has been updated. Now the default GDM themes
|
||||
validate with this dtd. (Dave Fincher)
|
||||
- Plus translation updates for a plethora of locales.
|
||||
* Thu Aug 16 2007 hpj@suse.de
|
||||
* Fri Aug 17 2007 hpj@suse.de
|
||||
- Fixed missing configuration variable definition in
|
||||
gdm-2.8.0.7-domain-entry.patch.
|
||||
* Fri Aug 10 2007 sbrabec@suse.cz
|
||||
@ -815,7 +826,7 @@ fi
|
||||
- b.g.o 415513, 417350, 415181, 409801, 409693, 406226, and 407687.
|
||||
* Fri Mar 30 2007 aj@suse.de
|
||||
- Add pwdutils to BuildRequires.
|
||||
* Wed Mar 21 2007 hpj@suse.de
|
||||
* Thu Mar 22 2007 hpj@suse.de
|
||||
- Add gdm-2.17.7-vt-fallback.patch. This is a port of the fix for
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=206804
|
||||
* Wed Mar 14 2007 maw@suse.de
|
||||
@ -999,7 +1010,7 @@ fi
|
||||
* Thu Jun 01 2006 hpj@suse.de
|
||||
- Don't let any user configure GDM from the login screen if a
|
||||
theme with user list is in effect. Fixes Novell bug #180219.
|
||||
* Wed May 31 2006 dreveman@suse.de
|
||||
* Thu Jun 01 2006 dreveman@suse.de
|
||||
- Fix bg patch and change gdm.conf patch so we pass -br to X
|
||||
server for black root window. (bnc 179847)
|
||||
* Wed May 24 2006 sbrabec@suse.cz
|
||||
@ -1109,7 +1120,7 @@ fi
|
||||
XAUTHLOCALHOSTNAME environment variable.
|
||||
* Thu Oct 13 2005 gekker@suse.de
|
||||
- Update to version 2.8.0.5
|
||||
* Tue Oct 04 2005 gekker@suse.de
|
||||
* Wed Oct 05 2005 gekker@suse.de
|
||||
- Rediff patch for background colors
|
||||
* Tue Oct 04 2005 gekker@suse.de
|
||||
- Fix background colors to be consistent on startup
|
||||
@ -1119,7 +1130,7 @@ fi
|
||||
- Make Industrial the default Gtk+ theme (114173)
|
||||
* Tue Sep 06 2005 sbrabec@suse.cz
|
||||
- Updated to version 2.8.0.4.
|
||||
* Mon Aug 22 2005 gekker@suse.de
|
||||
* Tue Aug 23 2005 gekker@suse.de
|
||||
- Update to version 2.8.0.3
|
||||
- Remove upstreamed autologin patch
|
||||
- Now installs .desktop files in correct location no need to move
|
||||
@ -1168,7 +1179,7 @@ fi
|
||||
* Fri Feb 11 2005 sbrabec@suse.cz
|
||||
- Resource only /usr/share/xsessions for session desktop files.
|
||||
- Fixed tcp_wrappers support on bi-arch.
|
||||
* Thu Feb 10 2005 gekker@suse.de
|
||||
* Fri Feb 11 2005 gekker@suse.de
|
||||
- Update to version 2.6.0.7
|
||||
* Wed Feb 09 2005 sbrabec@suse.cz
|
||||
- Cleaned-up configuration and patches.
|
||||
@ -1206,7 +1217,7 @@ fi
|
||||
time of login.
|
||||
(In the spec file, the diff file, gdm-session-startkde.diff, is
|
||||
applied at the %%install section)
|
||||
* Wed Jun 23 2004 dave@suse.de
|
||||
* Thu Jun 24 2004 dave@suse.de
|
||||
- Added gdm-presession-kde-path.patch, adds /opt/kde3/bin to the
|
||||
gdm path
|
||||
* Fri Jun 11 2004 clahey@suse.de
|
||||
@ -1272,7 +1283,7 @@ fi
|
||||
- Updated neededforbuild.
|
||||
- Use %%find_lang.
|
||||
- Prefix clash fix (capplets).
|
||||
* Tue May 27 2003 ro@suse.de
|
||||
* Wed May 28 2003 ro@suse.de
|
||||
- remove unpackaged files from buildroot
|
||||
* Mon May 26 2003 sbrabec@suse.cz
|
||||
- Re-enabled UTF-8 alternatives for all locales.
|
||||
@ -1309,7 +1320,7 @@ fi
|
||||
- Removed sox from neededforbuild.
|
||||
* Thu Nov 28 2002 hhetter@suse.de
|
||||
- updated to version 2.4.0.12 [GNOME 2.0.3]
|
||||
* Mon Nov 11 2002 ro@suse.de
|
||||
* Tue Nov 12 2002 ro@suse.de
|
||||
- changed neededforbuild <xf86 xdevel> to <x-devel-packages>
|
||||
* Sun Nov 03 2002 mfabian@suse.de
|
||||
- Bug Id #21407: correct wrong spelling of UTF-8 locale names
|
||||
|
Loading…
x
Reference in New Issue
Block a user