upgpkg: 21.1.1-4

version/21.1.1-4/0001_revert_dpi_calculation.patch

+diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
+index 0389945a7cf0e18545cbe101639b62cd01f1e276..d03382d263399bba67dc77f6525480f751674bcc 100644
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -55,6 +55,7 @@
+ #include "xf86Xinput.h"
+ #include "xf86InPriv.h"
+ #include "mivalidate.h"
++#include "xf86Crtc.h"
+ 
+ /* For xf86GetClocks */
+ #if defined(CSRG_BASED) || defined(__GNU__)
+@@ -851,8 +852,9 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
+ {
+     MessageType from = X_DEFAULT;
+     xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC);
+-    int ddcWidthmm, ddcHeightmm;
++    int probedWidthmm, probedHeightmm;
+     int widthErr, heightErr;
++    xf86OutputPtr compat = xf86CompatOutput(pScrn);
+ 
+     /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */
+     pScrn->widthmm = pScrn->monitor->widthmm;
+@@ -862,11 +864,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
+         /* DDC gives display size in mm for individual modes,
+          * but cm for monitor
+          */
+-        ddcWidthmm = DDC->features.hsize * 10;  /* 10mm in 1cm */
+-        ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
++        probedWidthmm = DDC->features.hsize * 10;  /* 10mm in 1cm */
++        probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
++    }
++    else if (compat && compat->mm_width > 0 && compat->mm_height > 0) {
++        probedWidthmm = compat->mm_width;
++        probedHeightmm = compat->mm_height;
+     }
+     else {
+-        ddcWidthmm = ddcHeightmm = 0;
++        probedWidthmm = probedHeightmm = 0;
+     }
+ 
+     if (monitorResolution > 0) {
+@@ -892,15 +898,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
+                    pScrn->widthmm, pScrn->heightmm);
+ 
+         /* Warn if config and probe disagree about display size */
+-        if (ddcWidthmm && ddcHeightmm) {
++        if (probedWidthmm && probedHeightmm) {
+             if (pScrn->widthmm > 0) {
+-                widthErr = abs(ddcWidthmm - pScrn->widthmm);
++                widthErr = abs(probedWidthmm - pScrn->widthmm);
+             }
+             else {
+                 widthErr = 0;
+             }
+             if (pScrn->heightmm > 0) {
+-                heightErr = abs(ddcHeightmm - pScrn->heightmm);
++                heightErr = abs(probedHeightmm - pScrn->heightmm);
+             }
+             else {
+                 heightErr = 0;
+@@ -909,17 +915,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
+                 /* Should include config file name for monitor here */
+                 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+                            "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
+-                           ddcWidthmm, ddcHeightmm, pScrn->widthmm,
++                           probedWidthmm, probedHeightmm, pScrn->widthmm,
+                            pScrn->heightmm);
+             }
+         }
+     }
+-    else if (ddcWidthmm && ddcHeightmm) {
++    else if (probedWidthmm && probedHeightmm) {
+         from = X_PROBED;
+         xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
+-                   ddcWidthmm, ddcHeightmm);
+-        pScrn->widthmm = ddcWidthmm;
+-        pScrn->heightmm = ddcHeightmm;
++                   probedWidthmm, probedHeightmm);
++        pScrn->widthmm = probedWidthmm;
++        pScrn->heightmm = probedHeightmm;
+         if (pScrn->widthmm > 0) {
+             pScrn->xDpi =
+                 (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index c6e89e66f690cd7e2a26a3d4b663f9f146cd84e0..202791774b31d6c349f27ed692c1b4ea7f1fdca4 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -3256,8 +3256,10 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon)
+     free(output->MonInfo);
+ 
+     output->MonInfo = edid_mon;
+-    output->mm_width = 0;
+-    output->mm_height = 0;
++    if (edid_mon) {
++        output->mm_width = 0;
++        output->mm_height = 0;
++    }
+ 
+     if (debug_modes) {
+         xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
+diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
+index 50cbd043edc8380a3307dfcd5dee9cb280a50ba9..d4651f4e856f9fbe8b87086405401e4c0989b409 100644
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -806,6 +806,12 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen)
+                 mmWidth = output->conf_monitor->mon_width;
+                 mmHeight = output->conf_monitor->mon_height;
+             }
++            else if (output &&
++                (output->mm_width > 0 &&
++                 output->mm_height > 0)) {
++                mmWidth = output->mm_width;
++                mmHeight = output->mm_height;
++            }
+             else {
+                 /*
+                  * Otherwise, just set the screen to DEFAULT_DPI

version/21.1.1-4/PKGBUILD

+# Obarun        : 66 init/supervisor
+# Maintainer    : Eric Vidal <eric@obarun.org>
+# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
+# Maintainer    : YianIris <yianiris At disroot Dot org>
+# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
+#----------------
+#--------------------------------------------------------------
+# DESCRIPTION ]
+
+pkgbase=xorg-server
+pkgver=21.1.1
+pkgrel=4
+
+pkgname=(
+    'xorg-server'
+    'xorg-server-xephyr'
+    'xorg-server-xvfb'
+    'xorg-server-xnest'
+    'xorg-server-common'
+    'xorg-server-devel'
+)
+
+url='https://xorg.freedesktop.org'
+
+track=releases/individual/xserver
+target=$pkgbase-$pkgver
+source=(
+    https://xorg.freedesktop.org/$track/$target.tar.xz{,.sig}
+    xvfb-run # with updates from FC master
+    xvfb-run.1
+    Xwrapper.config
+    0001_revert_dpi_calculation.patch
+)
+
+#----------------------
+# BUILD CONFIGURATION ]
+
+makedepends=(
+    'xorgproto'
+    'pixman'
+    'libx11'
+    'mesa'
+    'mesa-libgl'
+    'xtrans'
+    'libxkbfile'
+    'libxfont2'
+    'libpciaccess'
+    'libxv'
+    'libxcvt'
+    'libxmu'
+    'libxrender'
+    'libxi'
+    'libxaw'
+    'libxtst'
+    'libxres'
+    'xorg-xkbcomp'
+    'xorg-util-macros'
+    'xorg-font-util'
+    'libepoxy'
+    'xcb-util'
+    'xcb-util-image'
+    'xcb-util-renderutil'
+    'xcb-util-wm'
+    'xcb-util-keysyms'
+    'libxshmfence'
+    'libunwind'
+    'meson'
+)
+
+#------------------------
+# INSTALL CONFIGURATION ]
+
+groups=(
+    'xorg'
+)
+
+backup=(
+    'etc/X11/Xwrapper.config'
+)
+
+#--------------------
+# BUILD PREPARATION ]
+
+prepare() {
+    cd $pkgbase-$pkgver
+
+    ## revert dpi calculation that leads to unwanted miscalculation results
+    ## https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
+    ## https://bugs.archlinux.org/task/72661
+    patch -Rp1 -i ../0001_revert_dpi_calculation.patch
+}
+
+#----------------
+# BUILD CONTROL ]
+
+_flags=(
+    -Dipv6=true
+    -Dxvfb=true
+    -Dxnest=true
+    -Dxcsecurity=true
+    -Dxorg=true
+    -Dxephyr=true
+    -Dglamor=true
+    -Dudev=true
+    -Ddtrace=false
+    -Dsystemd_logind=false
+    -Dsuid_wrapper=true
+    -Dxkb_dir=/usr/share/X11/xkb
+    -Dxkb_output_dir=/var/lib/xkb
+)
+
+#--------
+# BUILD ]
+
+build() {
+    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+    ## With them, module fail to load with undefined symbol.
+    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+    export CFLAGS=${CFLAGS/-fno-plt}
+    export CXXFLAGS=${CXXFLAGS/-fno-plt}
+    export LDFLAGS=${LDFLAGS/,-z,now}
+
+    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
+
+    ## Print config
+    meson configure build
+    ninja -C build
+
+    ## fake installation to be seperated into packages
+    DESTDIR="$srcdir/fakeinstall" ninja -C build install
+}
+
+#----------
+# PACKAGE ]
+
+_install() {
+    local src f dir
+        for src; do
+            f="${src#fakeinstall/}"
+            dir="${pkgdir}/${f%/*}"
+            install -m755 -d "${dir}"
+            ## use copy so a new file is created and fakeroot
+            ## can track properties such as setuid.
+            cp -av "${src}" "${dir}/"
+            rm -rf "${src}"
+        done
+}
+
+package_xorg-server-common() {
+    pkgdesc='Xorg server common files'
+
+    depends=(
+        'xkeyboard-config'
+        'xorg-xkbcomp'
+        'xorg-setxkbmap'
+    )
+
+    _install fakeinstall/usr/lib/xorg/protocol.txt
+    _install fakeinstall/usr/share/man/man1/Xserver.1
+
+    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
+    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
+}
+
+package_xorg-server() {
+    pkgdesc="Xorg X server"
+
+    depends=(
+        'libepoxy'
+        'libxfont2'
+        'pixman'
+        'xorg-server-common'
+        'libunwind'
+        'dbus'
+        'libgl'
+        'xf86-input-libinput'
+        'nettle'
+        'libpciaccess'
+        'libdrm'
+        'libxshmfence'
+        'libxcvt'
+    )   ## FS#52949
+
+    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
+    ## we provide major numbers that drivers can depend on
+    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
+    provides=(
+        'X-ABI-VIDEODRV_VERSION=25.2'
+        'X-ABI-XINPUT_VERSION=24.4'
+        'X-ABI-EXTENSION_VERSION=10.0'
+        'x-server'
+    )
+    conflicts=(
+        'nvidia-utils<=331.20'
+        'glamor-egl'
+        'xf86-video-modesetting'
+    )
+    replaces=(
+        'glamor-egl'
+        'xf86-video-modesetting'
+    )
+
+    install=xorg-server.install
+
+    _install fakeinstall/usr/bin/{X,Xorg,gtf}
+    _install fakeinstall/usr/lib/Xorg{,.wrap}
+    _install fakeinstall/usr/lib/xorg/modules/*
+    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
+    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
+    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
+    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
+
+    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
+    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
+
+    ## Xwrapper.config
+    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
+
+    ## license
+    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
+}
+
+package_xorg-server-xephyr() {
+    pkgdesc="A nested X server that runs as an X application"
+
+    depends=(
+        'libxfont2'
+        'libgl'
+        'libepoxy'
+        'libunwind'
+        'libxv'
+        'pixman'
+        'xorg-server-common'
+        'xcb-util-image'
+        'xcb-util-renderutil'
+        'xcb-util-wm'
+        'xcb-util-keysyms'
+        'nettle'
+        'libtirpc'
+    )
+
+    _install fakeinstall/usr/bin/Xephyr
+    _install fakeinstall/usr/share/man/man1/Xephyr.1
+
+    ## license
+    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
+}
+
+package_xorg-server-xvfb() {
+    pkgdesc="Virtual framebuffer X server"
+
+    depends=(
+        'libxfont2'
+        'libunwind'
+        'pixman'
+        'xorg-server-common'
+        'xorg-xauth'
+        'libgl'
+        'nettle'
+        'libtirpc'
+    )
+
+    _install fakeinstall/usr/bin/Xvfb
+    _install fakeinstall/usr/share/man/man1/Xvfb.1
+
+    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
+    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
+
+    ## license
+    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
+}
+
+package_xorg-server-xnest() {
+    pkgdesc="A nested X server that runs as an X application"
+
+    depends=(
+        'libxfont2'
+        'libxext'
+        'pixman'
+        'xorg-server-common'
+        'nettle'
+        'libtirpc'
+    )
+
+    _install fakeinstall/usr/bin/Xnest
+    _install fakeinstall/usr/share/man/man1/Xnest.1
+
+    ## license
+    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
+}
+
+package_xorg-server-devel() {
+    pkgdesc="Development files for the X.Org X server"
+
+    depends=(
+        'xorgproto'
+        'mesa'
+        'libpciaccess'
+        'xorg-util-macros'
+    )   ## not technically required but almost every Xorg pkg needs it to build.
+
+    _install fakeinstall/usr/include/xorg/*
+    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
+    _install fakeinstall/usr/share/aclocal/xorg-server.m4
+
+    ## license
+    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
+
+    ## make sure there are no files left to install
+    find fakeinstall -depth -print0 | xargs -0 rmdir
+}
+
+#---------------------------
+# LICENSE AND VERIFICATION ]
+
+arch=(x86_64)
+license=(custom)
+
+validpgpkeys=(
+    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
+)
+
+sha512sums=(' ')

version/21.1.1-4/Xwrapper.config

+# /etc/X11/Xwrapper.config
+
+needs_root_rights = yes

version/21.1.1-4/xorg-server.install

+post_install() {
+
+    ## suid permission is not preserved during _install execution, fix it.
+    cat <<MSG
+>>> Applying 4755 mode to /usr/lib/Xorg.wrag
+MSG
+    chmod u+s /usr/lib/Xorg.wrap
+
+    cat <<MSG
+>>> Xorg-server has now the ability to run without root rights.
+    To be able to use this features, install the package:
+    xorg-server-rootless.
+
+$(tput setaf 3)>>> WARNING: $(tput sgr0)
+    The file /etc/X11/Xwrapper.config,
+    need to be present on your system containing this line :
+
+    needs_root_rights = yes
+
+    See xorg.wrap man page (man xorg.wrap) for futher informations.
+MSG
+}
+
+post_upgrade() {
+        post_install
+}

version/21.1.1-4/xvfb-run

+#!/bin/sh
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# T2 SDE: package/.../xorg-server/xvfb-run.sh
+# Copyright (C) 2005 The T2 SDE Project
+# Copyright (C) XXXX - 2005 Debian
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+# $Id$
+# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
+
+# This script starts an instance of Xvfb, the "fake" X server, runs a command
+# with that server available, and kills the X server when done.  The return
+# value of the command becomes the return value of this script.
+#
+# If anyone is using this to build a Debian package, make sure the package
+# Build-Depends on xvfb, xbase-clients, and xfonts-base.
+
+set -e
+
+PROGNAME=xvfb-run
+SERVERNUM=99
+AUTHFILE=
+ERRORFILE=/dev/null
+STARTWAIT=3
+XVFBARGS="-screen 0 640x480x24"
+LISTENTCP="-nolisten tcp"
+XAUTHPROTO=.
+
+# Query the terminal to establish a default number of columns to use for
+# displaying messages to the user.  This is used only as a fallback in the event
+# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
+# script is running, and this cannot, only being calculated once.)
+DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
+if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
+    DEFCOLUMNS=80
+fi
+
+# Display a message, wrapping lines at the terminal width.
+message () {
+    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
+}
+
+# Display an error message.
+error () {
+    message "error: $*" >&2
+}
+
+# Display a usage message.
+usage () {
+    if [ -n "$*" ]; then
+        message "usage error: $*"
+    fi
+    cat <<EOF
+Usage: $PROGNAME [OPTION ...] COMMAND
+Run COMMAND (usually an X client) in a virtual X server environment.
+Options:
+-a        --auto-servernum          try to get a free server number, starting at
+                                    --server-num (deprecated, use --auto-display
+                                    instead)
+-d        --auto-display            use the X server to find a display number
+                                    automatically
+-e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
+                                    output (default: $ERRORFILE)
+-f FILE   --auth-file=FILE          file used to store auth cookie
+                                    (default: ./.Xauthority)
+-h        --help                    display this usage message and exit
+-n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
+-l        --listen-tcp              enable TCP port listening in the X server
+-p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
+                                    (default: xauth command's default)
+-s ARGS   --server-args=ARGS        arguments (other than server number and
+                                    "-nolisten tcp") to pass to the Xvfb server
+                                    (default: "$XVFBARGS")
+-w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
+                                    before running COMMAND (default: $STARTWAIT)
+EOF
+}
+
+# Find a free server number by looking at .X*-lock files in /tmp.
+find_free_servernum() {
+    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
+    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+    # anyway.
+    #local i
+
+    i=$SERVERNUM
+    while [ -f /tmp/.X$i-lock ]; do
+        i=$(($i + 1))
+    done
+    echo $i
+}
+
+# Parse the command line.
+ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
+       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+       --name "$PROGNAME" -- "$@")
+GETOPT_STATUS=$?
+
+if [ $GETOPT_STATUS -ne 0 ]; then
+    error "internal error; getopt exited with status $GETOPT_STATUS"
+    exit 6
+fi
+
+eval set -- "$ARGS"
+
+while :; do
+    case "$1" in
+        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
+        -d|--auto-display) AUTO_DISPLAY=1 ;;
+        -e|--error-file) ERRORFILE="$2"; shift ;;
+        -f|--auth-file) AUTHFILE="$2"; shift ;;
+        -h|--help) SHOWHELP="yes" ;;
+        -n|--server-num) SERVERNUM="$2"; shift ;;
+        -l|--listen-tcp) LISTENTCP="" ;;
+        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
+        -s|--server-args) XVFBARGS="$2"; shift ;;
+        -w|--wait) STARTWAIT="$2"; shift ;;
+        --) shift; break ;;
+        *) error "internal error; getopt permitted \"$1\" unexpectedly"
+           exit 6
+           ;;
+    esac
+    shift
+done
+
+if [ "$SHOWHELP" ]; then
+    usage
+    exit 0
+fi
+
+if [ -z "$*" ]; then
+    usage "need a command to run" >&2
+    exit 2
+fi
+
+if ! type xauth >/dev/null; then
+    error "xauth command not found"
+    exit 3
+fi
+
+# Set up the temp dir for the pid and X authorization file
+XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
+# If the user did not specify an X authorization file to use, set up a temporary
+# directory to house one.
+if [ -z "$AUTHFILE" ]; then
+    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
+fi
+
+# Start Xvfb.
+MCOOKIE=$(mcookie)
+
+if [ -z "$AUTO_DISPLAY" ]; then
+  # Old style using a pre-computed SERVERNUM
+  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
+  2>&1 &
+  XVFBPID=$!
+else
+  # New style using Xvfb to provide a free display
+  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
+  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
+  2>"$ERRORFILE" & echo $! > $PIDFILE)
+  XVFBPID=$(cat $PIDFILE)
+fi
+sleep "$STARTWAIT"
+
+XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
+add :$SERVERNUM $XAUTHPROTO $MCOOKIE
+EOF
+
+# Start the command and save its exit status.
+set +e
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
+RETVAL=$?
+set -e
+
+# Kill Xvfb now that the command has exited.
+kill $XVFBPID
+
+# Clean up.
+XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
+if [ -n "$XVFB_RUN_TMPDIR" ]; then
+    if ! rm -r "$XVFB_RUN_TMPDIR"; then
+        error "problem while cleaning up temporary directory"
+        exit 5
+    fi
+fi
+
+# Return the executed command's exit status.
+exit $RETVAL
+
+# vim:set ai et sts=4 sw=4 tw=80:

version/21.1.1-4/xvfb-run.1

+.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
+.\"
+.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2,
+.\" or (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License with
+.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
+.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
+.\" Suite 330, Boston, MA 02111-1307 USA
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it.  So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
+.SH NAME
+xvfb\-run \- run specified X client or command in a virtual X server environment
+.SH SYNOPSIS
+.B xvfb\-run
+[
+.I options
+]
+.I command
+.SH DESCRIPTION
+.B xvfb\-run
+is a wrapper for the
+.BR Xvfb (1x)
+command which simplifies the task of running commands (typically an X
+client, or a script containing a list of clients to be run) within a virtual
+X server environment.
+.PP
+.B xvfb\-run
+sets up an X authority file (or uses an existing user\-specified one),
+writes a cookie to it (see
+.BR xauth (1x))
+and then starts the
+.B Xvfb
+X server as a background process.
+The process ID of
+.B Xvfb
+is stored for later use.
+The specified
+.I command
+is then run using the X display corresponding to the
+.B Xvfb
+server
+just started and the X authority file created earlier.
+.PP
+When the
+.I command
+exits, its status is saved, the
+.B Xvfb
+server is killed (using the process ID stored earlier), the X authority
+cookie removed, and the authority file deleted (if the user did not specify
+one to use).
+.B xvfb\-run
+then exits with the exit status of
+.IR command .
+.PP
+.B xvfb\-run
+requires the
+.B xauth
+command to function.
+.SH OPTIONS
+.TP
+.B \-a\fR,\fB \-\-auto\-servernum
+Try to get a free server number, starting at 99, or the argument to
+.BR \-\-server\-num .
+.TP
+.BI \-e\  file \fR,\fB\ \-\-error\-file= file
+Store output from
+.B xauth
+and
+.B Xvfb
+in
+.IR file .
+The default is
+.IR /dev/null .
+.TP
+.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
+Store X authentication data in
+.IR file .
+By default, a temporary directory called
+.IR xvfb\-run. PID
+(where PID is the process ID of
+.B xvfb\-run
+itself) is created in the directory specified by the environment variable
+.B TMPDIR
+(or
+.I /tmp
+if that variable is null or unset), and the
+.BR tempfile (1)
+command is used to create a file in that temporary directory called
+.IR Xauthority .
+.TP
+.B \-h\fR,\fB \-\-help
+Display a usage message and exit.
+.TP
+.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
+Use
+.I servernumber
+as the server number (but see the
+.B \-a\fR,\fB \-\-auto\-servernum
+option above).
+The default is 99.
+.TP
+.B \-l\fR,\fB \-\-listen\-tcp
+Enable TCP port listening in the X server.
+For security reasons (to avoid denial\-of\-service attacks or exploits),
+TCP port listening is disabled by default.
+.TP
+.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
+Use
+.I protocolname
+as the X authority protocol to use.
+The default is \(oq.\(cq, which
+.B xauth
+interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
+.TP
+.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
+Pass
+.I arguments
+to the
+.B Xvfb
+server.
+Be careful to quote any whitespace characters that may occur within
+.I arguments
+to prevent them from regarded as separators for
+.BR xvfb\-run 's
+own arguments.
+Also, note that specification of \(oq\-nolisten tcp\(cq in
+.I arguments
+may override the function of
+.BR xvfb\-run 's
+own
+.B \-l\fR,\fB \-\-listen\-tcp
+option, and that specification of the server number (e.g., \(oq:1\(cq) may
+be ignored because of the way the X server parses its argument list.
+Use the
+.B xvfb\-run
+option
+.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
+to achieve the latter function.
+The default is \(oq\-screen 0 640x480x8\(cq.
+.TP
+.BI \-w\  delay \fR,\fB\ \-\-wait= delay
+Wait
+.I delay
+seconds after launching
+.B Xvfb
+before attempting to start the specified command.
+The default is 3.
+.SH ENVIRONMENT
+.TP
+.B COLUMNS
+indicates the width of the terminal device in character cells.
+This value is used for formatting diagnostic messages.
+If not set, the terminal is queried using
+.BR stty (1)
+to determine its width.
+If that fails, a value of \(oq80\(cq is assumed.
+.TP
+.B TMPDIR
+specifies the directory in which to place
+.BR xvfb\-run 's
+temporary directory for storage of the X authority file; only used if the
+.B \-f
+or
+.B \-\-auth\-file
+options are not specified.
+.SH "OUTPUT FILES"
+.PP
+Unless the
+.B \-f
+or
+.B \-\-auth\-file
+options are specified, a temporary
+directory and file within it are created (and deleted) to store the X
+authority cookies used by the
+.B Xvfb
+server and client(s) run under it.
+See
+.BR tempfile (1).
+If \-f or \-\-auth\-file are used, then the specified X authority file is
+only written to, not created or deleted (though
+.B xauth
+creates an authority file itself if told to use use that does not already
+exist).
+.PP
+An error file with a user\-specified name is also created if the
+.B \-e
+or
+.B \-\-error\-file
+options are specifed; see above.
+.SH "EXIT STATUS"
+.B xvfb\-run
+uses its exit status as well as output to standard error to communicate
+diagnostics.
+The exit status of \(oq1\(cq is not used, and should be interpreted as failure
+of the specified command.
+.TP
+0
+.B xvfb\-run
+only uses this exit status if the
+.B \-h\fR,\fB \-\-help
+option is given.
+In all other situations, this may be interpreted as success of the specified
+command.
+.TP
+2
+No command to run was specified.
+.TP
+3
+The
+.B xauth
+command is not available.
+.TP
+4
+The temporary directory that was going to be used already exists; since
+.B xvfb\-run
+produces a uniquely named directory, this may indicate an attempt by another
+process on the system to exploit a temporary file race condition.
+.TP
+5
+A problem was encountered while cleaning up the temporary directory.
+.TP
+6
+A problem was encountered while using
+.BR getopt (1)
+to parse the command\-line arguments.
+.SH EXAMPLES
+.TP
+.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
+runs the
+.BR xlogo (1x)
+demonstration client inside the
+.B Xvfb
+X server on the first available server number greater than or equal to 1.
+.TP
+.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
+runs the
+.BR ico (1x)
+demonstration client (and passes it the
+.B \-faces
+argument) inside the
+.B Xvfb
+X server, configured with a root window of 1024 by 768 pixels and a color
+depth of 24 bits.
+.PP
+Note that the demo X clients used in the above examples will not exit on
+their own, so they will have to be killed before
+.B xvfb\-run
+will exit.
+.SH BUGS
+See
+.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
+If you wish to report a bug in
+.BR xvfb\-run ,
+please use the 
+.BR reportbug (1)
+command.
+.SH AUTHOR
+.B xfvb\-run
+was written by Branden Robinson and Jeff Licquia with sponsorship from
+Progeny Linux Systems.
+.SH "SEE ALSO"
+.BR Xvfb (1x),
+.BR xauth (1x)
+.\" vim:set et tw=80: