components/x11/xdm/patches/05.bindir.patch

   1 ###############################################################################
   2 #
   3 # Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   4 #
   5 # Permission is hereby granted, free of charge, to any person obtaining a
   6 # copy of this software and associated documentation files (the "Software"),
   7 # to deal in the Software without restriction, including without limitation
   8 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   9 # and/or sell copies of the Software, and to permit persons to whom the
  10 # Software is furnished to do so, subject to the following conditions:
  11 #
  12 # The above copyright notice and this permission notice (including the next
  13 # paragraph) shall be included in all copies or substantial portions of the
  14 # Software.
  15 #
  16 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  17 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  18 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  19 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  20 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  21 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  22 # DEALINGS IN THE SOFTWARE.
  23 #
  24 ###############################################################################
  25
  26 Set paths used in config files for finding X utilities to look in /usr/bin
  27 even though --bindir is set to /usr/sbin
  28
  29 --- a/man/xdm.man       2020-09-21 21:25:02.287276245 -0700
  30 +++ b/man/xdm.man       2020-09-21 21:26:16.692785820 -0700
  31 @@ -415,7 +415,7 @@
  32  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
  33  Specifies the program used to load the resources.  By default,
  34  .I xdm
  35 -uses \fI BINDIR/xrdb\fP.
  36 +uses \fI /usr/bin/xrdb\fP.
  37  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
  38  This specifies a program which is run (as root) before offering the
  39  Login window.  This may be used to change the appearance of the screen
  40 @@ -431,7 +431,7 @@
  41  See the section \fBStartup Program.\fP
  42  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
  43  This specifies the session to be executed (not running as root).
  44 -By default, \fI BINDIR/xterm\fP is
  45 +By default, \fI /usr/bin/xterm\fP is
  46  run.  The conventional name is \fIXsession\fP.
  47  See the section
  48  .B "Session Program."
  49 @@ -516,7 +516,7 @@
  50  will fall back to this program.  This program is executed with no
  51  arguments, but executes using the same environment variables as
  52  the session would have had (see the section \fBSession Program\fP).
  53 -By default, \fI BINDIR/xterm\fP is used.
  54 +By default, \fI /usr/bin/xterm\fP is used.
  55  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
  56  .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
  57  To improve security,
  58 @@ -823,7 +823,7 @@
  59  be:
  60  .nf
  61
  62 - :0 Digital-QV local BINDIR/X :0
  63 + :0 Digital-QV local /usr/bin/X :0
  64
  65  .fi
  66  The display types are:
  67 @@ -836,8 +836,8 @@
  68  The display name must be something that can be passed in the \fB\-display\fP
  69  option to an X program.  This string is used to generate the display-specific
  70  resource names, so be careful to match the
  71 -names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
  72 -``localhost:0 Sun-CG3 local BINDIR/X :0''
  73 +names (e.g., use ``:0 Sun-CG3 local /usr/bin/X :0'' instead of
  74 +``localhost:0 Sun-CG3 local /usr/bin/X :0''
  75  if your other resources are specified as
  76  ``DisplayManager._0.session'').  The display class portion is also used in the
  77  display-specific resources, as the class of the resource.  This is
  78 @@ -1395,7 +1395,7 @@
  79  options or other suitable daemon by specifying the server on the command
  80  line:
  81  .nf
  82 -xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
  83 +xdm \-server \(lq:0 SUN-3/60CG4 local /usr/bin/X :0\(rq
  84  .fi
  85  .PP
  86  Or, you might have a file server and a collection of X terminals.  The
  87 @@ -1431,13 +1431,13 @@
  88  .I CHOOSERPATH
  89  the default chooser
  90  .TP 20
  91 -.I BINDIR/xrdb
  92 +.I /usr/bin/xrdb
  93  the default resource database loader
  94  .TP 20
  95 -.I BINDIR/X
  96 +.I /usr/bin/X
  97  the default server
  98  .TP 20
  99 -.I BINDIR/xterm
 100 +.I /usr/bin/xterm
 101  the default session program and failsafe client
 102  .TP 20
 103  .I XDMXAUTHDIR/A<display>\-<suffix>
 104 --- a/config/Makefile.am        2020-09-22 12:56:20.246070279 -0700
 105 +++ b/config/Makefile.am        2020-09-22 12:58:14.541214699 -0700
 106 @@ -65,7 +65,7 @@
 107  WTMP_SED_FLAGS  = -e 's|WTMP_FILE||' -e 's|WTMP_FLAG||'
 108  endif
 109
 110 -SED_FILES_FLAGS  = -e 's|BINDIR|$(bindir)|'
 111 +SED_FILES_FLAGS  = -e 's|BINDIR|/usr/bin|'
 112  SED_FILES_FLAGS += -e 's|DEFAULTVT|$(DEFAULTVT)|'
 113  SED_FILES_FLAGS += $(UTMP_SED_FLAGS) $(WTMP_SED_FLAGS)
 114  SED_FILES_FLAGS += -e 's|XDMDIR|$(XDMLIBDIR)|'