From 6a21488aa2d227af761536aeaae7e9a35752d016 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Oct 26 2007 06:13:46 +0000 Subject: - fix gdmflexiserver -n (bug 352491) --- diff --git a/gdm-2.20.0-change-defaults.patch b/gdm-2.20.0-change-defaults.patch deleted file mode 100644 index 85c202d..0000000 --- a/gdm-2.20.0-change-defaults.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff -up gdm-2.19.8/config/gdm.conf.in.change-defaults gdm-2.19.8/config/gdm.conf.in ---- gdm-2.19.8/config/gdm.conf.in.change-defaults 2007-09-07 11:40:58.000000000 -0400 -+++ gdm-2.19.8/config/gdm.conf.in 2007-09-12 13:14:39.000000000 -0400 -@@ -66,9 +66,9 @@ TimedLoginDelay=30 - # should leave this alone. - #Chooser=@libexecdir@/gdmchooser - --# The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter --# to get the new graphical greeter. --#Greeter=@libexecdir@/gdmlogin -+# The greeter for attached (non-xdmcp) logins. Change gdmgreeter to gdmlogin to -+# get the boring greeter. -+Greeter=@libexecdir@/gdmgreeter - - # The greeter for xdmcp logins, usually you want a less graphically intensive - # greeter here so it's better to leave this with gdmlogin -@@ -78,23 +78,23 @@ TimedLoginDelay=30 - # This is useful for enabling additional feature support e.g. GNOME - # accessibility framework. Only "trusted" modules should be allowed to minimize - # security holes --#AddGtkModules=false -+AddGtkModules=true - # By default, these are the accessibility modules. --#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener -+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener - - # Default path to set. The profile scripts will likely override this value. - # This value will be overridden with the value from /etc/default/login if it - # contains "ROOT=". --#DefaultPath=@GDM_USER_PATH@ -+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin - # Default path for root. The profile scripts will likely override this value. - # This value will be overridden with the value from /etc/default/login if it - # contains "SUROOT=". --#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ -+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin - - # If you are having trouble with using a single server for a long time and want - # GDM to kill/restart the server, turn this on. On Solaris, this value is - # always true and this configuration setting is ignored. --#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@ -+AlwaysRestartServer=true - - # User and group used for running GDM GUI applications. By default this is set - # to user "gdm" and group "gdm". This user/group should have very limited -@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi - # - # Reboot, Halt and suspend commands, you can add different commands separated - # by a semicolon. GDM will use the first one it can find. --RebootCommand=@REBOOT_COMMAND@ --HaltCommand=@HALT_COMMAND@ --SuspendCommand=@SUSPEND_COMMAND@ -+# -+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot -+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff - - # The following options specify how GDM system commands are supported. - # -@@ -158,14 +158,14 @@ ServAuthDir=@authdir@ - # This is our standard startup script. A bit different from a normal X - # session, but it shares a lot of stuff with that. See the provided default - # for more information. --BaseXsession=@gdmconfdir@/Xsession -+BaseXsession=/etc/X11/xinit/Xsession - # This is a directory where .desktop files describing the sessions live. It is - # really a PATH style variable since 2.4.4.2 to allow actual interoperability - # with KDM. Note that /Sessions is there for backwards - # compatibility reasons with 2.4.4.x. - #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ - # This is the default .desktop session. One of the ones in SessionDesktopDir --#DefaultSession=gnome.desktop -+DefaultSession=default.desktop - # Better leave this blank and HOME will be used. You can use syntax ~/ below - # to indicate home directory of the user. You can also set this to something - # like /tmp if you don't want the authorizations to be in home directories. -@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession - # is the home directory the UserAuthFBDir will still be used in case the home - # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this - # behavior. --UserAuthDir= -+UserAuthDir=/tmp - # Fallback directory for writing authorization file if user's home directory - # is not writable. - UserAuthFBDir=/tmp --UserAuthFile=.Xauthority -+#UserAuthFile=.Xauthority - # The X server to use if we can't figure out what else to run. --StandardXServer=@X_SERVER@ -+StandardXServer=@X_SERVER@ -br - # The maximum number of flexible X servers to run. - #FlexibleXServers=5 - # And after how many minutes should we reap the flexible server if there is no -@@ -209,7 +209,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_ - #DoubleLoginWarning=true - # Should a second login always resume the current session and switch VT's on - # Linux and FreeBSD systems for console logins --#AlwaysLoginCurrentSession=true -+AlwaysLoginCurrentSession=true - - # If true then the last login information is printed to the user before being - # prompted for password. While this gives away some info on what users are on -@@ -356,7 +356,7 @@ Enable=false - #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc - - # The GTK+ theme to use for the GUI. --#GtkTheme=Default -+GtkTheme=Clearlooks - # If to allow changing the GTK+ (widget) theme from the greeter. Currently - # this only affects the standard greeter as the graphical greeter does not yet - # have this ability. -@@ -377,7 +377,7 @@ Enable=false - # themed login (gdmgreeter). - # - # The standard login has a title bar that the user can move. --#TitleBar=true -+TitleBar=false - # Don't allow user to move the standard login window. Only makes sense if - # TitleBar is on. - #LockPosition=false -@@ -395,13 +395,13 @@ Enable=false - # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude, - # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed - # greeter. --Browser=false -+Browser=true - # The default picture in the browser. - #DefaultFace=@pixmapdir@/nobody.png - # User ID's less than the MinimalUID value will not be included in the face - # browser or in the gdmselection list for Automatic/Timed login. They will not - # be displayed regardless of the settings for Include and Exclude. --#MinimalUID=100 -+MinimalUID=500 - # Users listed in Include will be included in the face browser and in the - # gdmsetup selection list for Automatic/Timed login. Users should be separated - # by commas. -@@ -418,7 +418,7 @@ Browser=false - # large numbers of users and this feature should not be used in such - # environments. The setting of IncludeAll does nothing if Include is set to a - # non-empty value. --#IncludeAll=false -+IncludeAll=true - # If user or user.png exists in this dir it will be used as his picture. - #GlobalFaceDir=@datadir@/pixmaps/faces/ - -@@ -427,7 +427,7 @@ Browser=false - # file, although GDM will be able to read a standard locale.alias file as well. - #LocaleFile=@gdmlocaledir@/locale.alias - # Logo shown in the standard greeter. --#Logo=@pixmapdir@/gdm-foot-logo.png -+Logo= - # Logo shown on file chooser button in gdmsetup (do not modify this value). - #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png - # The standard greeter should shake if a user entered the wrong username or -@@ -474,8 +474,9 @@ DefaultRemoteWelcome=true - # The Standard greeter (gdmlogin) uses BackgroundColor as the background - # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor - # as the background color. --BackgroundColor=#76848F --GraphicalThemedColor=#76848F -+BackgroundColor=#20305a -+GraphicalThemedColor=#000000 -+ - # XDMCP session should only get a color, this is the sanest setting since you - # don't want to take up too much bandwidth - #BackgroundRemoteOnlyColor=true -@@ -496,8 +497,8 @@ GraphicalThemedColor=#76848F - # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for - # example) and more failsafe then those supplied by scripts so distros should - # use this rather then just running an xterm from a script. --#ShowGnomeFailsafeSession=true --#ShowXtermFailsafeSession=true -+ShowGnomeFailsafeSession=false -+ShowXtermFailsafeSession=false - # Normally there is a session type called 'Last' that is shown which refers to - # the last session the user used. If off, we will be in 'switchdesk' mode - # where the session saving stuff is disabled in GDM -@@ -516,7 +517,7 @@ GraphicalThemedColor=#76848F - # list then provide a list that is delimited by /: to the GraphicalThemes - # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme - # and specify just one theme. --#GraphicalTheme=circles -+GraphicalTheme=FedoraInfinity - #GraphicalThemes=circles/:happygnome - GraphicalThemeDir=@datadir@/gdm/themes/ - GraphicalThemeRand=false -@@ -633,7 +634,7 @@ Gestures=false - - [server-Standard] - name=Standard server --command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ - flexible=true - # Indicates that the X server should be started at a different process - # priority. Values can be any integer value accepted by the setpriority C diff --git a/gdm-2.20.1-change-defaults.patch b/gdm-2.20.1-change-defaults.patch new file mode 100644 index 0000000..a60c81e --- /dev/null +++ b/gdm-2.20.1-change-defaults.patch @@ -0,0 +1,208 @@ +diff -up gdm-2.20.1/config/gdm.conf.in.change-defaults gdm-2.20.1/config/gdm.conf.in +--- gdm-2.20.1/config/gdm.conf.in.change-defaults 2007-10-26 02:06:10.000000000 -0400 ++++ gdm-2.20.1/config/gdm.conf.in 2007-10-26 02:09:07.000000000 -0400 +@@ -66,9 +66,9 @@ TimedLoginDelay=30 + # should leave this alone. + #Chooser=@libexecdir@/gdmchooser + +-# The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter +-# to get the new graphical greeter. +-#Greeter=@libexecdir@/gdmlogin ++# The greeter for attached (non-xdmcp) logins. Change gdmgreeter to gdmlogin to ++# get the boring greeter. ++Greeter=@libexecdir@/gdmgreeter + + # The greeter for xdmcp logins, usually you want a less graphically intensive + # greeter here so it's better to leave this with gdmlogin +@@ -78,23 +78,23 @@ TimedLoginDelay=30 + # This is useful for enabling additional feature support e.g. GNOME + # accessibility framework. Only "trusted" modules should be allowed to minimize + # security holes +-#AddGtkModules=false ++AddGtkModules=true + # By default, these are the accessibility modules. +-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener ++GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener + + # Default path to set. The profile scripts will likely override this value. + # This value will be overridden with the value from /etc/default/login if it + # contains "ROOT=". +-#DefaultPath=@GDM_USER_PATH@ ++DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin + # Default path for root. The profile scripts will likely override this value. + # This value will be overridden with the value from /etc/default/login if it + # contains "SUROOT=". +-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ ++RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin + + # If you are having trouble with using a single server for a long time and want + # GDM to kill/restart the server, turn this on. On Solaris, this value is + # always true and this configuration setting is ignored. +-#AlwaysRestartServer=@ALWAYS_RESTART_SERVER@ ++AlwaysRestartServer=true + + # User and group used for running GDM GUI applications. By default this is set + # to user "gdm" and group "gdm". This user/group should have very limited +@@ -126,9 +126,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi + # + # Reboot, Halt and suspend commands, you can add different commands separated + # by a semicolon. GDM will use the first one it can find. +-RebootCommand=@REBOOT_COMMAND@ +-HaltCommand=@HALT_COMMAND@ +-SuspendCommand=@SUSPEND_COMMAND@ ++# ++RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot ++HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff + + # The following options specify how GDM system commands are supported. + # +@@ -158,14 +158,14 @@ ServAuthDir=@authdir@ + # This is our standard startup script. A bit different from a normal X + # session, but it shares a lot of stuff with that. See the provided default + # for more information. +-BaseXsession=@gdmconfdir@/Xsession ++BaseXsession=/etc/X11/xinit/Xsession + # This is a directory where .desktop files describing the sessions live. It is + # really a PATH style variable since 2.4.4.2 to allow actual interoperability + # with KDM. Note that /Sessions is there for backwards + # compatibility reasons with 2.4.4.x. + #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ + # This is the default .desktop session. One of the ones in SessionDesktopDir +-#DefaultSession=gnome.desktop ++DefaultSession=default.desktop + # Better leave this blank and HOME will be used. You can use syntax ~/ below + # to indicate home directory of the user. You can also set this to something + # like /tmp if you don't want the authorizations to be in home directories. +@@ -173,13 +173,13 @@ BaseXsession=@gdmconfdir@/Xsession + # is the home directory the UserAuthFBDir will still be used in case the home + # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this + # behavior. +-UserAuthDir= ++UserAuthDir=/tmp + # Fallback directory for writing authorization file if user's home directory + # is not writable. + UserAuthFBDir=/tmp +-UserAuthFile=.Xauthority ++#UserAuthFile=.Xauthority + # The X server to use if we can't figure out what else to run. +-StandardXServer=@X_SERVER@ ++StandardXServer=@X_SERVER@ -br + # The maximum number of flexible X servers to run. + #FlexibleXServers=5 + # And after how many minutes should we reap the flexible server if there is no +@@ -189,10 +189,9 @@ StandardXServer=@X_SERVER@ + + # The X nest command. + # Examples of valid commands (assuming installed to /usr/X11/bin: +-# Xorg Xnest: /usr/X11/bin/Xnest -audit 0 -name Xnest +-# Xsun Xnest: /usr/openwin/bin/Xnest -audit 0 -name Xnest -pn +-# Xephyr: /usr/X11/bin/Xephyr -audit 0 +-Xnest=@X_XNEST_CMD@ @X_XNEST_CONFIG_OPTIONS@ ++# Xorg Xnest: /usr/bin/Xnest -audit 0 -name Xnest ++# Xephyr: /usr/bin/Xephyr -audit 0 ++Xnest=/usr/bin/Xephyr -audit 0 + # Xsun Xnest does not support font paths (passed into Xnest -fp argument) + # that include the ":unscaled" suffix after a path name. Setting this to + # false will strip any ":unscaled" suffix from the font path. If not +@@ -209,7 +208,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_ + #DoubleLoginWarning=true + # Should a second login always resume the current session and switch VT's on + # Linux and FreeBSD systems for console logins +-#AlwaysLoginCurrentSession=true ++AlwaysLoginCurrentSession=true + + # If true then the last login information is printed to the user before being + # prompted for password. While this gives away some info on what users are on +@@ -356,7 +355,7 @@ Enable=false + #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc + + # The GTK+ theme to use for the GUI. +-#GtkTheme=Default ++GtkTheme=Clearlooks + # If to allow changing the GTK+ (widget) theme from the greeter. Currently + # this only affects the standard greeter as the graphical greeter does not yet + # have this ability. +@@ -377,7 +376,7 @@ Enable=false + # themed login (gdmgreeter). + # + # The standard login has a title bar that the user can move. +-#TitleBar=true ++TitleBar=false + # Don't allow user to move the standard login window. Only makes sense if + # TitleBar is on. + #LockPosition=false +@@ -395,13 +394,13 @@ Enable=false + # affect the Face Browser (MinimalUID, DefaultFace, Include, Exclude, + # IncludeAll, GlobalFaceDir) are used by both the Standard and Themed + # greeter. +-Browser=false ++Browser=true + # The default picture in the browser. + #DefaultFace=@pixmapdir@/nobody.png + # User ID's less than the MinimalUID value will not be included in the face + # browser or in the gdmselection list for Automatic/Timed login. They will not + # be displayed regardless of the settings for Include and Exclude. +-#MinimalUID=100 ++MinimalUID=500 + # Users listed in Include will be included in the face browser and in the + # gdmsetup selection list for Automatic/Timed login. Users should be separated + # by commas. +@@ -418,7 +417,7 @@ Browser=false + # large numbers of users and this feature should not be used in such + # environments. The setting of IncludeAll does nothing if Include is set to a + # non-empty value. +-#IncludeAll=false ++IncludeAll=true + # If user or user.png exists in this dir it will be used as his picture. + #GlobalFaceDir=@datadir@/pixmaps/faces/ + +@@ -427,7 +426,7 @@ Browser=false + # file, although GDM will be able to read a standard locale.alias file as well. + #LocaleFile=@gdmlocaledir@/locale.alias + # Logo shown in the standard greeter. +-#Logo=@pixmapdir@/gdm-foot-logo.png ++Logo= + # Logo shown on file chooser button in gdmsetup (do not modify this value). + #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png + # The standard greeter should shake if a user entered the wrong username or +@@ -474,8 +473,9 @@ DefaultRemoteWelcome=true + # The Standard greeter (gdmlogin) uses BackgroundColor as the background + # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor + # as the background color. +-BackgroundColor=#76848F +-GraphicalThemedColor=#76848F ++BackgroundColor=#20305a ++GraphicalThemedColor=#000000 ++ + # XDMCP session should only get a color, this is the sanest setting since you + # don't want to take up too much bandwidth + #BackgroundRemoteOnlyColor=true +@@ -496,8 +496,8 @@ GraphicalThemedColor=#76848F + # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for + # example) and more failsafe then those supplied by scripts so distros should + # use this rather then just running an xterm from a script. +-#ShowGnomeFailsafeSession=true +-#ShowXtermFailsafeSession=true ++ShowGnomeFailsafeSession=false ++ShowXtermFailsafeSession=false + # Normally there is a session type called 'Last' that is shown which refers to + # the last session the user used. If off, we will be in 'switchdesk' mode + # where the session saving stuff is disabled in GDM +@@ -516,7 +516,7 @@ GraphicalThemedColor=#76848F + # list then provide a list that is delimited by /: to the GraphicalThemes + # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme + # and specify just one theme. +-#GraphicalTheme=circles ++GraphicalTheme=FedoraInfinity + #GraphicalThemes=circles/:happygnome + GraphicalThemeDir=@datadir@/gdm/themes/ + GraphicalThemeRand=false +@@ -633,7 +633,7 @@ Gestures=false + + [server-Standard] + name=Standard server +-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ ++command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ + flexible=true + # Indicates that the X server should be started at a different process + # priority. Values can be any integer value accepted by the setpriority C diff --git a/gdm.spec b/gdm.spec index a531f28..487aa85 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.20.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -64,7 +64,7 @@ Patch42: gdm-2.20.0-allow-escape.patch # http://bugzilla.redhat.com/show_bug.cgi?id=246399 Patch43: gdm-2.20.1-keymouselistener-segfault.patch -Patch100: gdm-2.20.0-change-defaults.patch +Patch100: gdm-2.20.1-change-defaults.patch Patch101: stupid-bullets.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -365,6 +365,9 @@ fi %{_datadir}/pixmaps/faces/extras/*.jpg %changelog +* Fri Oct 26 2007 Ray Strode - 1:2.20.1-5 +- fix gdmflexiserver -n (bug 352491) + * Wed Oct 17 2007 Ray Strode - 1:2.20.1-4 - Improve Warren's fix (#246399)