Bug#779608: xvfb: cleanup on signal exits as well
For your convenience, full patch is attached. -- GPG: 4096R/1318EFAC5FBBDBCE git://github.com/infinity0/pubkeys.git --- /usr/bin/xvfb-run 2015-03-04 17:16:14.751938799 +0100 +++ /usr/bin/xvfb-run 2015-03-04 17:05:43.967955334 +0100 @@ -140,7 +140,7 @@ fi # tidy up after ourselves -trap clean_up EXIT +trap clean_up EXIT INT QUIT TERM # If the user did not specify an X authorization file to use, set up a temporary # directory to house one. @@ -180,7 +180,7 @@ # Start the command and save its exit status. set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 & wait $! RETVAL=$? set -e
Bug#779608: Acknowledgement (xvfb: cleanup on signal exits as well)
Correction, it should be 'wait "$!"' not 'wait' - the latter has different
semantics from what we want here.
X
On 03/03/15 09:31, Ximin Luo wrote:
> As a follow-up, this hunk is also required:
>
> cut here
> --- /usr/bin/xvfb-run 2015-03-03 09:25:05.88561 +0100
> +++ /usr/bin/xvfb-run 2015-03-03 02:19:40.543821712 +0100
> @@ -180,7 +180,7 @@
>
> # Start the command and save its exit status.
> set +e
> -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
> +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 & wait
> RETVAL=$?
> set -e
>
> cut here
>
> because (as per man bash(1)): "If bash is waiting for a command to complete
> and receives a signal for which a trap has been set, the trap will not be
> executed until the command completes. When bash is waiting for an
> asynchronous command via the wait builtin, the reception of a signal for
> which a trap has been set will cause the wait builtin to return immediately
> with an exit status greater than 128, immediately after which the trap is
> executed."
>
> The behaviour is the same as above for dash, as can be verified by sending
> signals to the following test script:
>
> cut here
> #!/bin/sh
> clean_up() {
> echo "got here"
> }
> trap clean_up EXIT INT TERM
> sleep 68 & wait
> cut here
>
> X
>
--
GPG: 4096R/1318EFAC5FBBDBCE
git://github.com/infinity0/pubkeys.git
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/54f72ef4.1040...@pwned.gg
xterm: Changes to 'debian-experimental'
INSTALL | 20
MANIFEST |2
Makefile.in |9
VTPrsTbl.c| 20
VTparse.h |7
aclocal.m4| 128 -
charproc.c| 100
configure | 4084 --
configure.in | 24
ctlseqs.ms| 38
ctlseqs.txt | 30
debian/changelog |7
debian/patches/902_windowops.diff |2
debian/patches/904_fontops.diff |4
fontutils.c | 63
input.c | 10
menu.c|6
minstall.in |5
misc.c| 29
package/debian/changelog |6
package/debian/copyright |2
package/freebsd/Makefile |2
package/xterm.spec|4
ptyx.h|7
screen.c | 20
trace.c |6
trace.h |8
util.c| 165 +
version.h |8
vttests/resize.pl |2
xterm.h | 19
xterm.log.html| 111 +
xterm.man | 140 +
xtermcfg.hin |6
34 files changed, 2974 insertions(+), 2120 deletions(-)
New commits:
commit 24795f683a85ce204db914e246c7d52aa0a2f7ca
Author: Sven Joachim
Date: Wed Mar 4 17:23:48 2015 +0100
Refresh Debian patches
diff --git a/debian/changelog b/debian/changelog
index 6b01d53..2e0cf88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xterm (315-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh Debian patches.
-- Sven Joachim Wed, 04 Mar 2015 17:09:50 +0100
diff --git a/debian/patches/902_windowops.diff
b/debian/patches/902_windowops.diff
index 630f116..f2cfe3e 100644
--- a/debian/patches/902_windowops.diff
+++ b/debian/patches/902_windowops.diff
@@ -4,7 +4,7 @@
--- a/xterm.man
+++ b/xterm.man
-@@ -2543,8 +2543,9 @@ This is a comma-separated list of names,
+@@ -2648,8 +2648,9 @@ This is a comma-separated list of names,
from \fIdtterm\fP the operation number).
The default value is
.RS
diff --git a/debian/patches/904_fontops.diff b/debian/patches/904_fontops.diff
index 4a0b58c..fbf732b 100644
--- a/debian/patches/904_fontops.diff
+++ b/debian/patches/904_fontops.diff
@@ -4,12 +4,12 @@
--- a/xterm.man
+++ b/xterm.man
-@@ -1814,7 +1814,7 @@ The default is \*(``true\*(''.
+@@ -1899,7 +1899,7 @@ The default is \*(``true\*(''.
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is \*(``true\*(''.
+The default is \*(``false\*(''.
- .TP 5
+ .TP 8
.B "allowPasteControls (\fPclass\fB AllowPasteControls)"
If true, allow control characters such as BEL and CAN to be pasted.
commit d31a080d05446990a78b59c19be409c6cb2c536b
Author: Sven Joachim
Date: Wed Mar 4 17:11:18 2015 +0100
New upstream release
diff --git a/debian/changelog b/debian/changelog
index b4940a7..6b01d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (315-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sven Joachim Wed, 04 Mar 2015 17:09:50 +0100
+
xterm (314-1) experimental; urgency=low
* New upstream release.
commit 281b51a36eb78b1c42f8c82f30b323d4cc15c72c
Author: Sven Joachim
Date: Wed Mar 4 17:00:29 2015 +0100
Imported Upstream version 315
diff --git a/INSTALL b/INSTALL
index ed0ff37..1b6def9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.154 2014/12/22 10:16:18 tom Exp $
+-- $XTermId: INSTALL,v 1.156 2015/02/11 10:17:08 tom Exp $
---
--- Copyright 1997-2013,2014 by Thomas E. Dickey
+-- Copyright 1997-2014,2015 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -392,6 +392,18 @@ The options (in alphabetic order):
appear to freeze. This workaround makes xterm ignore the strings,
and is compiled-in by default for Linux.
+ --enable-builtin-xpms allow broken Linux OSC-strings],
+
+ Compile-in X pixmap data for these icons:
+ filled-xterm
+ mini.xterm
+ xterm-color
+ xterm
+ at these sizes
+ 16x16
+ 32x32
+ 48x48
+
--enable-dabbrevenable dynamic-abbreviation support
Compile-in support for "dabbrev-expand()" action and related key
@@ -432,6 +444,10 @@ The options (in alphabetic order):
Compile-in code to support HP-style function keys.
+ --enable-initial-erase set
Bug#779754: weston: Transition to libsystemd
Source: weston
Version: 1.6.0-2
Severity: normal
User: pkg-systemd-maintain...@lists.alioth.debian.org
Usertags: libsystemd
Hi!
In systemd v209, released over a year ago, the various libsystemd-* libraries
(libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so,
libsystemd-id128.so) were merged into a single libsystemd.so library to reduce
code duplication and avoid cyclic dependencies [1].
Your package declares a build-dependency on either libsystemd-daemon-dev,
libsystemd-login-dev or libsystemd-journal-dev.
Please update your package so it can be built against libsystemd.
Updating the configure check / build system
===
If your package use pkg-config and autotools, a typical configure check
looks like:
PKG_CHECK_MODULES(FOO, libsystemd-login)
All you need to do, is change that to
PKG_CHECK_MODULES(FOO, libsystemd)
If there are checks for libsystemd-journal, libsystemd-login and
libsystemd-journal, you can merge that into a single check:
PKG_CHECK_MODULES(FOO, libsystemd-login)
PKG_CHECK_MODULES(BAR, libsystemd-daemon)
PKG_CHECK_MODULES(BAZ, libsystemd-journal)
=>
PKG_CHECK_MODULES(FOO, libsystemd)
BAR_{CFLAGS,LIBS} and BAZ_{CFLAGS,LIBS} need to be updated accordingly.
If you/upstream wants to support building against older versions of systemd,
you can update the configure check as follows:
PKG_CHECK_MODULES(FOO, libsystemd-login)
=>
PKG_CHECK_MODULES(FOO, libsystemd,, [PKG_CHECK_MODULES(FOO, libsystemd-login)])
See [2] as an example how to do that.
Updating Build-Depends
==
Please replace the Build-Depends on libsystemd-*-dev with libsystemd-dev [3].
I would recommend against adding alternative Build-Depends against the old
dev packages. This is not necessary, since libsystemd-dev is already provided
in jessie.
Backports
=
Debian jessie already ships with libsystemd-dev, so this change is safe
regarding backports.
Upstream
Please consider forwarding this upstream. In some cases upstream might already
have a fix for that
Thanks for considering.
Michael,
on behalf of the pkg-systemd team.
[1]
http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
[2]
http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=8f6317f88a3ca3f42cf72137bb033b4a020b7b82
[3]
http://anonscm.debian.org/cgit/pkg-utopia/network-manager.git/commit/?id=69b95405b07fc2a5833dfcbe18c9229706c2104e
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ytd8q-0002dj...@pluto.milchstrasse.xx
xterm: Changes to 'upstream-experimental'
INSTALL | 20 MANIFEST |2 Makefile.in |9 VTPrsTbl.c | 20 VTparse.h|7 aclocal.m4 | 128 + charproc.c | 100 - configure| 4084 +-- configure.in | 24 ctlseqs.ms | 38 ctlseqs.txt | 30 fontutils.c | 63 input.c | 10 menu.c |6 minstall.in |5 misc.c | 29 package/debian/changelog |6 package/debian/copyright |2 package/freebsd/Makefile |2 package/xterm.spec |4 ptyx.h |7 screen.c | 20 trace.c |6 trace.h |8 util.c | 165 + version.h|8 vttests/resize.pl|2 xterm.h | 19 xterm.log.html | 111 + xterm.man| 140 + xtermcfg.hin |6 31 files changed, 2964 insertions(+), 2117 deletions(-) New commits: commit 281b51a36eb78b1c42f8c82f30b323d4cc15c72c Author: Sven Joachim Date: Wed Mar 4 17:00:29 2015 +0100 Imported Upstream version 315 diff --git a/INSTALL b/INSTALL index ed0ff37..1b6def9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ --- $XTermId: INSTALL,v 1.154 2014/12/22 10:16:18 tom Exp $ +-- $XTermId: INSTALL,v 1.156 2015/02/11 10:17:08 tom Exp $ --- --- Copyright 1997-2013,2014 by Thomas E. Dickey +-- Copyright 1997-2014,2015 by Thomas E. Dickey -- -- All Rights Reserved -- @@ -392,6 +392,18 @@ The options (in alphabetic order): appear to freeze. This workaround makes xterm ignore the strings, and is compiled-in by default for Linux. + --enable-builtin-xpms allow broken Linux OSC-strings], + + Compile-in X pixmap data for these icons: + filled-xterm + mini.xterm + xterm-color + xterm + at these sizes + 16x16 + 32x32 + 48x48 + --enable-dabbrevenable dynamic-abbreviation support Compile-in support for "dabbrev-expand()" action and related key @@ -432,6 +444,10 @@ The options (in alphabetic order): Compile-in code to support HP-style function keys. + --enable-initial-erase set default ptyInitialErase resource (default: false) + + This sets the default resource value, which is shown in the manpage. + --enable-load-vt-fonts enable load-vt-fonts() action Compile-in code that allows user to define load different VT-font diff --git a/MANIFEST b/MANIFEST index e135d9e..c9694e3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-314, version xterm-314 +MANIFEST for xterm-315, version xterm-315 MANIFESTthis file 256colres.h resource-definitions for 256-color mode diff --git a/Makefile.in b/Makefile.in index f4198a8..5064a12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -## $XTermId: Makefile.in,v 1.233 2014/12/22 22:36:43 tom Exp $ +## $XTermId: Makefile.in,v 1.234 2015/02/12 09:31:30 tom Exp $ # - # this file is part of xterm # -# Copyright 1997-2013,2014 by Thomas E. Dickey +# Copyright 1997-2014,2015 by Thomas E. Dickey # # All Rights Reserved # @@ -507,13 +507,16 @@ distclean :: clean distclean \ docs-clean :: - -$(RM) *.ps *.pdf *.png man2html.tmp + -$(RM) *.ps *.pdf *.png -$(SHELL) -c 'for p in xterm resize uxterm koi8rxterm; \ do \ $(RM) $$p.html $$p.$(manext) $$p.txt; \ done' -$(RM) ctlseqs.html ctlseqs.$(manext) +distclean :: + -$(RM) man2html.tmp + realclean : distclean -$(RM) tags TAGS diff --git a/VTPrsTbl.c b/VTPrsTbl.c index 41e7901..f9868c4 100644 --- a/VTPrsTbl.c +++ b/VTPrsTbl.c @@ -1,7 +1,7 @@ -/* $XTermId: VTPrsTbl.c,v 1.79 2014/05/02 23:32:27 tom Exp $ */ +/* $XTermId: VTPrsTbl.c,v 1.81 2015/02/16 01:51:51 tom Exp $ */ /* - * Copyright 1999-2013,2014 by Thomas E. Dickey + * Copyright 1999-2014,2015 by Thomas E. Dickey * * All Rights Reserved * @@ -61,8 +61,14 @@ #endif #if !OPT_DEC_LOCATOR -#undef CASE_CSI_TICK_STATE -#define CASE_CSI_TICK_STATE CASE_CSI_IGNORE +#undef CASE_DECEFR +#define CASE_DECEFR CASE_CSI_IGNORE +#undef CASE_DECELR +#define CASE_DECELR CASE_CSI_IGNORE +#undef CASE_DECSLE +#define CASE_DECSLE CASE_CSI_IGNORE +#undef CASE_DECRQLP +#define CASE_DECRQLP CASE_CSI_IGNORE #endif #if !OPT_WIDE_CHARS @@ -454,7 +460,7 @@ CASE_CSI_EX_ST
