bindir.patch revision 851
###############################################################################
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, and/or sell copies of the Software, and to permit persons
# to whom the Software is furnished to do so, provided that the above
# copyright notice(s) and this permission notice appear in all copies of
# the Software and that both the above copyright notice(s) and this
# permission notice appear in supporting documentation.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
###############################################################################
Set paths used in config files for finding X utilities to look in /usr/bin
even though --bindir is set to /usr/sbin
diff -urp -x '*~' -x '*.orig' config/Makefile.am config/Makefile.am
--- config/Makefile.am 2009-09-17 19:24:37.000000000 -0700
+++ config/Makefile.am 2009-09-24 15:02:04.421431000 -0700
@@ -49,7 +49,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
#endif
-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
+CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
-DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
-DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
-DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
diff -urp -x '*~' -x '*.orig' config/Makefile.in config/Makefile.in
--- config/Makefile.in 2009-09-18 15:32:28.000000000 -0700
+++ config/Makefile.in 2009-09-24 15:02:04.431540000 -0700
@@ -340,7 +340,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
#if HAVE_MKTEMP_COMMAND
MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
#endif
-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
+CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
-DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
-DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
-DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
diff -urp -x '*~' -x '*.orig' xdm.man.cpp xdm.man.cpp
--- xdm.man.cpp 2009-09-17 19:24:37.000000000 -0700
+++ xdm.man.cpp 2009-09-24 15:02:04.446548000 -0700
@@ -413,7 +413,7 @@ See the sections \fBXDMCP Access Control
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
Specifies the program used to load the resources. By default,
.I xdm
-uses \fI BINDIR/xrdb\fP.
+uses \fI /usr/bin/xrdb\fP.
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
@@ -431,7 +431,7 @@ file used here is \fIXstartup\fP.
See the section \fBStartup Program.\fP
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
This specifies the session to be executed (not running as root).
-By default, \fI BINDIR/xterm\fP is
+By default, \fI /usr/bin/xterm\fP is
run. The conventional name is \fIXsession\fP.
See the section
.B "Session Program."
@@ -512,7 +512,7 @@ If the default session fails to execute,
will fall back to this program. This program is executed with no
arguments, but executes using the same environment variables as
the session would have had (see the section \fBSession Program\fP).
-By default, \fI BINDIR/xterm\fP is used.
+By default, \fI /usr/bin/xterm\fP is used.
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
.IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
To improve security,
@@ -816,7 +816,7 @@ line to start the server. A typical ent
be:
.nf
- :0 Digital-QV local BINDIR/X :0
+ :0 Digital-QV local /usr/bin/X :0
.fi
The display types are:
@@ -831,8 +831,8 @@ foreign remote display: \fIxdm\fP opens
The display name must be something that can be passed in the \fB\-display\fP
option to an X program. This string is used to generate the display-specific
resource names, so be careful to match the
-names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
-``localhost:0 Sun-CG3 local BINDIR/X :0''
+``localhost:0 Sun-CG3 local /usr/bin/X :0''
if your other resources are specified as
``DisplayManager._0.session''). The display class portion is also used in the
display-specific resources, as the class of the resource. This is
@@ -1374,7 +1374,7 @@ line:
.nf
.ta .5i
- xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
+ xdm \-server \(lq:0 SUN-3/60CG4 local /usr/bin/X :0\(rq
.fi
.PP
@@ -1414,13 +1414,13 @@ user authorization file where \fIxdm\fP
.I CHOOSERPATH
the default chooser
.TP 20
+.I /usr/bin/xrdb
the default resource database loader
.TP 20
-.I BINDIR/X
+.I /usr/bin/X
the default server
.TP 20
+.I /usr/bin/xterm
the default session program and failsafe client
.TP 20
.I XDMXAUTHDIR/A<display>\-<suffix>