SHA256
1
0
forked from pool/gdm
OBS User unknown 2008-09-24 13:25:23 +00:00 committed by Git OBS Bridge
parent f84c29baaa
commit 2af08dc7ae
4 changed files with 240 additions and 42 deletions

View File

@ -0,0 +1,128 @@
Index: gdm-2.23.92/daemon/gdm-session-worker.c
===================================================================
--- gdm-2.23.92.orig/daemon/gdm-session-worker.c
+++ gdm-2.23.92/daemon/gdm-session-worker.c
@@ -1926,11 +1926,28 @@ static void
gdm_session_worker_set_session_name (GdmSessionWorker *worker,
const char *session_name)
{
+ char *env;
+
+ env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name);
+ pam_putenv (worker->priv->pam_handle, env);
+ g_free (env);
+
gdm_session_settings_set_session_name (worker->priv->user_settings,
session_name);
}
static void
+gdm_session_worker_set_default_session_name (GdmSessionWorker *worker,
+ const char *session_name)
+{
+ char *env;
+
+ env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name);
+ pam_putenv (worker->priv->pam_handle, env);
+ g_free (env);
+}
+
+static void
on_set_session_name (GdmSessionWorker *worker,
DBusMessage *message)
{
@@ -1953,6 +1970,28 @@ on_set_session_name (GdmSessionWorker *w
}
static void
+on_set_default_session_name (GdmSessionWorker *worker,
+ DBusMessage *message)
+{
+ DBusError error;
+ const char *session_name;
+ dbus_bool_t res;
+
+ dbus_error_init (&error);
+ res = dbus_message_get_args (message,
+ &error,
+ DBUS_TYPE_STRING, &session_name,
+ DBUS_TYPE_INVALID);
+ if (res) {
+ g_debug ("GdmSessionWorker: default session name changed; session name set to %s", session_name);
+ gdm_session_worker_set_default_session_name (worker, session_name);
+ } else {
+ g_warning ("Unable to get arguments: %s", error.message);
+ dbus_error_free (&error);
+ }
+}
+
+static void
gdm_session_worker_set_language_name (GdmSessionWorker *worker,
const char *language_name)
{
@@ -2527,6 +2566,8 @@ worker_dbus_handle_message (DBusConnecti
on_set_layout_name (worker, message);
} else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) {
on_set_session_name (worker, message);
+ } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetDefaultSessionName")) {
+ on_set_default_session_name (worker, message);
} else {
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
Index: gdm-2.23.92/daemon/gdm-session-direct.c
===================================================================
--- gdm-2.23.92.orig/daemon/gdm-session-direct.c
+++ gdm-2.23.92/daemon/gdm-session-direct.c
@@ -115,6 +115,8 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirec
G_IMPLEMENT_INTERFACE (GDM_TYPE_SESSION,
gdm_session_iface_init))
+static const char *get_session_name (GdmSessionDirect *session);
+
static gboolean
send_dbus_message (DBusConnection *connection,
DBusMessage *message)
@@ -668,12 +670,16 @@ get_default_session_name (GdmSessionDire
static void
gdm_session_direct_defaults_changed (GdmSessionDirect *session)
{
+ GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
+
_gdm_session_default_language_name_changed (GDM_SESSION (session),
get_default_language_name (session));
_gdm_session_default_layout_name_changed (GDM_SESSION (session),
get_default_layout_name (session));
_gdm_session_default_session_name_changed (GDM_SESSION (session),
get_default_session_name (session));
+ send_dbus_string_signal (impl, "SetDefaultSessionName",
+ get_session_name (impl));
}
static void
@@ -1111,11 +1117,16 @@ gdm_session_direct_handle_saved_session_
if (strcmp (session_name,
get_default_session_name (session)) != 0) {
+ GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
+
g_free (session->priv->saved_session);
session->priv->saved_session = g_strdup (session_name);
_gdm_session_default_session_name_changed (GDM_SESSION (session),
session_name);
+
+ send_dbus_string_signal (impl, "SetDefaultSessionName",
+ get_session_name (impl));
}
out:
return DBUS_HANDLER_RESULT_HANDLED;
@@ -1306,6 +1317,9 @@ do_introspect (DBusConnection *connectio
" <signal name=\"SetSessionName\">\n"
" <arg name=\"session_name\" type=\"s\"/>\n"
" </signal>\n"
+ " <signal name=\"SetDefaultSessionName\">\n"
+ " <arg name=\"session_name\" type=\"s\"/>\n"
+ " </signal>\n"
" <signal name=\"StartProgram\">\n"
" <arg name=\"command\" type=\"s\"/>\n"
" </signal>\n"

43
gdm-suse-xsession.patch Normal file
View File

@ -0,0 +1,43 @@
Index: gdm-2.23.92/data/Init.in
===================================================================
--- gdm-2.23.92.orig/data/Init.in
+++ gdm-2.23.92/data/Init.in
@@ -1,4 +1,9 @@
#!/bin/sh
+
+if test -x /etc/X11/xdm/Xsetup; then
+ exec /etc/X11/xdm/Xsetup
+fi
+
# Stolen from the debian kdm setup, aren't I sneaky
# Plus a lot of fun stuff added
# -George
Index: gdm-2.23.92/data/PostSession.in
===================================================================
--- gdm-2.23.92.orig/data/PostSession.in
+++ gdm-2.23.92/data/PostSession.in
@@ -1,5 +1,9 @@
#!/bin/sh
+if test -x /etc/X11/xdm/Xreset; then
+ exec /etc/X11/xdm/Xreset
+fi
+
PATH="@X_PATH@:$PATH:/bin:/usr/bin"
OLD_IFS=$IFS
Index: gdm-2.23.92/data/Xsession.in
===================================================================
--- gdm-2.23.92.orig/data/Xsession.in
+++ gdm-2.23.92/data/Xsession.in
@@ -1,4 +1,10 @@
#!@XSESSION_SHELL@
+
+if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
+ /bin/bash /etc/X11/xdm/Xstartup
+ exec /etc/X11/xdm/Xsession $1 $GDM_LANG
+fi
+
#
# This is SORT OF LIKE an X session, but not quite. You get a command as the
# first argument (it could be multiple words, so run it with "eval"). As a

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Sep 20 14:46:06 CEST 2008 - vuntz@novell.com
- Add gdm-suse-xsession.patch, which is similar to the
gdm-xdm-sessions.patch we have with GDM <= 2.20: it makes GDM
use the openSUSE scripts in /etc/X11/xdm, for proper integration.
- Add gdm-desktop-session-env-pam.patch, that sets the
DESKTOP_SESSION environment variable for pam. The goal is to let
the gnome-keyring pam module know when GNOME will be used, so
that it knows if it should start gnome-keyring.
- This is part of bnc#427744.
-------------------------------------------------------------------
Fri Sep 12 13:21:56 EDT 2008 - jpr@novell.com

View File

@ -56,7 +56,7 @@ PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.23.92
Release: 2
Release: 5
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@ -69,6 +69,10 @@ Patch2: gdm-2.21.9-no-fatal-warnings.patch
Patch3: gdm-2.23.92-host-wild.patch
Patch4: gdm-2.21.5-vt7-temporary-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
Patch6: gdm-desktop-session-env-pam.patch
# PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
Patch7: gdm-suse-xsession.patch
Patch28: gdm-X_SERVER.patch
# PATCH-SUSE: enable SELinux
Patch60: gdm-selinux.patch
@ -130,6 +134,8 @@ Authors:
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch28
%patch60
@ -237,6 +243,15 @@ fi
%files lang -f %{name}.lang
%changelog
* Sat Sep 20 2008 vuntz@novell.com
- Add gdm-suse-xsession.patch, which is similar to the
gdm-xdm-sessions.patch we have with GDM <= 2.20: it makes GDM
use the openSUSE scripts in /etc/X11/xdm, for proper integration.
- Add gdm-desktop-session-env-pam.patch, that sets the
DESKTOP_SESSION environment variable for pam. The goal is to let
the gnome-keyring pam module know when GNOME will be used, so
that it knows if it should start gnome-keyring.
- This is part of bnc#427744.
* Fri Sep 12 2008 jpr@novell.com
- Move gdm-2.23.92-set-xauthlocalhostname-when-local.patch to
gdm-2.23.92-host-wild.patch to really fix race (bnc #420057)
@ -292,7 +307,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.
@ -398,7 +413,7 @@ fi
displays.
+ Build/configure fixes for Solaris.
+ Translation updates.
* Tue Nov 13 2007 hpj@suse.de
* Wed Nov 14 2007 hpj@suse.de
- Removed second --with-atspi-dir from configure.
- Added gdm-tab-triggers-enter.patch, which fixes Novell bug
[#334446].
@ -407,7 +422,7 @@ fi
(#337428)
- Updated gdm-xdm-sessions.patch to run again the /etc/X11/xdm
scripts (#304399)
* Thu Nov 08 2007 hpj@suse.de
* Fri Nov 09 2007 hpj@suse.de
- Pass the --with-atspi-dir= flag to configure so the
at-spi-registryd is started correctly. Fixes Novell bug #337428.
* Thu Oct 18 2007 maw@suse.de
@ -415,7 +430,7 @@ fi
- Add abuild.patch.
* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Sun Sep 23 2007 hpj@suse.de
* Mon Sep 24 2007 hpj@suse.de
- Added gdm-2.20.0-wait-for-restart.patch, which fixes Novell bug
[#326281].
* Thu Sep 20 2007 banderso@suse.de
@ -509,7 +524,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
@ -549,11 +564,11 @@ fi
* Tue Jul 24 2007 jpr@suse.de
- Add xorg-x11-server-extras for Xnest/Xephyr so that the defaults
are set correctly (not an installation dep)
* Thu Jul 19 2007 maw@suse.de
* Fri Jul 20 2007 maw@suse.de
- Reenable gdm-conf.patch (#292837).
* Tue Jul 17 2007 coolo@suse.de
- fix pointer arithmetic
* Mon Jul 16 2007 mauro@suse.de
* Tue Jul 17 2007 mauro@suse.de
- Update to version 2.19.3
- Clean up of the not applicable patches.
- Bugfixes for #448547, #448548, #443557.
@ -597,15 +612,15 @@ fi
Fontenelle, Pema Geyleg, Priit Laes, Kjartan Maraas, Inaki Larranaga
Murgoitio, Kostas Papadimas, Ignacio Casal Quinteiro, Hendrik Richter,
Changwoo Ryu, Claudio Saavedra)
* Fri Mar 30 2007 maw@suse.de
* Sat Mar 31 2007 maw@suse.de
- Update to version 2.18.0
- 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
* Tue Mar 13 2007 maw@suse.de
* Wed Mar 14 2007 maw@suse.de
- Update to version 2.17.7
- Removeupstreamed gdm-autobuild-warning.patch,
gdm-bufferoverrun.patch
@ -613,10 +628,10 @@ fi
[#400698], #399486, #352263, #395790, #394421.
* Fri Mar 02 2007 sbrabec@suse.cz
- Do not own /usr/share/xsessions (#229172).
* Mon Feb 26 2007 hpj@suse.de
* Tue Feb 27 2007 hpj@suse.de
- Added gdm-2.13.0.4-audit-login.patch, which fixes Novell bug
[#234133] (GDM cannot log authentication attempts).
* Tue Feb 13 2007 hpj@suse.de
* Wed Feb 14 2007 hpj@suse.de
- Add gdm-trunk-string-literal-cmp.patch. Fixes #233655.
* Mon Feb 12 2007 sbrabec@suse.cz
- Fixed reversed interpretation of
@ -663,7 +678,7 @@ fi
* Fri Oct 27 2006 jhargadon@suse.de
- changed TryExec to be the same as Exec in gdmsetup.desktop to
resolve bug #210943
* Mon Oct 23 2006 jhargadon@suse.de
* Tue Oct 24 2006 jhargadon@suse.de
- mkdir /var/log/gdm (#213737)
* Thu Oct 12 2006 danw@suse.de
- Remove some dead patches. Rename a few for consistency
@ -685,7 +700,7 @@ fi
* Tue Sep 26 2006 jhargadon@suse.de
- removed am_devperm.so from gdm.pamd and gdm-autologin.pamd
to resolve bug #206963
* Wed Sep 20 2006 jhargadon@suse.de
* Thu Sep 21 2006 jhargadon@suse.de
- modified SuSEconfig.gdm to reflect the name change of gdm.conf
to custom.conf. bug #206904
* Thu Sep 14 2006 jhargadon@suse.de
@ -697,7 +712,7 @@ fi
- 341619 - No longer save "Failsafe" sessions as user's default login
* Mon Sep 04 2006 kukuk@suse.de
- Add pam_loginuid.so to gdm.pamd and gdm-autologin.pamd
* Wed Aug 30 2006 jhargadon@suse.de
* Thu Aug 31 2006 jhargadon@suse.de
- update to version 2.15.10
- Now gdmlogin centers cursor in the GUI to ensure that the login
window always has focus
@ -779,21 +794,21 @@ fi
- Per-display configuration is now supported.
- Greeter themes now support real GTK+ button types, making gdmgreeter
better support a11y and allow GTK themeable buttons.
* Fri Jun 09 2006 hpj@suse.de
* Sat Jun 10 2006 hpj@suse.de
- Update domain entry patch to default to the currently joined
Active Directory domain if there was no stored preference. Fixes
Novell bug #167344.
* Wed May 31 2006 hpj@suse.de
* 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
- Do not display Japanese string in terminal, which doesn't support
it (#168736).
- Disabled beep on start (#174786).
* Thu May 18 2006 hpj@suse.de
* Fri May 19 2006 hpj@suse.de
- Made GDM use the more graphically intensive, but prettier,
gdmgreeter for remote logins. Fixes Novell bug #176661.
* Tue May 16 2006 sbrabec@suse.cz
@ -831,7 +846,7 @@ fi
service, bug #158786.
* Sat Mar 11 2006 coolo@suse.de
- fix the only-show-in-gnome patch to patch the .desktop.in
* Mon Mar 06 2006 federico@novell.com
* Tue Mar 07 2006 federico@novell.com
- Fix installation of the earlygdm service; we were not calling
fillup_and_insserv with "displaymanager" for the configuration
filename.
@ -840,9 +855,9 @@ fi
in PLUS (148468#c17).
* Tue Feb 28 2006 sbrabec@suse.cz
- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
* Fri Feb 24 2006 hpj@suse.de
* Sat Feb 25 2006 hpj@suse.de
- Add patch to fix tab keynav.
* Fri Feb 17 2006 sreeves@suse.de
* Sat Feb 18 2006 sreeves@suse.de
- Update .desktop file (Name, GenericName, Comment, DocPath)
* Fri Feb 17 2006 gekker@suse.de
- Fix background color in GDM, it should be black
@ -868,10 +883,10 @@ fi
- Added patch to require root auth to halt or reboot.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 18 2006 hpj@suse.de
* Thu Jan 19 2006 hpj@suse.de
- Updated the domain logon patch with numerous new features and
cosmetic fixes.
* Mon Jan 16 2006 hpj@suse.de
* Tue Jan 17 2006 hpj@suse.de
- Fixed a bug in logon code that prevented domain logons from
working. Updated domain logon patch.
* Fri Jan 13 2006 schwab@suse.de
@ -894,31 +909,31 @@ fi
* Fri Oct 14 2005 hpj@suse.de
- Updated xauthority-across-hostname-changes patch to use
XAUTHLOCALHOSTNAME environment variable.
* Thu Oct 13 2005 gekker@suse.de
* Fri Oct 14 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
* Tue Sep 20 2005 sbrabec@suse.cz
- Removed references to build directory in installed .la files.
* Thu Sep 15 2005 gekker@suse.de
* Fri Sep 16 2005 gekker@suse.de
- 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
* Fri Aug 19 2005 hpj@suse.de
* Sat Aug 20 2005 hpj@suse.de
- Make the default session option work on autologin; we now get GNOME.
* Tue Aug 16 2005 sbrabec@suse.cz
- Use gnome-screensaver instead of xscreensaver.
* Fri Aug 12 2005 hpj@suse.de
* Sat Aug 13 2005 hpj@suse.de
- Made gdm-autologin.pam not require a password.
* Fri Aug 12 2005 jpr@suse.de
- require xorg-x11-xnest for the gdmflexiserver -n option
* Thu Aug 11 2005 gekker@suse.de
* Fri Aug 12 2005 gekker@suse.de
- Update to version 2.8.0.2
- Make 64bit clean
* Sun Jul 31 2005 jpr@suse.de
@ -955,7 +970,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.
@ -970,7 +985,7 @@ fi
- add X-KDE-RootOnly to gdmsetup.desktop (#45807)
* Mon Nov 15 2004 kukuk@suse.de
- Use common-* PAM config files for gdm and gdm-autologin
* Tue Oct 26 2004 mmj@suse.de
* Wed Oct 27 2004 mmj@suse.de
- Locale rename no to nb
* Fri Oct 15 2004 sbrabec@suse.cz
- Implemented sysconfig displaymanager support.
@ -979,7 +994,7 @@ fi
the industrial theme (#44330)
* Wed Aug 25 2004 clahey@suse.de
- Cache gdm help and show gdm in khelpcenter.
* Mon Aug 16 2004 ro@suse.de
* Tue Aug 17 2004 ro@suse.de
- fixed specfile
* Mon Aug 16 2004 shprasad@suse.de
- Fixes bug #60020
@ -993,10 +1008,10 @@ 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
* Sat Jun 12 2004 clahey@suse.de
- Added gdm-support-gdmctl.patch.
* Wed Jun 02 2004 mibarra@suse.de
- Fixed gdm.conf to use the correct group
@ -1010,7 +1025,7 @@ fi
- honor xdm scripts (#37852)
* Tue Mar 23 2004 sbrabec@suse.cz
- Non-UTF-8 locales removed from language menu.
* Mon Mar 22 2004 hhetter@suse.de
* Tue Mar 23 2004 hhetter@suse.de
- remove SuSEconfig.gdm; it's no longer needed to manage
the available sessions for gdm, as it is now using desktop
files to define it's sessions (#36267)
@ -1046,7 +1061,7 @@ fi
- updated to version 2.4.1.6
* Mon Jul 28 2003 kukuk@suse.de
- Make sure /var/lib/gdm has correct permissions
* Thu Jul 24 2003 hhetter@suse.de
* Fri Jul 25 2003 hhetter@suse.de
- move capplets to correct position
- fix build
* Wed Jul 16 2003 sbrabec@suse.cz
@ -1059,7 +1074,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.
@ -1083,7 +1098,7 @@ fi
- updated to 2.4.1.3 [GNOME 2.2.0]
* Fri Feb 07 2003 kukuk@suse.de
- Use pam_unix2.so instead of pam_unix.so
* Wed Jan 15 2003 ro@suse.de
* Thu Jan 16 2003 ro@suse.de
- use gtk2-devel-packages and libjpeg in neededforbuild
* Tue Jan 07 2003 sbrabec@suse.cz
- Update to version 2.4.1.0.
@ -1096,7 +1111,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