X Strike Force XFree86 SVN commit: r1150 - in trunk/debian: . patches
Author: branden
Date: 2004-03-16 02:30:32 -0500 (Tue, 16 Mar 2004)
New Revision: 1150
Modified:
trunk/debian/changelog
trunk/debian/patches/905_debian_xdm.diff
Log:
Update examples and information in xdm's Xservers file to give sysadmins
more detailed and accurate advice, and to use XFree86 4.x's "-depth"
option in the examples instead of XFree86 3.x's "-bpp" option. Thanks to
Frank Murphy for pointing out how long in the tooth this information had
become. (Closes: #237878)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-15 17:36:32 UTC (rev 1149)
+++ trunk/debian/changelog 2004-03-16 07:30:32 UTC (rev 1150)
@@ -18,8 +18,15 @@
(Closes: #236388)
- debian/patches/075_elographics_improve_manpage.diff
- -- Branden Robinson <branden@debian.org> Mon, 8 Mar 2004 16:52:27 -0500
+ * Update examples and information in xdm's Xservers file to give sysadmins
+ more detailed and accurate advice, and to use XFree86 4.x's "-depth"
+ option in the examples instead of XFree86 3.x's "-bpp" option. Thanks to
+ Frank Murphy for pointing out how long in the tooth this information had
+ become. (Closes: #237878)
+ - debian/patches/905_debian_xdm.diff
+ -- Branden Robinson <branden@debian.org> Mon, 15 Mar 2004 13:29:17 -0500
+
xfree86 (4.3.0-5) unstable; urgency=medium
* Urgency due to fix for FTBFS on some architectures.
Modified: trunk/debian/patches/905_debian_xdm.diff
===================================================================
--- trunk/debian/patches/905_debian_xdm.diff 2004-03-15 17:36:32 UTC (rev 1149)
+++ trunk/debian/patches/905_debian_xdm.diff 2004-03-16 07:30:32 UTC (rev 1150)
@@ -12,8 +12,8 @@
* config/Xres.cpp: report OS name in greeter widget
* config/Xserv.ws.cpp:
- add comments to help local admins
- - run local server on default VT, with DPI setting forced to 100, and
- TCP listening turned off for security
+ - run local server with DPI setting forced to 100 and TCP listening
+ turned off for security
* config/Xsession: replace guts with simple call to Debian's Xsession
script
* config/xdm-conf.cpp:
@@ -89,26 +89,35 @@
xlogin*namePrompt: \040\040\040\040\040\040\040Login:
#endif /* XPM */
xlogin*fail: Login incorrect
-diff -urN xc/programs/xdm~/config/Xserv.ws.cpp xc/programs/xdm/config/Xserv.ws.cpp
---- xc/programs/xdm~/config/Xserv.ws.cpp 2001-01-17 18:45:24.000000000 -0500
-+++ xc/programs/xdm/config/Xserv.ws.cpp 2003-02-23 18:29:33.000000000 -0500
-@@ -10,4 +10,16 @@
+--- xc/programs/xdm/config/Xserv.ws.cpp~ 2004-03-16 02:14:09.000000000 -0500
++++ xc/programs/xdm/config/Xserv.ws.cpp 2004-03-16 02:14:39.000000000 -0500
+@@ -10,4 +10,26 @@
XCOMM look like:
XCOMM XTerminalName:0 foreign
XCOMM
-:0 local BINDIR/X DEFAULTVT
+XCOMM When adding X servers, please keep the following things in mind:
-+XCOMM - For each X server other than :0, the display number must be on the command
-+XCOMM line.
-+XCOMM - This is the place to add the -bpp option to the command line.
-+XCOMM - It is wise to add the vtXX option to each local X server, since this is
-+XCOMM the only sure way of knowing in advance which X server attaches to which
++XCOMM - If the X server's number is not zero, it must be passed to the X
++XCOMM server's command line as its first argument.
++XCOMM - When using the XFree86 X server, it is wise to add the vtXX
++XCOMM option to each local X server, since this is the only sure way
++XCOMM of knowing in advance which X server attaches to which virtual
+XCOMM console.
-+XCOMM - See the Xserver(1) manpage for a description of X server options.
++XCOMM - SECURITY NOTE: Always pass the "-nolisten tcp" option to the X
++XCOMM server, as shown in the examples below, unless you know you
++XCOMM need the X server listening on a TCP port. Omitting this
++XCOMM option can expose your X server to attacks from remote hosts.
++XCOMM Note also that SSH's X11 port-forwarding option works even with
++XCOMM X servers that do not listen on a TCP port, so you do not need
++XCOMM to remove the "-nolisten tcp" option for SSH's benefit.
++XCOMM - See the Xserver(1) manpage for a description of X server
++XCOMM options. If you are using the XFree86 X server, see the
++XCOMM XFree86(1) manpage for a description of options specific to it
++XCOMM (such as "-depth").
+XCOMM
+XCOMM Examples for multiple local X displays:
-+XCOMM :0 local BINDIR/X :0 vt9 -bpp 16
-+XCOMM :1 local BINDIR/X :1 vt10 -bpp 8
++XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp
++XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp
+:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp
diff -urN xc/programs/xdm~/config/Xsession xc/programs/xdm/config/Xsession
--- xc/programs/xdm~/config/Xsession 2001-01-17 18:45:24.000000000 -0500
Reply to: