SHA256
1
0
forked from pool/gdm
OBS User unknown 2008-10-22 15:55:36 +00:00 committed by Git OBS Bridge
parent 3cd64f8926
commit 04e30fa44b
5 changed files with 814 additions and 769 deletions

View File

@ -1,13 +0,0 @@
Index: gdm-2.23.92/daemon/gdm-display-access-file.c
===================================================================
--- gdm-2.23.92.orig/daemon/gdm-display-access-file.c
+++ gdm-2.23.92/daemon/gdm-display-access-file.c
@@ -409,7 +409,7 @@ _get_auth_info_for_display (GdmDisplayAc
gdm_display_is_local (display, &is_local, NULL);
if (is_local) {
- *family = FamilyLocal;
+ *family = FamilyWild;
*address = g_strdup (g_get_host_name ());
} else {
*family = FamilyWild;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,79 @@
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Oct 16 14:44:40 CDT 2008 - hpj@novell.com
- Update gdm-domain-logon.patch, removing some dead code and a
signal callback that is no longer being used.
-------------------------------------------------------------------
Thu Oct 9 15:55:32 CDT 2008 - hpj@novell.com
- Replace gdm-2.23.92-host-wild.patch with
gdm-xauthlocalhostname.patch. The new patch sets the
XAUTHLOCALHOSTNAME env var instead of setting the cookie's
family to FamilyWild.
-------------------------------------------------------------------
Mon Oct 6 15:45:07 CEST 2008 - sbrabec@suse.cz

104
gdm.spec
View File

@ -56,7 +56,7 @@ PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.24.0
Release: 1
Release: 2
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@ -66,7 +66,7 @@ Source3: SuSEconfig.gdm
Source5: sysconfig.displaymanager-gdm
Patch1: gdm-consolekit-helper-subdir.patch
Patch2: gdm-2.21.9-no-fatal-warnings.patch
Patch3: gdm-2.23.92-host-wild.patch
Patch3: gdm-xauthlocalhostname.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
@ -138,7 +138,7 @@ Authors:
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8
%patch8 -p1
%patch28
%patch60
@ -246,6 +246,14 @@ fi
%files lang -f %{name}.lang
%changelog
* Thu Oct 16 2008 hpj@novell.com
- Update gdm-domain-logon.patch, removing some dead code and a
signal callback that is no longer being used.
* Thu Oct 09 2008 hpj@novell.com
- Replace gdm-2.23.92-host-wild.patch with
gdm-xauthlocalhostname.patch. The new patch sets the
XAUTHLOCALHOSTNAME env var instead of setting the cookie's
family to FamilyWild.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Fri Oct 03 2008 mboman@suse.de
@ -321,7 +329,7 @@ fi
up in /usr/lib64 correctly
- Remove the empty %%post section
- Mark several files as config files.
* Sat Aug 02 2008 hpj@suse.de
* Fri Aug 01 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.
@ -427,7 +435,7 @@ fi
displays.
+ Build/configure fixes for Solaris.
+ Translation updates.
* Wed Nov 14 2007 hpj@suse.de
* Tue Nov 13 2007 hpj@suse.de
- Removed second --with-atspi-dir from configure.
- Added gdm-tab-triggers-enter.patch, which fixes Novell bug
[#334446].
@ -436,7 +444,7 @@ fi
(#337428)
- Updated gdm-xdm-sessions.patch to run again the /etc/X11/xdm
scripts (#304399)
* Fri Nov 09 2007 hpj@suse.de
* Thu Nov 08 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
@ -444,7 +452,7 @@ fi
- Add abuild.patch.
* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Mon Sep 24 2007 hpj@suse.de
* Sun Sep 23 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
@ -538,7 +546,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.
* Fri Aug 17 2007 hpj@suse.de
* Thu Aug 16 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
@ -554,7 +562,7 @@ fi
* Sat Aug 04 2007 maw@suse.de
- Use %%fdupes
- Uncomment out the rm in %%clean.
* Sat Aug 04 2007 hpj@suse.de
* Fri Aug 03 2007 hpj@suse.de
- Update to version 2.19.5.
- Fix up gdm-conf.patch.
- Fix up gdm-2.19.3-reset-pam.patch.
@ -578,11 +586,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)
* Fri Jul 20 2007 maw@suse.de
* Thu Jul 19 2007 maw@suse.de
- Reenable gdm-conf.patch (#292837).
* Tue Jul 17 2007 coolo@suse.de
- fix pointer arithmetic
* Tue Jul 17 2007 mauro@suse.de
* Mon Jul 16 2007 mauro@suse.de
- Update to version 2.19.3
- Clean up of the not applicable patches.
- Bugfixes for #448547, #448548, #443557.
@ -626,15 +634,15 @@ fi
Fontenelle, Pema Geyleg, Priit Laes, Kjartan Maraas, Inaki Larranaga
Murgoitio, Kostas Papadimas, Ignacio Casal Quinteiro, Hendrik Richter,
Changwoo Ryu, Claudio Saavedra)
* Sat Mar 31 2007 maw@suse.de
* Fri Mar 30 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.
* Thu Mar 22 2007 hpj@suse.de
* Wed Mar 21 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
* Tue Mar 13 2007 maw@suse.de
- Update to version 2.17.7
- Removeupstreamed gdm-autobuild-warning.patch,
gdm-bufferoverrun.patch
@ -642,10 +650,10 @@ fi
[#400698], #399486, #352263, #395790, #394421.
* Fri Mar 02 2007 sbrabec@suse.cz
- Do not own /usr/share/xsessions (#229172).
* Tue Feb 27 2007 hpj@suse.de
* Mon Feb 26 2007 hpj@suse.de
- Added gdm-2.13.0.4-audit-login.patch, which fixes Novell bug
[#234133] (GDM cannot log authentication attempts).
* Wed Feb 14 2007 hpj@suse.de
* Tue Feb 13 2007 hpj@suse.de
- Add gdm-trunk-string-literal-cmp.patch. Fixes #233655.
* Mon Feb 12 2007 sbrabec@suse.cz
- Fixed reversed interpretation of
@ -692,7 +700,7 @@ fi
* Fri Oct 27 2006 jhargadon@suse.de
- changed TryExec to be the same as Exec in gdmsetup.desktop to
resolve bug #210943
* Tue Oct 24 2006 jhargadon@suse.de
* Mon Oct 23 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
@ -714,7 +722,7 @@ fi
* Tue Sep 26 2006 jhargadon@suse.de
- removed am_devperm.so from gdm.pamd and gdm-autologin.pamd
to resolve bug #206963
* Thu Sep 21 2006 jhargadon@suse.de
* Wed Sep 20 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
@ -726,7 +734,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
* Thu Aug 31 2006 jhargadon@suse.de
* Wed Aug 30 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
@ -808,21 +816,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.
* Sat Jun 10 2006 hpj@suse.de
* Fri Jun 09 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.
* Thu Jun 01 2006 hpj@suse.de
* Wed May 31 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.
* Thu Jun 01 2006 dreveman@suse.de
* Wed May 31 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).
* Fri May 19 2006 hpj@suse.de
* Thu May 18 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
@ -832,7 +840,7 @@ fi
* Fri May 12 2006 sbrabec@suse.cz
- Store value of PERMISSION_SECURITY by SuSEconfig in
gdm_sysconfig.conf (169639#c20).
* Tue May 09 2006 hpj@suse.de
* Mon May 08 2006 hpj@suse.de
- Made GDM use the "gdm" group instead of shadow. Fixes Novell bug
[#119651].
- Made use of the tab key work like pressing enter if there is no
@ -860,7 +868,7 @@ fi
service, bug #158786.
* Sat Mar 11 2006 coolo@suse.de
- fix the only-show-in-gnome patch to patch the .desktop.in
* Tue Mar 07 2006 federico@novell.com
* Mon Mar 06 2006 federico@novell.com
- Fix installation of the earlygdm service; we were not calling
fillup_and_insserv with "displaymanager" for the configuration
filename.
@ -869,9 +877,9 @@ fi
in PLUS (148468#c17).
* Tue Feb 28 2006 sbrabec@suse.cz
- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
* Sat Feb 25 2006 hpj@suse.de
* Fri Feb 24 2006 hpj@suse.de
- Add patch to fix tab keynav.
* Sat Feb 18 2006 sreeves@suse.de
* Fri Feb 17 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
@ -897,10 +905,10 @@ fi
- Added patch to require root auth to halt or reboot.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 19 2006 hpj@suse.de
* Wed Jan 18 2006 hpj@suse.de
- Updated the domain logon patch with numerous new features and
cosmetic fixes.
* Tue Jan 17 2006 hpj@suse.de
* Mon Jan 16 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
@ -920,37 +928,37 @@ fi
- Patch from upstream b.g.o (#152906)
* Mon Oct 17 2005 gekker@suse.de
- Make gdm.conf %%config(noreplace)
* Fri Oct 14 2005 hpj@suse.de
* Thu Oct 13 2005 hpj@suse.de
- Updated xauthority-across-hostname-changes patch to use
XAUTHLOCALHOSTNAME environment variable.
* Fri Oct 14 2005 gekker@suse.de
* Thu Oct 13 2005 gekker@suse.de
- Update to version 2.8.0.5
* Wed Oct 05 2005 gekker@suse.de
* Tue Oct 04 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.
* Fri Sep 16 2005 gekker@suse.de
* Thu Sep 15 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.
* Tue Aug 23 2005 gekker@suse.de
* Mon Aug 22 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
* Sat Aug 20 2005 hpj@suse.de
* Fri Aug 19 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.
* Sat Aug 13 2005 hpj@suse.de
* Fri Aug 12 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
* Fri Aug 12 2005 gekker@suse.de
* Thu Aug 11 2005 gekker@suse.de
- Update to version 2.8.0.2
- Make 64bit clean
* Sun Jul 31 2005 jpr@suse.de
* Sat Jul 30 2005 jpr@suse.de
- turn on compatibility symlink for all products
* Tue Jul 05 2005 gekker@suse.de
- Update to version 2.8.0.1
@ -984,7 +992,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.
* Fri Feb 11 2005 gekker@suse.de
* Thu Feb 10 2005 gekker@suse.de
- Update to version 2.6.0.7
* Wed Feb 09 2005 sbrabec@suse.cz
- Cleaned-up configuration and patches.
@ -999,7 +1007,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
* Wed Oct 27 2004 mmj@suse.de
* Tue Oct 26 2004 mmj@suse.de
- Locale rename no to nb
* Fri Oct 15 2004 sbrabec@suse.cz
- Implemented sysconfig displaymanager support.
@ -1008,7 +1016,7 @@ fi
the industrial theme (#44330)
* Wed Aug 25 2004 clahey@suse.de
- Cache gdm help and show gdm in khelpcenter.
* Tue Aug 17 2004 ro@suse.de
* Mon Aug 16 2004 ro@suse.de
- fixed specfile
* Mon Aug 16 2004 shprasad@suse.de
- Fixes bug #60020
@ -1022,10 +1030,10 @@ fi
time of login.
(In the spec file, the diff file, gdm-session-startkde.diff, is
applied at the %%install section)
* Thu Jun 24 2004 dave@suse.de
* Wed Jun 23 2004 dave@suse.de
- Added gdm-presession-kde-path.patch, adds /opt/kde3/bin to the
gdm path
* Sat Jun 12 2004 clahey@suse.de
* Fri Jun 11 2004 clahey@suse.de
- Added gdm-support-gdmctl.patch.
* Wed Jun 02 2004 mibarra@suse.de
- Fixed gdm.conf to use the correct group
@ -1039,7 +1047,7 @@ fi
- honor xdm scripts (#37852)
* Tue Mar 23 2004 sbrabec@suse.cz
- Non-UTF-8 locales removed from language menu.
* Tue Mar 23 2004 hhetter@suse.de
* Mon Mar 22 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)
@ -1075,7 +1083,7 @@ fi
- updated to version 2.4.1.6
* Mon Jul 28 2003 kukuk@suse.de
- Make sure /var/lib/gdm has correct permissions
* Fri Jul 25 2003 hhetter@suse.de
* Thu Jul 24 2003 hhetter@suse.de
- move capplets to correct position
- fix build
* Wed Jul 16 2003 sbrabec@suse.cz
@ -1088,7 +1096,7 @@ fi
- Updated neededforbuild.
- Use %%find_lang.
- Prefix clash fix (capplets).
* Wed May 28 2003 ro@suse.de
* Tue May 27 2003 ro@suse.de
- remove unpackaged files from buildroot
* Mon May 26 2003 sbrabec@suse.cz
- Re-enabled UTF-8 alternatives for all locales.
@ -1112,7 +1120,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
* Thu Jan 16 2003 ro@suse.de
* Wed Jan 15 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.
@ -1125,7 +1133,7 @@ fi
- Removed sox from neededforbuild.
* Thu Nov 28 2002 hhetter@suse.de
- updated to version 2.4.0.12 [GNOME 2.0.3]
* Tue Nov 12 2002 ro@suse.de
* Mon Nov 11 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