Sync from SUSE:ALP:Source:Standard:1.0 xvfb-run revision e2781ea7981dc907330491d9981256f5
This commit is contained in:
commit
63cf7ebbf5
|
|
@ -0,0 +1,23 @@
|
|||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- xvfb-run.sh 2014-05-30 01:03:57.862452101 +0200
|
||||
+++ xvfb-run.sh 2014-05-30 01:10:32.792647392 +0200
|
||||
@@ -151,7 +151,7 @@
|
||||
error "temporary directory $XVFB_RUN_TMPDIR already exists"
|
||||
exit 4
|
||||
fi
|
||||
- AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority)
|
||||
+ AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXXXX)
|
||||
fi
|
||||
|
||||
# Start Xvfb.
|
||||
Binary file not shown.
|
|
@ -0,0 +1,25 @@
|
|||
-------------------------------------------------------------------
|
||||
Wed Nov 30 18:03:44 CET 2022 - ro@suse.de
|
||||
|
||||
- actually gzip manpage to match the filename extension
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 11 13:57:41 UTC 2020 - Ralf Habacker <ralf.habacker@freenet.de>
|
||||
|
||||
- Add missing runtime dependencies to which and xauth (boo#1178672)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 18 15:13:53 UTC 2018 - kbabioch@suse.com
|
||||
|
||||
- Fixed broken URL for manpage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 5 18:09:56 UTC 2016 - toddrme2178@gmail.com
|
||||
|
||||
- Fix Group tag.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 29 22:14:19 UTC 2014 - mailaender@opensuse.org
|
||||
|
||||
- packaging for SUSE
|
||||
|
||||
|
|
@ -0,0 +1,187 @@
|
|||
#!/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: xvfb-run 2166 2005-01-27 07:54:19Z branden $
|
||||
# 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 640x480x8"
|
||||
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
|
||||
-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 +ae:f:hn:lp:s:w: \
|
||||
--long auto-servernum,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) ;;
|
||||
-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 ! which xauth >/dev/null; then
|
||||
error "xauth command not found"
|
||||
exit 3
|
||||
fi
|
||||
|
||||
# If the user did not specify an X authorization file to use, set up a temporary
|
||||
# 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)
|
||||
fi
|
||||
|
||||
# Start Xvfb.
|
||||
MCOOKIE=$(mcookie)
|
||||
XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \
|
||||
>"$ERRORFILE" 2>&1
|
||||
XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \
|
||||
2>&1 &
|
||||
XVFBPID=$!
|
||||
sleep "$STARTWAIT"
|
||||
|
||||
# Start the command and save its exit status.
|
||||
set +e
|
||||
DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
|
||||
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:
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
#
|
||||
# spec file for package xvfb-run
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: xvfb-run
|
||||
Version: 1.5.2
|
||||
Release: 0
|
||||
Summary: Script to run a virtualized X-Server
|
||||
License: GPL-2.0-only
|
||||
Group: System/X11/Utilities
|
||||
URL: https://packages.debian.org/de/sid/xvfb
|
||||
Source0: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
|
||||
Source1: https://manpages.debian.org/testing/xvfb/xvfb-run.1.en.gz#/xvfb-run.1.gz
|
||||
# PATCH-FIX-OPENSUSE https://bugzilla.redhat.com/show_bug.cgi?id=508739#c6
|
||||
Patch0: xvfb-run-mktemp.patch
|
||||
Requires: coreutils
|
||||
Requires: util-linux
|
||||
Requires: which
|
||||
Requires: xauth
|
||||
Requires: xorg-x11-server
|
||||
Requires: xorg-x11-xauth
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
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.
|
||||
|
||||
%prep
|
||||
cp %{SOURCE0} .
|
||||
%patch0 -p0
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
install -p -D %{_builddir}/xvfb-run.sh %{buildroot}%{_bindir}/xvfb-run
|
||||
chmod 755 %{buildroot}%{_bindir}/xvfb-run
|
||||
|
||||
mkdir -p %{buildroot}%{_mandir}/man1/
|
||||
cp %{SOURCE1} %{buildroot}%{_mandir}/man1/xvfb-run.1.gz
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/xvfb-run
|
||||
%{_mandir}/*/xvfb-run.1.gz
|
||||
|
||||
%changelog
|
||||
Loading…
Reference in New Issue