xterm: Changes to 'pristine-tar'
xterm_327.orig.tar.gz.delta |binary xterm_327.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) New commits: commit 56e108b8c82bb634ea7065e00caa2bd76393fadc Author: Sven Joachim Date: Sat Oct 8 08:40:14 2016 +0200 pristine-tar data for xterm_327.orig.tar.gz diff --git a/xterm_327.orig.tar.gz.delta b/xterm_327.orig.tar.gz.delta new file mode 100644 index 000..499ad98 Binary files /dev/null and b/xterm_327.orig.tar.gz.delta differ diff --git a/xterm_327.orig.tar.gz.id b/xterm_327.orig.tar.gz.id new file mode 100644 index 000..c16b252 --- /dev/null +++ b/xterm_327.orig.tar.gz.id @@ -0,0 +1 @@ +3e5dd93a31e8efb4dd12875e6b0de3e9c5fb8229
xterm: Changes to 'upstream-unstable'
Imakefile| 20 +++-
MANIFEST |2
Makefile.in | 26 --
NEWS | 22 +
Tekparse.h | 90 +
VTparse.h| 200 ---
charproc.c | 17 ++-
ctlseqs.ms |8 -
ctlseqs.txt |6 -
main.c | 169 +++
misc.c |8 -
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4
ptyx.h |9 +-
trace.c | 42 +
trace.h |4
util.c |8 -
version.h|6 -
xterm.log.html | 36
xterm.man|8 +
21 files changed, 374 insertions(+), 319 deletions(-)
New commits:
commit 1a027e1ec651c4298f19f92a8fdef55225e4049c
Author: Sven Joachim
Date: Sat Oct 8 08:40:13 2016 +0200
Imported Upstream version 327
diff --git a/Imakefile b/Imakefile
index bbe389a..daf250e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
+XCOMM $XTermId: Imakefile,v 1.113 2016/10/06 00:56:32 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -244,11 +244,21 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
AllTarget($(PROGRAMS))
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
+.SUFFIXES : .def .hin
+.def.hin :
+ awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+
SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES))
SpecialCObjectRule(menu,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(misc,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(VTPrsTbl,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(charproc,$(VTPARSE_H),$(MISC_DEFINES))
SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(TekPrsTbl,$(TEKPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(TekProc,$(TEKPARSE_H),$(MISC_DEFINES))
#if InstallXtermSetUID
SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs
XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
@@ -319,4 +329,8 @@ InstallAppDefaults(UXTerm)
InstallAppDefaultsLong(XTerm-col,XTerm-color)
InstallManPage(xterm,$(MANDIR))
InstallManPage(resize,$(MANDIR))
+
+cleandir::
+ $(RM) *parse.hin
+
DependTarget()
diff --git a/MANIFEST b/MANIFEST
index 9f99009..bd690d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-326, version xterm-326
+MANIFEST for xterm-327, version xterm-327
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 17b273d..5fcbfab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.235 2016/05/15 16:45:53 tom Exp $
+## $XTermId: Makefile.in,v 1.238 2016/10/06 00:28:15 tom Exp $
# -
# this file is part of xterm
#
@@ -125,7 +125,7 @@ EXTRAOBJ= @EXTRAOBJS@
all : $(PROGRAMS)
-.SUFFIXES : .i .def .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html
@GROFF_NOTE@ .ps .pdf
+.SUFFIXES : .i .def .cin .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html
@GROFF_NOTE@ .ps .pdf
.c$o :
@RULE_CC@
@@ -135,8 +135,11 @@ all : $(PROGRAMS)
@RULE_CC@
@ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@
+.def.cin :
+ $(AWK) '/^CASE_/{printf "{ %d, \"%s\" },\n", n++, $$1; }' < $< >$@
+
.def.hin :
- grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
+ $(AWK) '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
.man.$(manext) :
$(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $* $*
$(pixmapdir)
@@ -169,6 +172,10 @@ all : $(PROGRAMS)
@groff_n...@.ps.pdf :
@GROFF_NOTE@ ps2pdf $*.ps
+
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
main$o : main.h
misc$o : version.h
@@ -189,10 +196,19 @@ resize$x : $(OBJS2)
-$(RM) $@
perl $(srcdir)/88colres.pl > $@
-charproc$o : main.h @CHARPROC_DEPS@
+charproc$o : $(VTPARSE_H) main.h @CHARPROC_DEPS@
+graphics_regis$o : $(VTPARSE_H)
+graphics_sixel$o : $(VTPARSE_H)
+misc$o : $(VTPARSE_H)
+VTPrsTbl$o : $(VTPARSE_H)
+
+TekPrsTbl$o : $(TEKPARSE_H)
+Tekproc$o : $(TEKPARSE_H)
misc$o : builtin_icons.h
+trace$o : VTparse.cin Tekparse.cin
+
# do this to quiet gcc -Wcast-qual warnings
builtin_icons.h :
xterm: Changes to 'debian-unstable'
Imakefile| 20 +++-
MANIFEST |2
Makefile.in | 26 --
NEWS | 22 +
Tekparse.h | 90 +
VTparse.h| 200 ---
charproc.c | 17 ++-
ctlseqs.ms |8 -
ctlseqs.txt |6 -
debian/changelog | 11 ++
main.c | 169 +++
misc.c |8 -
package/debian/changelog |6 +
package/freebsd/Makefile |2
package/xterm.spec |4
ptyx.h |9 +-
trace.c | 42 +
trace.h |4
util.c |8 -
version.h|6 -
xterm.log.html | 36
xterm.man|8 +
22 files changed, 385 insertions(+), 319 deletions(-)
New commits:
commit 9c00508294020eff014a4238559bc07903fb5d4f
Author: Sven Joachim
Date: Sat Oct 8 09:58:44 2016 +0200
Close bug #839220
diff --git a/debian/changelog b/debian/changelog
index cf593af..e36b4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xterm (327-1) UNRELEASED; urgency=medium
- Add a check in the function which handles end-of-line wrapping
to ensure that C1 controls are allocated one column when
allowC1Printable is set (Closes: #738794).
+- Modify allowC1Printable to disallow codes 160-254 as being equivalent
+ to codes 32-126 when parsing escape sequences (Closes: #839220).
-- Sven Joachim Sat, 08 Oct 2016 08:51:23 +0200
commit d88e5d61af219547e7a5f4f6e27baeca9efcb236
Author: Sven Joachim
Date: Sat Oct 8 09:58:29 2016 +0200
Close bug #738794 again
Third time's a charm.
diff --git a/debian/changelog b/debian/changelog
index cf01d9d..cf593af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xterm (327-1) UNRELEASED; urgency=medium
* New upstream release.
+- Add a check in the function which handles end-of-line wrapping
+ to ensure that C1 controls are allocated one column when
+ allowC1Printable is set (Closes: #738794).
-- Sven Joachim Sat, 08 Oct 2016 08:51:23 +0200
commit 5b9246ef325f4425bcba142b1ce759cd2419b8af
Author: Sven Joachim
Date: Sat Oct 8 08:52:15 2016 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index d86e48e..cf01d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (327-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Sven Joachim Sat, 08 Oct 2016 08:51:23 +0200
+
xterm (326-1) unstable; urgency=medium
* New upstream release.
commit 1a027e1ec651c4298f19f92a8fdef55225e4049c
Author: Sven Joachim
Date: Sat Oct 8 08:40:13 2016 +0200
Imported Upstream version 327
diff --git a/Imakefile b/Imakefile
index bbe389a..daf250e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
+XCOMM $XTermId: Imakefile,v 1.113 2016/10/06 00:56:32 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -244,11 +244,21 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
AllTarget($(PROGRAMS))
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
+.SUFFIXES : .def .hin
+.def.hin :
+ awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+
SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES))
SpecialCObjectRule(menu,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(misc,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(VTPrsTbl,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(charproc,$(VTPARSE_H),$(MISC_DEFINES))
SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(TekPrsTbl,$(TEKPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(TekProc,$(TEKPARSE_H),$(MISC_DEFINES))
#if InstallXtermSetUID
SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs
XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
@@ -319,4 +329,8 @@ InstallAppDefaults(UXTerm)
InstallAppDefaultsLong(XTerm-col,XTerm-color)
InstallManPage(xterm,$(MANDIR))
InstallManPage(resize,$(MANDIR))
+
+cleandir::
+ $(RM) *parse.hin
+
DependTarget()
diff --git a/MANIFEST b/MANIFEST
index 9f99009..bd690d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-326, version xterm-326
+MANIFEST for xterm-327, version xterm-327
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 17b273d..5fcbfab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.235 2016/05/15 16:45:53 t
Bug#840085: xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest
Control: tag -1 moreinfo On Sat, Oct 8, 2016 at 08:12:57 +0200, Helmut Grohne wrote: > xauth cannot satsify its cmdtest dependency during cross building, > because cmdtest is Architecture:all Multi-Arch:no. Fortunately, cmdtest > is only needed for testing, so we can simply annotate it with > profile. After doing that, it cross builds just fine. Please consider > applying the attached patch. > Hi Helmut, Is there a reason cmdtest can't be m-a: foreign? Wouldn't that fix the issue as well? Cheers, Julien
Processed: Re: Bug#840085: xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest
Processing control commands: > tag -1 moreinfo Bug #840085 [src:xauth] xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest Added tag(s) moreinfo. -- 840085: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840085 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#840085: xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest
Hi Julien, On Sat, Oct 08, 2016 at 11:47:29AM +0200, Julien Cristau wrote: > Is there a reason cmdtest can't be m-a: foreign? Wouldn't that fix the > issue as well? I agree that marking cmdtest m-a:foreign would fully resolves this bug. I'm less sure that such a marking would be correct. cmdtest includes a python module yarnlib, which uses architecture dependent Python extensions. It seems to me that putting it in a m-a:foreign package runs afoul the multi-arch interpreter problem. So the correct solution could be splitting cmdtest into python-yarnlib, switching users of yarnlib over to the separate package and then marking cmdtest m-a:foreign. Given the necessary package split here, I considered annotating Build-Depends of 5 packages more economical. If you disagree with that trade-off, I suggest: tags -1 - moreinfo patch reassign -1 cmdtest retitle -1 make cmdtest m-a:foreign Helmut
Processed: Re: Bug#840085: xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest
Processing control commands: > tag -1 - moreinfo Bug #840085 [src:xauth] xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest Removed tag(s) moreinfo. -- 840085: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840085 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#840085: xauth FTCBFS: unsatisfiable cross Build-Depends: cmdtest
Control: tag -1 - moreinfo On Sat, Oct 8, 2016 at 14:37:16 +0200, Helmut Grohne wrote: > Hi Julien, > > On Sat, Oct 08, 2016 at 11:47:29AM +0200, Julien Cristau wrote: > > Is there a reason cmdtest can't be m-a: foreign? Wouldn't that fix the > > issue as well? > > I agree that marking cmdtest m-a:foreign would fully resolves this bug. > > I'm less sure that such a marking would be correct. cmdtest includes a > python module yarnlib, which uses architecture dependent Python > extensions. It seems to me that putting it in a m-a:foreign package runs > afoul the multi-arch interpreter problem. > > So the correct solution could be splitting cmdtest into python-yarnlib, > switching users of yarnlib over to the separate package and then marking > cmdtest m-a:foreign. > Thanks for the explanation. Cheers, Julien
Bug#840149: xserver-xorg-video-nouveau: Login screen blurred (after boot) - Nvidia GTX 650
Package: xserver-xorg-video-nouveau Version: 1:1.0.13-1 Severity: minor Dear Maintainer, *** Reporter, please consider answering these questions, where appropriate *** * What led up to the situation? - booting * What exactly did you do (or not do) that was effective (or ineffective)? - nothing, just booting * What was the outcome of this action? - nothing - I could login normally. * What outcome did you expect instead? - pixel-clean login screen. *** End of the template - remove these template lines *** -- Package-specific info: /etc/X11/X does not exist. /etc/X11/X is not a symlink. /etc/X11/X is not executable. VGA-compatible devices on PCI bus: -- 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation GK107 [GeForce GTX 650] [10de:0fc6] (rev a1) /etc/X11/xorg.conf does not exist. /etc/X11/xorg.conf.d does not exist. /etc/modprobe.d contains no KMS configuration files. Kernel version (/proc/version): --- Linux version 4.7.0-1-686-pae (debian-ker...@lists.debian.org) (gcc version 5.4.1 20160904 (Debian 5.4.1-2) ) #1 SMP Debian 4.7.5-1 (2016-09-26) Xorg X server log files on system: -- -rw-r--r-- 1 zoltan zoltan 39174 Oct 8 21:45 /home/zoltan/.local/share/xorg/Xorg.0.log Contents of most recent Xorg X server log file (/home/zoltan/.local/share/xorg/Xorg.0.log): --- [41.237] (--) Log file renamed from "/home/zoltan/.local/share/xorg/Xorg.pid-880.log" to "/home/zoltan/.local/share/xorg/Xorg.0.log" [41.238] X.Org X Server 1.18.4 Release Date: 2016-07-19 [41.239] X Protocol Version 11, Revision 0 [41.239] Build Operating System: Linux 3.16.0-4-amd64 i686 Debian [41.239] Current Operating System: Linux debian 4.7.0-1-686-pae #1 SMP Debian 4.7.5-1 (2016-09-26) i686 [41.239] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-4.7.0-1-686-pae root=UUID=4a3b64e5-50f2-49ca-ab48-4b86130c41b5 ro quiet [41.239] Build Date: 06 September 2016 01:29:57PM [41.239] xorg-server 2:1.18.4-2 (https://www.debian.org/support) [41.239] Current version of pixman: 0.34.0 [41.239]Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. [41.239] Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. [41.239] (==) Log file: "/home/zoltan/.local/share/xorg/Xorg.0.log", Time: Sat Oct 8 21:40:18 2016 [41.270] (==) Using system config directory "/usr/share/X11/xorg.conf.d" [41.288] (==) No Layout section. Using the first Screen section. [41.288] (==) No screen section available. Using defaults. [41.288] (**) |-->Screen "Default Screen Section" (0) [41.288] (**) | |-->Monitor "" [41.289] (==) No monitor specified for screen "Default Screen Section". Using a default monitor configuration. [41.289] (==) Automatically adding devices [41.289] (==) Automatically enabling devices [41.289] (==) Automatically adding GPU devices [41.289] (==) Max clients allowed: 256, resource mask: 0x1f [41.289] (WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist. [41.289]Entry deleted from font path. [41.289] (==) FontPath set to: /usr/share/fonts/X11/misc, /usr/share/fonts/X11/100dpi/:unscaled, /usr/share/fonts/X11/75dpi/:unscaled, /usr/share/fonts/X11/Type1, /usr/share/fonts/X11/100dpi, /usr/share/fonts/X11/75dpi, built-ins [41.289] (==) ModulePath set to "/usr/lib/xorg/modules" [41.289] (II) The server relies on udev to provide the list of input devices. If no devices become available, reconfigure udev or disable AutoAddDevices. [41.289] (II) Loader magic: 0x802ac700 [41.289] (II) Module ABI versions: [41.289]X.Org ANSI C Emulation: 0.4 [41.289]X.Org Video Driver: 20.0 [41.289]X.Org XInput driver : 22.1 [41.289]X.Org Server Extension : 9.0 [41.291] (++) using VT number 2 [41.295] (II) systemd-logind: took control of session /org/freedesktop/login1/session/_32 [41.295] (II) xfree86: Adding drm device (/dev/dri/card0) [41.297] (II) systemd-logind: got fd for /dev/dri/card0 226:0 fd 9 paused 0 [41.299] (--) PCI:*(0:1:0:0) 10de:0fc6:1043:843e rev 161, Mem @ 0xfd00/16777216, 0xd000/268435456, 0xce00/33554432, I/O @ 0xdc00/128, BIOS @ 0x/131072 [41.299] (II) LoadModule: "glx" [41.336] (II) Loading /usr/lib/xorg/modules/extensions/libglx.so [41.359] (II) Module glx: vendor="X.Org Foundation" [41.359]compiled for 1.18.4, module version = 1.0.0 [41.359]ABI class: X.Org Server Extension, version 9.0 [41.359] (==) AIGLX enabled [4
