xorg-server: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog      |    4 ++++
 debian/local/xvfb-run |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 933141fd71075872d60cd0679ddcca5fb8b363ea
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Apr 16 21:50:04 2012 +0200

    xvfb-run: fix xauth handling
    
    setting XAUTHORITY when starting an X server isn't actually useful, we
    need to use the -auth command-line parameter instead.  Somehow this
    seems to have been broken all these years and nobody noticed...

diff --git a/debian/changelog b/debian/changelog
index 529f717..f643551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xorg-server (2:1.11.4-2) UNRELEASED; urgency=low
     to come up (and waiting 2.9 seconds too many in the general case), tell it
     to send us SIGUSR1 when it's ready to accept connections.  This reduces
     "xvfb-run -- xterm -e true" from ~3.2s to ~0.4s on a quick test.
+  * xvfb-run: fix xauth handling; setting XAUTHORITY when starting an X server
+    isn't actually useful, we need to use the -auth command-line parameter
+    instead.  Somehow this seems to have been broken all these years and
+    nobody noticed...
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 19 Mar 2012 21:16:07 +0100
 
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 3bcdbeb..e7920e7 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -161,7 +161,7 @@ EOF
     # handle SIGUSR1 so Xvfb knows to send a signal when it's ready to accept
     # connections
     trap : USR1
-    (trap '' USR1; XAUTHORITY=$AUTHFILE exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" 2>&1) &
+    (trap '' USR1; exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP -auth $AUTHFILE >>"$ERRORFILE" 2>&1) &
     XVFBPID=$!
 
     wait || :

commit 1634bc20b0d3d390fe3675f766e13dce6ce6a75d
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Apr 16 21:48:12 2012 +0200

    xvfb-run: send kill output to $ERRORFILE

diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 445dd48..3bcdbeb 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -88,7 +88,7 @@ clean_up() {
         fi
     fi
     if [ -n "$XVFBPID" ]; then
-        kill "$XVFBPID"
+        kill "$XVFBPID" >>"$ERRORFILE" 2>&1
     fi
 }