From 5010bfe5cd89ee968d76fa0adb7c2c195915af6363489e69bbfca00de5611a5c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Sep 2007 19:50:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=32 --- SuSEconfig.gdm | 7 ------- gdm-XKeepsCrashing-SaX2.patch | 10 ++++++++++ gdm.changes | 11 +++++++++++ gdm.spec | 31 ++++++++++++++++++++++++++----- 4 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 gdm-XKeepsCrashing-SaX2.patch diff --git a/SuSEconfig.gdm b/SuSEconfig.gdm index 69779a8..aec38a5 100644 --- a/SuSEconfig.gdm +++ b/SuSEconfig.gdm @@ -316,17 +316,10 @@ BEGIN { ' # Password-less login is implemented by PAM. Do the required change. if [ "$DISPLAYMANAGER_PASSWORD_LESS_LOGIN" = "yes" ] ; then - sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' <$r/etc/pam.d/gdm >$r/etc/pam.d/gdm.new else - sed 's/^\(auth[[:space:]][[:space:]]*\)required\([[:space:]][[:space:]]*\)pam_permit\.so/\1include \2common-auth/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new sed 's/^\(auth[[:space:]][[:space:]]*\)required\([[:space:]][[:space:]]*\)pam_permit\.so/\1include \2common-auth/' <$r/etc/pam.d/gdm >$r/etc/pam.d/gdm.new fi -if cmp -s $r/etc/pam.d/gdm-autologin $r/etc/pam.d/gdm-autologin.new ; then - rm $r/etc/pam.d/gdm-autologin.new -else - mv $r/etc/pam.d/gdm-autologin.new $r/etc/pam.d/gdm-autologin -fi if cmp -s $r/etc/pam.d/gdm $r/etc/pam.d/gdm.new ; then rm $r/etc/pam.d/gdm.new else diff --git a/gdm-XKeepsCrashing-SaX2.patch b/gdm-XKeepsCrashing-SaX2.patch new file mode 100644 index 0000000..03f757c --- /dev/null +++ b/gdm-XKeepsCrashing-SaX2.patch @@ -0,0 +1,10 @@ +--- config/XKeepsCrashing ++++ config/XKeepsCrashing +@@ -65,6 +65,7 @@ + # + XCONFIGURATOR= + for n in \ ++ /usr/sbin/SaX2 \ + /usr/bin/system-config-display \ + /usr/bin/redhat-config-xfree86 \ + /usr/sbin/XFdrake \ diff --git a/gdm.changes b/gdm.changes index a704a18..5fc8cc1 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Sep 5 17:45:26 CEST 2007 - sbrabec@suse.cz + +- Search for SaX2 in XKeepsCrashing. + +------------------------------------------------------------------- +Wed Sep 5 15:43:38 CEST 2007 - sbrabec@suse.cz + +- Apply DISPLAYMANAGER_PASSWORD_LESS_LOGIN only for standard login, + not for autologin (#307566). + ------------------------------------------------------------------- Mon Sep 3 06:21:39 CEST 2007 - hpj@suse.de diff --git a/gdm.spec b/gdm.spec index 319e7a5..0ba6565 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.7 -Release: 3 +Release: 5 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -54,6 +54,7 @@ Patch37: gdm-2.19.3-token-login.patch # don't ask. Patch38: gdm-2.19.3-token-login2.patch Patch39: gdm-2.19.7-pam-hide-password.patch +Patch40: gdm-XKeepsCrashing-SaX2.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -108,6 +109,7 @@ gnome-patch-translation-prepare %patch37 -p1 %patch38 -p0 %patch39 -p1 +%patch40 gnome-patch-translation-update %build @@ -164,14 +166,28 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a rm -rf $RPM_BUILD_ROOT %pre -# Remove old logs (#56205). -rm -f var/lib/gdm/*.log* -# Remove old gdm_sysconfig.conf to update custom.conf from sysconfig settings. -rm -f etc/gdm/gdm_sysconfig.conf /usr/sbin/groupadd -r gdm 2> /dev/null || : /usr/sbin/useradd -r -o -g gdm -s /bin/false \ -c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || : /usr/sbin/usermod -g gdm -G gdm -s /bin/false gdm 2> /dev/null +# Remove old gdm_sysconfig.conf to update custom.conf from sysconfig settings. +rm -f etc/gdm/gdm_sysconfig.conf +# Remove old logs (#56205). Last created in SLEC8&9.0, first deleted in 9.2&SLED10. +# Can be removed after SLES11: +rm -f var/lib/gdm/*.log* +# Fix incorrect interpretation of DISPLAYMANAGER_PASSWORD_LESS_LOGIN (#307566). +# Last done in SLED10&10.1, first fixed in 10.3. +# Can be removed after SLES12: +if grep -q gdm-autologin sbin/conf.d/SuSEconfig.gdm ; then + if grep -q '^DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no"' etc/sysconfig/displaymanager ; then + sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' etc/pam.d/gdm-autologin.new + if cmp -s etc/pam.d/gdm-autologin etc/pam.d/gdm-autologin.new ; then + rm etc/pam.d/gdm-autologin.new + else + mv etc/pam.d/gdm-autologin.new etc/pam.d/gdm-autologin + fi + fi +fi %post %if %suse_version < 1010 @@ -228,6 +244,11 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %files lang -f %{name}.lang %changelog +* Wed Sep 05 2007 - sbrabec@suse.cz +- Search for SaX2 in XKeepsCrashing. +* Wed Sep 05 2007 - sbrabec@suse.cz +- Apply DISPLAYMANAGER_PASSWORD_LESS_LOGIN only for standard login, + not for autologin (#307566). * Mon Sep 03 2007 - hpj@suse.de - Add gdm-2.19.7-pam-hide-password.patch, which fixes an upstream bug where the user's password was being shown on screen (part of