summaryrefslogtreecommitdiff
path: root/x11/gdm/files/patch-ab
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-11-26 16:22:25 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-11-26 16:22:25 +0000
commit63906fdc28ccbe930aebc225887aeb410878bb17 (patch)
tree0f7806df278ccc0c4f22ce7f3e29d272e574678f /x11/gdm/files/patch-ab
parentFix missed the lib version bump on the packaging list when the port (diff)
Update to 2.2.5.2.
Notes
Notes: svn path=/head/; revision=50575
Diffstat (limited to 'x11/gdm/files/patch-ab')
-rw-r--r--x11/gdm/files/patch-ab28
1 files changed, 14 insertions, 14 deletions
diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab
index 17c3e8c3aa16..6a18c1cae12b 100644
--- a/x11/gdm/files/patch-ab
+++ b/x11/gdm/files/patch-ab
@@ -1,10 +1,10 @@
$FreeBSD$
---- config/gdm.conf.in.orig Sat Sep 1 13:03:45 2001
-+++ config/gdm.conf.in Tue Oct 2 15:10:39 2001
-@@ -3,7 +3,7 @@
- AutomaticLogin=
+--- config/gdm.conf.in.orig Fri Nov 16 13:42:13 2001
++++ config/gdm.conf.in Mon Nov 26 17:53:18 2001
+@@ -5,7 +5,7 @@
+ # want gdm to kill/restart the server, turn this on
AlwaysRestartServer=false
Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
@@ -12,7 +12,7 @@ $FreeBSD$
Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
Group=gdm
HaltCommand=/sbin/shutdown -h now
KillInitClients=true
@@ -21,16 +21,16 @@ $FreeBSD$
PidFile=/var/run/gdm.pid
PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -19,7 +19,7 @@
+@@ -22,7 +22,7 @@
+ FailsafeXServer=
XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- XKeepsCrashingConfigurators=/usr/bin/X11/XF86Setup /usr/bin/X11/Xconfigurator
RebootCommand=/sbin/shutdown -r now
-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
ServAuthDir=@EXPANDED_AUTHDIR@
SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
SuspendCommand=
-@@ -30,9 +30,9 @@
+@@ -33,9 +33,9 @@
TimedLoginEnable=false
TimedLogin=
TimedLoginDelay=30
@@ -41,8 +41,8 @@ $FreeBSD$
+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
[security]
- AllowRoot=true
-@@ -57,7 +57,7 @@
+ # If any distributions ship with this one off, they should be shot
+@@ -68,7 +68,7 @@
Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
[gui]
@@ -51,10 +51,10 @@ $FreeBSD$
MaxIconWidth=128
MaxIconHeight=128
-@@ -68,11 +68,11 @@
- DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+@@ -80,11 +80,11 @@
DefaultLocale=en_US
- Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm
+ # These are things excluded from the face browser, not from logging in
+ Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
GlobalFaceDir=@EXPANDED_DATADIR@/faces/
@@ -65,7 +65,7 @@ $FreeBSD$
Quiver=true
SystemMenu=true
Welcome=Welcome to %n
-@@ -117,5 +117,5 @@
+@@ -137,5 +137,5 @@
[server-Standard]
name=Standard server