[src/netbsd-9]: src/external/mit/xorg/bin/xdm Pull up following revision(s) (...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d2e10d65aea
branches:  netbsd-9
changeset: 369731:7d2e10d65aea
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 29 16:20:45 2022 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1510):

        external/mit/xorg/bin/xdm/Makefile.xdm: revision 1.11
        external/mit/xorg/bin/xdm/Makefile: revision 1.18
        external/mit/xorg/bin/xdm/Makefile: revision 1.19

fix the man page generation, noted by uwe@

xdm: Include "sbin" directories (and games) in DEF_USER_PATH.
Upstream's configure.ac picks a DEF_USER_PATH on a per-OS basis.
Most of these include the "sbin" directories, with NetBSD being the
(only?) exception.

However, this is inconsistent with the way a typical login shell is
initialized (when using the default skeleton files).  To avoid user
confusion, harmonize DEF_USER_PATH with our other defaults and with
other OSes.

PR xsrc/54851

diffstat:

 external/mit/xorg/bin/xdm/Makefile     |  28 +++++++++++++++++-----------
 external/mit/xorg/bin/xdm/Makefile.xdm |   5 +++--
 2 files changed, 20 insertions(+), 13 deletions(-)

diffs (80 lines):

diff -r 8772c1300a97 -r 7d2e10d65aea external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Mon Aug 29 16:18:10 2022 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Mon Aug 29 16:20:45 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $
+#      $NetBSD: Makefile,v 1.17.2.1 2022/08/29 16:20:45 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -13,6 +13,9 @@
 CPPFLAGS+=     -DSTATIC_GREETER_LIB
 .endif
 
+DEF_USER_PATH= /sbin:/usr/sbin:/bin:/usr/bin:/usr/games:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:${X11BINDIR}
+DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}
+
 CPPFLAGS+=             -DRETSIGTYPE=void
 CPPFLAGS.auth.c+=      -DBSD44SOCKETS
 CPPFLAGS.socket.c+=    -DBSD44SOCKETS
@@ -22,8 +25,8 @@
        -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
        -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
        -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
-       -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \
-       -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \
+       -DDEF_USER_PATH=\"${DEF_USER_PATH}\" \
+       -DDEF_SYSTEM_PATH=\"${DEF_SYSTEM_PATH}\" \
        -DDEF_SYSTEM_SHELL=\"/bin/sh\" \
        -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
        -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
@@ -52,14 +55,17 @@
 .include "../../xorg-pkg-ver.mk"
 
 X11EXTRAMANDEFS+= \
-               -e 's,ARC4_RANDOM,1,' \
-               -e 's,BINDIR,$(X11BINDIR),' \
-               -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
-               -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \
-               -e 's,XDMDIR,$(XDMDIR),' \
-               -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
-               -e 's,XDMLOGDIR,$(XDMLOGDIR),' \
-               -e 's,XDMPIDDIR,$(XDMPIDDIR),'
+               -e 's,CHOOSERPATH,${XDMCHOOSERPATH},' \
+               -e 's,XDMLOGDIR,${XDMLOGDIR},' \
+               -e 's,XDMDIR,${XDMDIR},' \
+               -e 's,BINDIR,${X11BINDIR},' \
+               -e 's,XDMPIDDIR,${XDMPIDDIR},' \
+               -e 's,XDMXAUTHDIR,${XDMVARDIR},' \
+               -e 's,DEF_USER_PATH,${DEF_USER_PATH},' \
+               -e 's,DEF_SYSTEM_PATH,${DEF_SYSTEM_PATH},' \
+               -e 's,DEF_GREETER_LIB,${XDMGREETERLIB},' \
+               -e 's,DEV_RANDOM,${DEV_RANDOM},' \
+               -e 's,ARC4_RANDOM,1,'
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 8772c1300a97 -r 7d2e10d65aea external/mit/xorg/bin/xdm/Makefile.xdm
--- a/external/mit/xorg/bin/xdm/Makefile.xdm    Mon Aug 29 16:18:10 2022 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile.xdm    Mon Aug 29 16:20:45 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xdm,v 1.10 2019/03/06 12:40:23 nakayama Exp $
+#      $NetBSD: Makefile.xdm,v 1.10.2.1 2022/08/29 16:20:45 martin Exp $
 
 XDMVARDIR=     /var/db/xdm
 XDMDIR=                ${X11ETCDIR}/xdm
@@ -6,12 +6,13 @@
 XDMGREETERLIB= ${X11ROOTDIR}/lib/libXdmGreet.so
 XDMLOGDIR=     /var/log
 XDMPIDDIR=     /var/run
+DEV_RANDOM=    /dev/urandom
 
 CPPFLAGS+=     -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
                -DHASXDMAUTH ${X11FLAGS.CONNECTION} \
                -DBSD44SOCKETS \
                -DFRAGILE_DEV_MEM -DARC4_RANDOM \
-               -DDEV_RANDOM=\"dev/urandom\" \
+               -DDEV_RANDOM=\"${DEV_RANDOM}\" \
                -DXPM -DUSE_XFT \
                -DHAVE_GETIFADDRS \
                -DHAVE_MKSTEMP \