diff -U2 -r /data/temp/rhel-reviews/xorg-x11-server-1.13.99.901-4.20130109.fc19/xorg-x11-server/upstream-unpacked/Source20/xvfb-run.sh /data/temp/rhel-reviews/xorg-x11-server-1.13.99.901-4.20130109.fc19/xorg-x11-server/srpm-unpacked/xvfb-run.sh-extract/xvfb-run.sh --- /data/temp/rhel-reviews/xorg-x11-server-1.13.99.901-4.20130109.fc19/xorg-x11-server/upstream-unpacked/Source20/xvfb-run.sh 2013-01-29 19:53:57.922338128 +0100 +++ /data/temp/rhel-reviews/xorg-x11-server-1.13.99.901-4.20130109.fc19/xorg-x11-server/srpm-unpacked/xvfb-run.sh-extract/xvfb-run.sh 2013-01-29 19:53:57.947338047 +0100 @@ -15,5 +15,5 @@ # --- T2-COPYRIGHT-NOTE-END --- -# $Id: xvfb-run 2166 2005-01-27 07:54:19Z branden $ +# $Id$ # from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run @@ -147,17 +147,15 @@ # directory to house one. if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="${TMPDIR:-/tmp}/$PROGNAME.$$" - if ! mkdir -p -m 700 "$XVFB_RUN_TMPDIR"; then - error "temporary directory $XVFB_RUN_TMPDIR already exists" - exit 4 - fi - AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority) + XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)" + AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX) fi # Start Xvfb. MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \ - >"$ERRORFILE" 2>&1 -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \ + +XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 +add :$SERVERNUM $XAUTHPROTO $MCOOKIE +EOF +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ 2>&1 & XVFBPID=$!