xserver: Branch 'server-21.1-branch' - 5 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Jun 15 18:20:02 UTC 2025 

 hw/xfree86/man/xorg.conf.man |    6 ++++++
 hw/xwin/man/XWin.man         |    4 ++--
 man/Xserver.man              |   15 +++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 2b287847622b0391c707d009e04205f889426516
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 15:06:23 2025 -0700

    XWin.man: fix typos in font change escapes
    
    Fixes warnings from `mandoc -T lint`:
    
    mandoc: XWin.man:332:28: WARNING: invalid escape sequence: \fp
    mandoc: XWin.man:397:1: WARNING: invalid escape sequence: \fX
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit 286578e83ed6519fb654547b70b6d9d58708f095)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2018>

diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index 8d4af41db..331da8a5f 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -326,7 +326,7 @@ values will yield a still more detailed debug output.
 .TP 8
 .B "\-xkbrules \fIrule\fP"
 .TP 8
-.B "\-xkbvariant \fIvariant\fp"
+.B "\-xkbvariant \fIvariant\fP"
 These options configure the xkeyboard extension to load
 a particular keyboard map as the X server starts.  The behavior is similar
 to the \fIsetxkbmap\fP(1) program.
@@ -385,7 +385,7 @@ window, in both the generic case and for particular programs.
 \fIXWin -multiwindow\fP produces for each top-level X-window.
 .br
 * To change the style that is associated to the \fIWindows\fP window that
-\fXWin I-multiwindow\fP produces for each top-level X window.
+\fIXWin -multiwindow\fP produces for each top-level X window.
 .PP
 The format of the \fI.XWinrc\fP file is given in the XWinrc(5) manual page.
 
commit 4430e87d09c07cab3be4074653c520871fcb63d6
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 14 18:41:33 2025 -0700

    Xserver.man: correct list of available authorization protocols
    
    XDM-AUTHORIZATION-2 (IPv6 capable version of -1) was never merged.
    MIT-KERBEROS-5 was removed by commit dfbe32b5b in 2007
    
    Fixes: dfbe32b5b ("Remove the old Kerberos 5 authentication code.")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit 845c4ae5187f959fe042129e7c62210535f94290
     minus the removal of SUN-DES-1, which is still present in the 21.1-branch)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2018>

diff --git a/man/Xserver.man b/man/Xserver.man
index b87cf87dc..2415c16c7 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -443,7 +443,7 @@ specify which transport type clients should try to use.
 .SH GRANTING ACCESS
 The X server implements a platform-dependent subset of the following
 authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,
-XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the
+SUN-DES-1, Host Access, and Server Interpreted. See the
 \fIXsecurity\fP(@miscmansuffix@) manual page for information on the
 operation of these protocols.
 .PP
commit 30c3dac8a0ddf2f7cfbd4d0d887910f73763643b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 14 15:56:34 2025 -0700

    Xserver.man: add Xwayland(1) to list of server-specific man pages
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit 80ad8a2c6d6e5d2d1861ce71d3b5dc5df15ea96a)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2018>

diff --git a/man/Xserver.man b/man/Xserver.man
index 3de235942..b87cf87dc 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -606,7 +606,7 @@ Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
 \fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)
 .PP
 Server-specific man pages:
-\fIXorg\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
+\fIXorg\fP(1), \fIXwayland\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
 \fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
 .PP
 Server internal documentation:
commit 7d8608ff0596d26d441f0ca8f7b71587c1ee77cd
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 29 13:27:33 2025 -0700

    Xserver.man: remove X FireWall Proxy (xfwp) info
    
    xfwp has not been maintained in many years, with ssh X11-Forwarding
    preferred instead.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit b4b6b19c9a834df980e9209f1c44318fd67f3e8a)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2018>

diff --git a/man/Xserver.man b/man/Xserver.man
index d6e18ffdd..3de235942 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -482,15 +482,6 @@ local:
 Users can add or remove hosts from this list and enable or disable access
 control using the \fIxhost\fP command from the same machine as the server.
 .PP
-If the X FireWall Proxy (\fIxfwp\fP) is being used without a sitepolicy,
-host-based authorization must be turned on for clients to be able to
-connect to the X server via the \fIxfwp\fP.  If \fIxfwp\fP is run without
-a configuration file and thus no sitepolicy is defined, if \fIxfwp\fP
-is using an X server where xhost + has been run to turn off host-based
-authorization checks, when a client tries to connect to this X server
-via \fIxfwp\fP, the X server will deny the connection.  See \fIxfwp\fP(1)
-for more information about this proxy.
-.PP
 The X protocol intrinsically does not have any notion of window operation
 permissions or place any restrictions on what a client can do; if a program can
 connect to a display, it has full run of the screen.
@@ -606,7 +597,7 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 Keyboards: \fIxkeyboard-config\fP(@miscmansuffix@)
 .PP
 Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
-\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
+\fIxdm\fP(1), \fIxhost\fP(1)
 .I "Security Extension Specification"
 .PP
 Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
commit c0f6ef9f078de90a904c12c877511a0263d7930e
Author: Tanguy Ortolo <tanguy+debian at ortolo.eu>
Date:   Tue Jul 29 13:32:07 2014 +0200

    xorg.conf.man: Complete the xorg.conf.5 manpage with Option "Disable"
    
    The xorg.conf.5 manpage mentions an "Enable" option to enable a monitor
    regardless of whether or not it is connected, but gives no indication of how
    to disable it. This patch corrects that by documenting the "Disable" option.
    
    Orignally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755809
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit e4d2de81980666757580366e597455f5d2d43889)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2018>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index ed125b3ee..10ff3caaa 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1864,6 +1864,12 @@ at startup.  By default, the server will attempt to enable all connected
 monitors.
 (RandR 1.2-supporting drivers only)
 .TP 7
+.BI "Option \*qDisable\*q \*q" bool \*q
+This optional entry specifies whether the monitor should be turned off
+at startup.  By default, the server will attempt to enable all connected
+monitors.
+(RandR 1.2-supporting drivers only)
+.TP 7
 .BI "Option \*qDefaultModes\*q \*q" bool \*q
 This optional entry specifies whether the server should add supported default
 modes to the list of modes offered on this monitor. By default, the server

More information about the xorg-commit mailing list