Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2019-11-06 15:14:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Wed Nov 6 15:14:38 2019 rev:163 rq:744202 version:6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2019-10-25 18:38:50.647710915 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.2990/ncurses.changes 2019-11-06 15:14:41.225089608 +0100 @@ -1,0 +2,32 @@ +Wed Oct 30 14:17:20 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Add tack patch 1.08-20190721 + * tack.c, edit.c, tack.h: gcc-8.x-warnings + * init.c, edit.c: gcc 4.x warning + * charset.c: update copyright + * charset.c: rewrite of set_attr resulted in off-by-one loop limit + * aclocal.m4: + add CF_CURSES_TERM_H to get proper ifdef's for the boolnames arrays + * configure.in: add CF_CURSES_TERM_H + * aclocal.m4: add CF_TERMIOS_TYPES, from xterm + * sysdep.c: use termios types such as tcflag_t + * configure.in: use CF_TERMIOS_TYPES + * tack.h: update copyright + * aclocal.m4: resync with my-autoconf + * package/debian/changelog, package/tack.spec, tack.h: bump + * config.sub: 2019-06-30 + * config.guess: 2019-06-10 + +------------------------------------------------------------------- +Mon Oct 28 09:05:18 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Add ncurses patch 20191026 + + add a note in man/curs_add_wch.3x about Unicode terminology for the + line-drawing characters (report by Nick Black). + + improve comment in lib_tgoto.c regarding the use of \200 where a + \0 would be intended by the caller (report by "64 bit", cf: 20000923). + + modify linux-16color to accommodate Linux console driver change in + early 2018 (report by Dino Petrucci). +- Correct offsets of hunks of patch ncurses-6.1.dif for misc/terminfo.src + +------------------------------------------------------------------- Old: ---- tack-1.08-20170818.tgz New: ---- tack-1.08-20190721.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.eTaCuw/_old 2019-11-06 15:14:42.373090738 +0100 +++ /var/tmp/diff_new_pack.eTaCuw/_new 2019-11-06 15:14:42.377090742 +0100 @@ -69,7 +69,7 @@ Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ -Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20170818.tgz +Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20190721.tgz Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.1.dif ++++++ ncurses-5.9-ibm327x.dif ++++++ --- /var/tmp/diff_new_pack.eTaCuw/_old 2019-11-06 15:14:42.453090817 +0100 +++ /var/tmp/diff_new_pack.eTaCuw/_new 2019-11-06 15:14:42.453090817 +0100 @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17011,8 +17011,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17017,8 +17017,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, ++++++ ncurses-6.1-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.1-20191026.patch new/patches/ncurses-6.1-20191026.patch --- old/patches/ncurses-6.1-20191026.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.1-20191026.patch 2019-10-28 10:03:19.998401747 +0100 @@ -0,0 +1,740 @@ +# ncurses 6.1 - patch 20191026 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.1 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.1 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.1 +# http://invisible-mirror.net/archives/ncurses/6.1 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191026.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Sun Oct 27 01:34:14 UTC 2019 +# ------------------------------------------------------------------------------ +# NEWS | 10 ++- +# VERSION | 2 +# dist.mk | 4 - +# doc/html/man/adacurses6-config.1.html | 2 +# doc/html/man/captoinfo.1m.html | 2 +# doc/html/man/clear.1.html | 2 +# doc/html/man/curs_add_wch.3x.html | 103 +++++++++++++++++--------------- +# doc/html/man/form.3x.html | 2 +# doc/html/man/infocmp.1m.html | 2 +# doc/html/man/infotocap.1m.html | 2 +# doc/html/man/menu.3x.html | 2 +# doc/html/man/ncurses.3x.html | 2 +# doc/html/man/ncurses6-config.1.html | 2 +# doc/html/man/panel.3x.html | 2 +# doc/html/man/tabs.1.html | 2 +# doc/html/man/terminfo.5.html | 2 +# doc/html/man/tic.1m.html | 2 +# doc/html/man/toe.1m.html | 2 +# doc/html/man/tput.1.html | 2 +# doc/html/man/tset.1.html | 2 +# man/curs_add_wch.3x | 56 ++++++++++------- +# misc/terminfo.src | 16 ++++ +# ncurses/tinfo/lib_tgoto.c | 13 +++- +# package/debian-mingw/changelog | 4 - +# package/debian-mingw64/changelog | 4 - +# package/debian/changelog | 4 - +# package/mingw-ncurses.nsi | 4 - +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 30 files changed, 152 insertions(+), 106 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3396 +--- ncurses-6.1-20191019+/NEWS 2019-10-19 21:16:45.000000000 +0000 ++++ ncurses-6.1-20191026/NEWS 2019-10-27 00:10:51.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $ ++-- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,14 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20191026 ++ + add a note in man/curs_add_wch.3x about Unicode terminology for the ++ line-drawing characters (report by Nick Black). ++ + improve comment in lib_tgoto.c regarding the use of \200 where a ++ \0 would be intended by the caller (report by "64 bit", cf: 20000923). ++ + modify linux-16color to accommodate Linux console driver change in ++ early 2018 (report by Dino Petrucci). ++ + 20191019 + + modify make_hash to not require --disable-leaks, to simplify building + with address-sanitizer. +Index: VERSION +--- ncurses-6.1-20191019+/VERSION 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/VERSION 2019-10-26 08:56:47.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20191019 ++5:0:10 6.1 20191026 +Index: dist.mk +Prereq: 1.1311 +--- ncurses-6.1-20191019+/dist.mk 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/dist.mk 2019-10-26 08:56:47.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $ ++# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 1 +-NCURSES_PATCH = 20191019 ++NCURSES_PATCH = 20191026 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: doc/html/man/adacurses6-config.1.html +--- ncurses-6.1-20191019+/doc/html/man/adacurses6-config.1.html 2019-10-12 21:32:36.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/adacurses6-config.1.html 2019-10-27 00:15:46.000000000 +0000 +@@ -125,7 +125,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/captoinfo.1m.html +--- ncurses-6.1-20191019+/doc/html/man/captoinfo.1m.html 2019-10-12 21:32:36.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/captoinfo.1m.html 2019-10-27 00:15:46.000000000 +0000 +@@ -198,7 +198,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/clear.1.html +--- ncurses-6.1-20191019+/doc/html/man/clear.1.html 2019-10-12 21:32:36.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/clear.1.html 2019-10-27 00:15:46.000000000 +0000 +@@ -148,7 +148,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/curs_add_wch.3x.html +--- ncurses-6.1-20191019+/doc/html/man/curs_add_wch.3x.html 2019-03-16 19:34:43.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/curs_add_wch.3x.html 2019-10-27 00:15:46.000000000 +0000 +@@ -1,6 +1,6 @@ + <!-- + **************************************************************************** +- * Copyright (c) 2001-2015,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2001-2017,2019 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp @ ++ * @Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp @ + --> + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> + <HTML> +@@ -138,7 +138,24 @@ + WACS_VLINE 0x2502 | x vertical line + + The wide-character configuration of ncurses also defines symbols for +- double-lines: ++ thick lines (<STRONG>acsc</STRONG> "J" to "V"): ++ ++ <STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG> ++ <STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG> ++ ----------------------------------------------------------------------- ++ WACS_T_BTEE 0x253b + V thick tee pointing up ++ WACS_T_HLINE 0x2501 - Q thick horizontal line ++ WACS_T_LLCORNER 0x2517 + M thick lower left corner ++ WACS_T_LRCORNER 0x251b + J thick lower right corner ++ WACS_T_LTEE 0x252b + T thick tee pointing right ++ WACS_T_PLUS 0x254b + N thick large plus ++ WACS_T_RTEE 0x2523 + U thick tee pointing left ++ WACS_T_TTEE 0x2533 + W thick tee pointing down ++ WACS_T_ULCORNER 0x250f + L thick upper left corner ++ WACS_T_URCORNER 0x2513 + K thick upper right corner ++ WACS_T_VLINE 0x2503 | X thick vertical line ++ ++ and for double-lines (<STRONG>acsc</STRONG> "A" to "I"): + + <STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG> + <STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG> +@@ -155,28 +172,22 @@ + WACS_D_URCORNER 0x2557 + B double upper right corner + WACS_D_VLINE 0x2551 | Y double vertical line + +- and for thick lines: ++ Unicode's descriptions for these characters differs slightly from ++ ncurses, by introducing the term "light" (along with less important ++ details). Here are its descriptions for the normal, thick, and double ++ horizontal lines: + +- <STRONG>ACS</STRONG> <STRONG>Unicode</STRONG> <STRONG>ASCII</STRONG> <STRONG>acsc</STRONG> <STRONG>Glyph</STRONG> +- <STRONG>Name</STRONG> <STRONG>Default</STRONG> <STRONG>Default</STRONG> <STRONG>char</STRONG> <STRONG>Name</STRONG> +- ----------------------------------------------------------------------- +- WACS_T_BTEE 0x253b + V thick tee pointing up +- WACS_T_HLINE 0x2501 - Q thick horizontal line +- WACS_T_LLCORNER 0x2517 + M thick lower left corner +- WACS_T_LRCORNER 0x251b + J thick lower right corner +- WACS_T_LTEE 0x252b + T thick tee pointing right +- WACS_T_PLUS 0x254b + N thick large plus +- WACS_T_RTEE 0x2523 + U thick tee pointing left +- WACS_T_TTEE 0x2533 + W thick tee pointing down +- WACS_T_ULCORNER 0x250f + L thick upper left corner +- WACS_T_URCORNER 0x2513 + K thick upper right corner +- WACS_T_VLINE 0x2503 | X thick vertical line ++ <STRONG>o</STRONG> U+2500 BOX DRAWINGS LIGHT HORIZONTAL ++ ++ <STRONG>o</STRONG> U+2501 BOX DRAWINGS HEAVY HORIZONTAL ++ ++ <STRONG>o</STRONG> U+2550 BOX DRAWINGS DOUBLE HORIZONTAL + + + </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE> + All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on success. + +- Functions with a "mv" prefix first perform a cursor movement using ++ Functions with a "mv" prefix first perform a cursor movement using + <STRONG>wmove</STRONG>, and return an error if the position is outside the window, or if + the window pointer is null. + +@@ -186,71 +197,71 @@ + + + </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE> +- All of these functions are described in the XSI Curses standard, Issue +- 4. The defaults specified for line-drawing characters apply in the ++ All of these functions are described in the XSI Curses standard, Issue ++ 4. The defaults specified for line-drawing characters apply in the + POSIX locale. + +- X/Open Curses makes it clear that the WACS_ symbols should be defined ++ X/Open Curses makes it clear that the WACS_ symbols should be defined + as a pointer to <STRONG>cchar_t</STRONG> data, e.g., in the discussion of <STRONG>border_set</STRONG>. A + few implementations are problematic: + + <STRONG>o</STRONG> NetBSD curses defines the symbols as a <STRONG>wchar_t</STRONG> within a <STRONG>cchar_t</STRONG>. + + <STRONG>o</STRONG> HPUX curses equates some of the <EM>ACS</EM><STRONG>_</STRONG> symbols to the analogous <EM>WACS</EM><STRONG>_</STRONG> +- symbols as if the <EM>ACS</EM><STRONG>_</STRONG> symbols were wide characters. The misde- +- fined symbols are the arrows and other symbols which are not used ++ symbols as if the <EM>ACS</EM><STRONG>_</STRONG> symbols were wide characters. The misde- ++ fined symbols are the arrows and other symbols which are not used + for line-drawing. + + X/Open Curses does not define symbols for thick- or double-lines. SVr4 +- curses implementations defined their line-drawing symbols in terms of +- intermediate symbols. This implementation extends those symbols, pro- ++ curses implementations defined their line-drawing symbols in terms of ++ intermediate symbols. This implementation extends those symbols, pro- + viding new definitions which are not in the SVr4 implementations. + +- Not all Unicode-capable terminals provide support for VT100-style ++ Not all Unicode-capable terminals provide support for VT100-style + alternate character sets (i.e., the <STRONG>acsc</STRONG> capability), with their corre- +- sponding line-drawing characters. X/Open Curses did not address the +- aspect of integrating Unicode with line-drawing characters. Existing +- implementations of Unix curses (AIX, HPUX, Solaris) use only the <STRONG>acsc</STRONG> +- character-mapping to provide this feature. As a result, those imple- +- mentations can only use single-byte line-drawing characters. Ncurses +- 5.3 (2002) provided a table of Unicode values to solve these problems. ++ sponding line-drawing characters. X/Open Curses did not address the ++ aspect of integrating Unicode with line-drawing characters. Existing ++ implementations of Unix curses (AIX, HPUX, Solaris) use only the <STRONG>acsc</STRONG> ++ character-mapping to provide this feature. As a result, those imple- ++ mentations can only use single-byte line-drawing characters. Ncurses ++ 5.3 (2002) provided a table of Unicode values to solve these problems. + NetBSD curses incorporated that table in 2010. + + In this implementation, the Unicode values are used instead of the ter- +- minal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the +- environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>. In contrast, for the same ++ minal description's <STRONG>acsc</STRONG> mapping as discussed in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> for the ++ environment variable <STRONG>NCURSES_NO_UTF8_ACS</STRONG>. In contrast, for the same + cases, the line-drawing characters described in <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG> will use + only the ASCII default values. + +- Having Unicode available does not solve all of the problems with line- ++ Having Unicode available does not solve all of the problems with line- + drawing for curses: + +- <STRONG>o</STRONG> The closest Unicode equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM> +- and <EM>S9</EM> frequently are not displayed at the regular intervals which ++ <STRONG>o</STRONG> The closest Unicode equivalents to the VT100 graphics <EM>S1</EM>, <EM>S3</EM>, <EM>S7</EM> ++ and <EM>S9</EM> frequently are not displayed at the regular intervals which + the terminal used. + +- <STRONG>o</STRONG> The <EM>lantern</EM> is a special case. It originated with the AT&T 4410 +- terminal in the early 1980s. There is no accessible documentation ++ <STRONG>o</STRONG> The <EM>lantern</EM> is a special case. It originated with the AT&T 4410 ++ terminal in the early 1980s. There is no accessible documentation + depicting the lantern symbol on the AT&T terminal. + + Lacking documentation, most readers assume that a <EM>storm</EM> <EM>lantern</EM> was + intended. But there are several possibilities, all with problems. + +- Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and +- U+1F3EE. Those were not available in 2002, and are irrelevant +- since they lie outside the BMP and as a result are not generally ++ Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and ++ U+1F3EE. Those were not available in 2002, and are irrelevant ++ since they lie outside the BMP and as a result are not generally + available in terminals. They are not storm lanterns, in any case. + + Most <EM>storm</EM> <EM>lanterns</EM> have a tapering glass chimney (to guard against + tipping); some have a wire grid protecting the chimney. + +- For the tapering appearance, U+2603 was adequate. In use on a ++ For the tapering appearance, U+2603 was adequate. In use on a + terminal, no one can tell what the image represents. Unicode calls + it a snowman. + +- Others have suggested these alternatives: S U+00A7 (section mark), ++ Others have suggested these alternatives: S U+00A7 (section mark), + <STRONG>O</STRONG> U+0398 (theta), <STRONG>O</STRONG> U+03A6 (phi), d U+03B4 (delta), U+2327 (x in a +- rectangle), U+256C (forms double vertical and horizontal), and ++ rectangle), U+256C (forms double vertical and horizontal), and + U+2612 (ballot box with x). + + +Index: doc/html/man/form.3x.html +--- ncurses-6.1-20191019+/doc/html/man/form.3x.html 2019-10-12 21:32:38.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/form.3x.html 2019-10-27 00:15:49.000000000 +0000 +@@ -246,7 +246,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/infocmp.1m.html +--- ncurses-6.1-20191019+/doc/html/man/infocmp.1m.html 2019-10-12 21:32:39.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/infocmp.1m.html 2019-10-27 00:15:50.000000000 +0000 +@@ -512,7 +512,7 @@ + + https://invisible-island.net/ncurses/tctest.html + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/infotocap.1m.html +--- ncurses-6.1-20191019+/doc/html/man/infotocap.1m.html 2019-10-12 21:32:39.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/infotocap.1m.html 2019-10-27 00:15:50.000000000 +0000 +@@ -90,7 +90,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/menu.3x.html +--- ncurses-6.1-20191019+/doc/html/man/menu.3x.html 2019-10-12 21:32:39.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/menu.3x.html 2019-10-27 00:15:50.000000000 +0000 +@@ -221,7 +221,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.1-20191019+/doc/html/man/ncurses.3x.html 2019-10-12 21:32:40.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/ncurses.3x.html 2019-10-27 00:15:51.000000000 +0000 +@@ -59,7 +59,7 @@ + method of updating character screens with reasonable optimization. + This implementation is "new curses" (ncurses) and is the approved + replacement for 4.4BSD classic curses, which has been discontinued. +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 + UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI +Index: doc/html/man/ncurses6-config.1.html +--- ncurses-6.1-20191019+/doc/html/man/ncurses6-config.1.html 2019-10-12 21:32:40.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/ncurses6-config.1.html 2019-10-27 00:15:51.000000000 +0000 +@@ -112,7 +112,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/panel.3x.html +--- ncurses-6.1-20191019+/doc/html/man/panel.3x.html 2019-10-12 21:32:40.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/panel.3x.html 2019-10-27 00:15:51.000000000 +0000 +@@ -204,7 +204,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/tabs.1.html +--- ncurses-6.1-20191019+/doc/html/man/tabs.1.html 2019-10-12 21:32:40.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/tabs.1.html 2019-10-27 00:15:51.000000000 +0000 +@@ -205,7 +205,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/terminfo.5.html +--- ncurses-6.1-20191019+/doc/html/man/terminfo.5.html 2019-10-12 21:32:41.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/terminfo.5.html 2019-10-27 00:15:51.000000000 +0000 +@@ -103,7 +103,7 @@ + have, by specifying how to perform screen operations, and by specifying + padding requirements and initialization sequences. + +- This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> +Index: doc/html/man/tic.1m.html +--- ncurses-6.1-20191019+/doc/html/man/tic.1m.html 2019-10-12 21:32:41.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/tic.1m.html 2019-10-27 00:15:51.000000000 +0000 +@@ -460,7 +460,7 @@ + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, + <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/toe.1m.html +--- ncurses-6.1-20191019+/doc/html/man/toe.1m.html 2019-10-12 21:32:41.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/toe.1m.html 2019-10-27 00:15:51.000000000 +0000 +@@ -170,7 +170,7 @@ + <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> + <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/tput.1.html +--- ncurses-6.1-20191019+/doc/html/man/tput.1.html 2019-10-12 21:32:41.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/tput.1.html 2019-10-27 00:15:51.000000000 +0000 +@@ -522,7 +522,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: doc/html/man/tset.1.html +--- ncurses-6.1-20191019+/doc/html/man/tset.1.html 2019-10-12 21:32:41.000000000 +0000 ++++ ncurses-6.1-20191026/doc/html/man/tset.1.html 2019-10-27 00:15:51.000000000 +0000 +@@ -389,7 +389,7 @@ + <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, + <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191012). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191026). + + + +Index: man/curs_add_wch.3x +Prereq: 1.24 +--- ncurses-6.1-20191019+/man/curs_add_wch.3x 2017-11-18 23:47:37.000000000 +0000 ++++ ncurses-6.1-20191026/man/curs_add_wch.3x 2019-10-27 00:07:13.000000000 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc. * ++.\" Copyright (c) 2001-2017,2019 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp $ ++.\" $Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp $ + .TH curs_add_wch 3X "" + .ie \n(.g .ds `` \(lq + .el .ds `` `` +@@ -155,7 +155,28 @@ + .TE + .PP + The wide-character configuration of ncurses also defines symbols +-for double-lines: ++for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''): ++.TS ++l l l l l ++l l l l l ++_ _ _ _ _ ++lw(1.5i) lw5 lw5 lw5 lw20. ++\fBACS\fR \fBUnicode\fP \fBASCII\fR \fBacsc\fP \fBGlyph\fR ++\fBName\fR \fBDefault\fP \fBDefault\fR \fBchar\fP \fBName\fR ++WACS_T_BTEE 0x253b + V thick tee pointing up ++WACS_T_HLINE 0x2501 - Q thick horizontal line ++WACS_T_LLCORNER 0x2517 + M thick lower left corner ++WACS_T_LRCORNER 0x251b + J thick lower right corner ++WACS_T_LTEE 0x252b + T thick tee pointing right ++WACS_T_PLUS 0x254b + N thick large plus ++WACS_T_RTEE 0x2523 + U thick tee pointing left ++WACS_T_TTEE 0x2533 + W thick tee pointing down ++WACS_T_ULCORNER 0x250f + L thick upper left corner ++WACS_T_URCORNER 0x2513 + K thick upper right corner ++WACS_T_VLINE 0x2503 | X thick vertical line ++.TE ++.PP ++and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''): + .PP + .TS + l l l l l +@@ -177,26 +198,15 @@ + WACS_D_VLINE 0x2551 | Y double vertical line + .TE + .PP +-and for thick lines: +-.TS +-l l l l l +-l l l l l +-_ _ _ _ _ +-lw(1.5i) lw5 lw5 lw5 lw20. +-\fBACS\fR \fBUnicode\fP \fBASCII\fR \fBacsc\fP \fBGlyph\fR +-\fBName\fR \fBDefault\fP \fBDefault\fR \fBchar\fP \fBName\fR +-WACS_T_BTEE 0x253b + V thick tee pointing up +-WACS_T_HLINE 0x2501 - Q thick horizontal line +-WACS_T_LLCORNER 0x2517 + M thick lower left corner +-WACS_T_LRCORNER 0x251b + J thick lower right corner +-WACS_T_LTEE 0x252b + T thick tee pointing right +-WACS_T_PLUS 0x254b + N thick large plus +-WACS_T_RTEE 0x2523 + U thick tee pointing left +-WACS_T_TTEE 0x2533 + W thick tee pointing down +-WACS_T_ULCORNER 0x250f + L thick upper left corner +-WACS_T_URCORNER 0x2513 + K thick upper right corner +-WACS_T_VLINE 0x2503 | X thick vertical line +-.TE ++Unicode's descriptions for these characters differs slightly from ncurses, ++by introducing the term \*(``light\*('' (along with less important details). ++Here are its descriptions for the normal, thick, and double horizontal lines: ++.bP ++U+2500 BOX DRAWINGS LIGHT HORIZONTAL ++.bP ++U+2501 BOX DRAWINGS HEAVY HORIZONTAL ++.bP ++U+2550 BOX DRAWINGS DOUBLE HORIZONTAL + .SH RETURN VALUE + .PP + All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success. +Index: misc/terminfo.src +--- ncurses-6.1-20191019+/misc/terminfo.src 2019-09-22 18:48:45.000000000 +0000 ++++ ncurses-6.1-20191026/misc/terminfo.src 2019-10-26 17:00:56.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # [email protected] + # +-# $Revision: 1.765 $ +-# $Date: 2019/09/22 18:48:45 $ ++# $Revision: 1.766 $ ++# $Date: 2019/10/26 17:00:56 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -1126,10 +1126,16 @@ + # console font but bright background colors turn into dim ones when + # you use a 512-character console font. This uses bold for bright + # foreground colors and blink for bright background colors. ++# ++# Interestingly, the original version of this entry in 2009 used a documented ++# (but nonstandard) SGR 21, which was supported in the Linux console since 1992 ++# as an equivalent for SGR 22. Long after (early 2018), someone modified the ++# console driver to make it ignore SGR 21 because the ECMA-48 standard ++# suggested a different use for that particular code. + linux-16color|linux console with 16 colors, + colors#16, ncv#42, pairs#0x100, + setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m, +- setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;21%;m, ++ setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;22%;m, + use=linux, + + # bterm (bogl 0.1.18) +@@ -26375,4 +26381,8 @@ + # 2019-09-22 + # + correct a comment -TD + # ++# 2019-10-26 ++# + modify linux-16color to accommodate Linux console driver change in ++# early 2018 (report by Dino Petrucci). ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: ncurses/tinfo/lib_tgoto.c +Prereq: 1.17 +--- ncurses-6.1-20191019+/ncurses/tinfo/lib_tgoto.c 2018-04-07 21:11:48.000000000 +0000 ++++ ncurses-6.1-20191026/ncurses/tinfo/lib_tgoto.c 2019-10-26 22:43:48.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2000-2012,2018 Free Software Foundation, Inc. * ++ * Copyright (c) 2000-2018,2019 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + #include <ctype.h> + #include <termcap.h> + +-MODULE_ID("$Id: lib_tgoto.c,v 1.17 2018/04/07 21:11:48 tom Exp $") ++MODULE_ID("$Id: lib_tgoto.c,v 1.18 2019/10/26 22:43:48 tom Exp $") + + #if !PURE_TERMINFO + static bool +@@ -125,7 +125,14 @@ + *value += 1; + need_BC = TRUE; + } else { +- *value = 0200; /* tputs will treat this as \0 */ ++ /* tputs will pretend this is \0, which will almost ++ * always work since ANSI-compatible terminals ignore ++ * the character. ECMA-48 does not document a C1 ++ * control for this value. A few (obsolete) terminals ++ * can use this value in special cases, such as cursor ++ * addressing using single-byte coordinates. ++ */ ++ *value = 0200; + } + } + result[used++] = (char) *value++; +Index: package/debian-mingw/changelog +--- ncurses-6.1-20191019+/package/debian-mingw/changelog 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/debian-mingw/changelog 2019-10-26 08:56:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20191019) unstable; urgency=low ++ncurses6 (6.1+20191026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 19 Oct 2019 08:47:53 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 26 Oct 2019 04:56:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20191019+/package/debian-mingw64/changelog 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/debian-mingw64/changelog 2019-10-26 08:56:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20191019) unstable; urgency=low ++ncurses6 (6.1+20191026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 19 Oct 2019 08:47:53 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 26 Oct 2019 04:56:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20191019+/package/debian/changelog 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/debian/changelog 2019-10-26 08:56:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20191019) unstable; urgency=low ++ncurses6 (6.1+20191026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 19 Oct 2019 08:47:53 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 26 Oct 2019 04:56:47 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.357 +--- ncurses-6.1-20191019+/package/mingw-ncurses.nsi 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/mingw-ncurses.nsi 2019-10-26 08:56:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "1" + !define VERSION_YYYY "2019" +-!define VERSION_MMDD "1019" ++!define VERSION_MMDD "1026" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20191019+/package/mingw-ncurses.spec 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/mingw-ncurses.spec 2019-10-26 08:56:47.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20191019 ++Release: 20191026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20191019+/package/ncurses.spec 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/ncurses.spec 2019-10-26 08:56:47.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20191019 ++Release: 20191026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20191019+/package/ncursest.spec 2019-10-19 12:47:53.000000000 +0000 ++++ ncurses-6.1-20191026/package/ncursest.spec 2019-10-26 08:56:47.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20191019 ++Release: 20191026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz ++++++ ncurses-6.1.dif ++++++ --- /var/tmp/diff_new_pack.eTaCuw/_old 2019-11-06 15:14:44.145092482 +0100 +++ /var/tmp/diff_new_pack.eTaCuw/_new 2019-11-06 15:14:44.149092486 +0100 @@ -426,7 +426,7 @@ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, -@@ -2484,6 +2493,7 @@ vt132|DEC vt132, +@@ -2490,6 +2499,7 @@ vt132|DEC vt132, # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # PF1--PF4 are used as F1--F4. @@ -434,7 +434,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -2494,7 +2504,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2500,7 +2510,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -443,7 +443,7 @@ dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, -@@ -2655,6 +2665,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2661,6 +2671,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson <[email protected]> Sept 10 1995 # (vt320: uncommented <fsl> --esr) @@ -451,7 +451,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2664,7 +2675,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2670,7 +2681,7 @@ vt320|vt300|dec vt320 7 bit terminal, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -460,7 +460,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -4084,6 +4095,7 @@ mintty+common|shared capabilities for mi +@@ -4090,6 +4101,7 @@ mintty+common|shared capabilities for mi # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -468,7 +468,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -4092,7 +4104,7 @@ teraterm2.3|Tera Term Pro, +@@ -4098,7 +4110,7 @@ teraterm2.3|Tera Term Pro, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, @@ -477,7 +477,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4400,6 +4412,7 @@ xterm-old|antique xterm version, +@@ -4406,6 +4418,7 @@ xterm-old|antique xterm version, use=xterm-r6, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -485,7 +485,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -4409,7 +4422,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4415,7 +4428,7 @@ xterm-xf86-v32|xterm terminal emulator ( csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -494,7 +494,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -5046,8 +5059,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5052,8 +5065,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -521,7 +521,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5391,7 +5422,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5397,7 +5428,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -530,7 +530,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5642,10 +5673,14 @@ mgt|Multi GNOME Terminal, +@@ -5648,10 +5679,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -546,7 +546,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5857,14 +5892,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5863,14 +5898,14 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -564,7 +564,7 @@ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -5921,6 +5956,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5927,6 +5962,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # Since rxvt is not really compatible with xterm, it should be configured as # "rxvt" or "rxvt-color". @@ -572,7 +572,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5932,13 +5968,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5938,13 +5974,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, @@ -590,7 +590,7 @@ rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, -@@ -5949,7 +5986,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5955,7 +5992,7 @@ rxvt-basic|rxvt terminal base (X Window %p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, @@ -599,7 +599,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -6032,8 +6069,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6038,8 +6075,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -610,7 +610,7 @@ kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -6124,6 +6161,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6130,6 +6167,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -649,7 +649,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -6170,7 +6239,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -6176,7 +6245,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -658,7 +658,7 @@ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -6184,13 +6253,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6190,13 +6259,13 @@ Eterm|Eterm-color|Eterm with xterm-style csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -674,7 +674,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -7114,7 +7183,7 @@ pty|4bsd pseudo teletype, +@@ -7120,7 +7189,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -683,7 +683,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7127,6 +7196,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7133,6 +7202,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -697,7 +697,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -7255,7 +7331,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7261,7 +7337,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -706,7 +706,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -7376,6 +7452,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7382,6 +7458,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -720,7 +720,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -7463,7 +7546,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7469,7 +7552,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -729,7 +729,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -9366,7 +9449,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9372,7 +9455,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -738,7 +738,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -12596,6 +12679,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12602,6 +12685,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to [email protected]. # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr) @@ -746,7 +746,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -12605,7 +12689,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12611,7 +12695,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -755,7 +755,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -17021,7 +17105,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17027,7 +17111,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -764,7 +764,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -17279,7 +17363,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17285,7 +17369,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. ++++++ tack-1.08-20170818.tgz -> tack-1.08-20190721.tgz ++++++ ++++ 15334 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/CHANGES new/tack-1.08-20190721/CHANGES --- old/tack-1.08-20170818/CHANGES 2017-08-18 18:55:09.000000000 +0200 +++ new/tack-1.08-20190721/CHANGES 2019-07-21 21:09:13.000000000 +0200 @@ -1,3 +1,48 @@ +2019-07-21 Thomas E. Dickey <[email protected]> + + * tack.c, edit.c, tack.h: gcc-8.x-warnings + + * init.c, edit.c: gcc 4.x warning + + * charset.c: update copyright + +2019-07-21 Brad.Town + + * charset.c: rewrite of set_attr resulted in off-by-one loop limit + +2019-07-21 Thomas E. Dickey <[email protected]> + + * configure: regen + + * aclocal.m4: + add CF_CURSES_TERM_H to get proper ifdef's for the boolnames arrays + + * configure.in: add CF_CURSES_TERM_H + + * aclocal.m4: add CF_TERMIOS_TYPES, from xterm + + * sysdep.c: use termios types such as tcflag_t + + * configure.in: use CF_TERMIOS_TYPES + + * configure: regen + + * tack.h: update copyright + + * configure: regen + + * aclocal.m4: resync with my-autoconf + + * package/debian/changelog, package/tack.spec, tack.h: bump + +2019-06-30 Thomas E. Dickey <[email protected]> + + * config.sub: 2019-06-30 + +2019-06-10 Thomas E. Dickey <[email protected]> + + * config.guess: 2019-06-10 + 2017-08-18 Thomas E. Dickey <[email protected]> * package/debian/changelog, package/tack.spec, tack.h: bump @@ -1053,7 +1098,7 @@ * tack.c, sysdep.c, scan.c, output.c, modes.c, menu.c, init.c, crum.c, color.c, charset.c, ansi.c, HISTORY: ncurses-4.1-971101 -1997-10-11 [email protected] +1997-10-11 Thomas E. Dickey <[email protected]> * RCS: PERMIT FILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/charset.c new/tack-1.08-20190721/charset.c --- old/tack-1.08-20170818/charset.c 2017-08-18 18:18:53.000000000 +0200 +++ new/tack-1.08-20190721/charset.c 2019-07-21 20:14:30.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: charset.c,v 1.24 2017/08/18 16:18:53 tom Exp $") +MODULE_ID("$Id: charset.c,v 1.26 2019/07/21 18:14:30 tom Exp $") /* Menu definitions for alternate character set and SGR tests. @@ -245,7 +245,7 @@ return; } memset(b, 0, sizeof(b)); - for (i = 0; i < 9; i++) { + for (i = 0; i < 10; i++) { b[i] = (a >> i) & 1; if (b[i]) use_sgr = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/configure.in new/tack-1.08-20190721/configure.in --- old/tack-1.08-20170818/configure.in 2017-07-28 21:56:15.000000000 +0200 +++ new/tack-1.08-20190721/configure.in 2019-07-21 19:33:30.000000000 +0200 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 2007-2015,2017 Free Software Foundation, Inc. * +dnl Copyright (c) 2007-2017,2019 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -28,7 +28,7 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.39 2017/07/28 19:56:15 tom Exp $ +dnl $Id: configure.in,v 1.41 2019/07/21 17:33:30 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). @@ -118,6 +118,7 @@ CF_PKG_CONFIG CF_WITH_NCURSES_ETC +CF_CURSES_TERM_H CF_CURSES_CHECK_DATA(boolnames boolfnames) CF_CURSES_CHECK_DATA(acs_map _acs_map __acs_map acs32map, break) @@ -164,6 +165,7 @@ ) CF_SIG_ATOMIC_T +CF_TERMIOS_TYPES CF_WITH_MAN2HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/edit.c new/tack-1.08-20190721/edit.c --- old/tack-1.08-20170818/edit.c 2017-08-18 18:15:44.000000000 +0200 +++ new/tack-1.08-20190721/edit.c 2019-07-21 21:08:38.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1997-2012,2017 Free Software Foundation, Inc. +** Copyright (C) 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -24,7 +24,7 @@ #include <tack.h> -MODULE_ID("$Id: edit.c,v 1.42 2017/08/18 16:15:44 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.44 2019/07/21 19:08:38 tom Exp $") /* * These are adapted from tic.h @@ -381,13 +381,13 @@ | flag)); break; default: - sprintf(temp, "unknown cap type (%s)", name); + sprintf(temp, "unknown cap type (%.*s)", NAME_SIZE, name); ptextln(temp); break; } } else { #ifdef HAVE_CURSES_DATA_BOOLNAMES - sprintf(temp, "Cap not found: %s", name); + sprintf(temp, "Cap not found: %.*s", NAME_SIZE, name); ptextln(temp); (void) wait_here(); #endif @@ -408,7 +408,7 @@ { if (s) { int ch, j; - char name[32]; + char name[NAME_SIZE]; for (j = 0; (ch = name[j] = *s); s++) { if (ch == ' ' || ch == ')' || ch == '(') { @@ -441,7 +441,7 @@ { if (s) { int j; - char name[32]; + char name[NAME_SIZE]; for (j = 0;; s++) { int ch = name[j] = *s; @@ -591,8 +591,8 @@ memset(target, 0, sizeof(*target)); #define copy_array(member,count) \ - target->member = calloc(count, sizeof(target->member[0])); \ - memcpy(target->member, source->member, count * sizeof(target->member[0])) + target->member = calloc((size_t)(count), sizeof(target->member[0])); \ + memcpy(target->member, source->member, (size_t)(count) * sizeof(target->member[0])) copy_array(Booleans, MAX_BOOLEAN); copy_array(Numbers, MAX_NUMBERS); @@ -893,7 +893,7 @@ int i; FILE *fp; time_t now; - char buf[1024]; + char buf[TEMP_SIZE]; if ((fp = fopen(tty_basename, "w")) == (FILE *) NULL) { (void) sprintf(temp, "can't open: %s", tty_basename); @@ -994,7 +994,7 @@ int *ch) { int i; - char buf[1024]; + char buf[TEMP_SIZE]; display_lines = 1; start_display = 1; @@ -1182,8 +1182,8 @@ NAME_TABLE const *nt; char *s; int n, op, b; - char buf[1024]; - char tmp[1024]; + char buf[TEMP_SIZE]; + char tmp[TEMP_SIZE]; ptext("enter name: "); read_string(buf, (size_t) 80); @@ -1209,7 +1209,7 @@ b = ((nt->nt_index == xon_index) ? xon_shadow : get_newer_boolean(nt->nt_index)); - sprintf(temp, "boolean %s %s", buf, + sprintf(temp, "boolean %.*s %s", (TEMP_SIZE - 30), buf, b ? "True" : "False"); break; case STRING: @@ -1218,10 +1218,10 @@ return; } if (get_newer_string(nt->nt_index)) { - sprintf(temp, "string %s %s", buf, + sprintf(temp, "string %.*s %s", NAME_SIZE, buf, expand(get_newer_string(nt->nt_index))); } else { - sprintf(temp, "undefined string %s", buf); + sprintf(temp, "undefined string %.*s", NAME_SIZE, buf); } break; case NUMBER: @@ -1229,7 +1229,7 @@ set_newer_number(nt->nt_index, -1); return; } - sprintf(temp, "numeric %s %d", buf, + sprintf(temp, "numeric %.*s %d", NAME_SIZE, buf, get_newer_number(nt->nt_index)); break; default: @@ -1238,7 +1238,7 @@ } ptextln(temp); } else { - sprintf(temp, "Cap not found: %s", buf); + sprintf(temp, "Cap not found: %.*s", NAME_SIZE, buf); ptextln(temp); return; } @@ -1275,7 +1275,7 @@ nt->nt_name, n); ptextln(temp); } else { - sprintf(temp, "Illegal number: %s", buf); + sprintf(temp, "Illegal number: %.*s", (TEMP_SIZE - 20), buf); ptextln(temp); } break; @@ -1338,7 +1338,7 @@ const char *a; const char *b; static char title[] = " old value cap new value"; - char abuf[1024]; + char abuf[TEMP_SIZE]; for (i = 0; i < MAX_BOOLEAN; i++) { v = (i == xon_index) ? xon_shadow : get_newer_boolean(i); @@ -1375,7 +1375,8 @@ header = 0; } strcpy(abuf, form_terminfo(a)); - sprintf(temp, "%30s %6s %s", abuf, STR_NAME(i), form_terminfo(b)); + sprintf(temp, "%.30s %6s %.30s", + abuf, STR_NAME(i), form_terminfo(b)); putln(temp); } } @@ -1402,14 +1403,14 @@ const char *s; char *t, *p; const char *current_string; - char buf[1024]; - char pad[1024]; + char buf[TEMP_SIZE]; + char pad[TEMP_SIZE]; i = test->flags & 255; if (i == 255) { /* read the cap name from the user */ ptext("enter name: "); - read_string(pad, (size_t) 32); + read_string(pad, (size_t) NAME_SIZE); if (pad[0] == '\0' || pad[1] == '\0') { *chp = pad[0]; return; @@ -1418,7 +1419,7 @@ x = nt->nt_index; current_string = get_newer_string(x); } else { - sprintf(temp, "%s is not a string capability", pad); + sprintf(temp, "%.*s is not a string capability", NAME_SIZE, pad); ptext(temp); generic_done_message(test, state, chp); return; @@ -1440,12 +1441,12 @@ ptextln(expand(t)); return; } - sprintf(buf, "Current value: (%s) %s", - pad, + sprintf(buf, "Current value: (%.*s) %s", + NAME_SIZE, pad, form_terminfo(current_string)); putln(buf); ptextln("Enter new pad. 0 for no pad. CR for no change."); - read_string(buf, (size_t) 32); + read_string(buf, (size_t) NAME_SIZE); if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) { *chp = buf[0]; return; @@ -1496,7 +1497,7 @@ v = ch; } if (pad[0]) { - sprintf(t, "$<%s>", pad); + sprintf(t, "$<%.*s>", 20, pad); } if ((t = (char *) malloc(strlen(buf) + 1))) { strcpy(t, buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/init.c new/tack-1.08-20190721/init.c --- old/tack-1.08-20170818/init.c 2017-08-18 17:27:05.000000000 +0200 +++ new/tack-1.08-20190721/init.c 2019-07-21 20:31:54.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2013,2017 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -26,7 +26,7 @@ #include <tack.h> -MODULE_ID("$Id: init.c,v 1.36 2017/08/18 15:27:05 tom Exp $") +MODULE_ID("$Id: init.c,v 1.37 2019/07/21 18:31:54 tom Exp $") FILE *debug_fp; char temp[TEMP_SIZE]; @@ -210,7 +210,7 @@ char buffer[BUFSIZ]; char *s, *t; - if (fgets(buffer, sizeof(buffer) - 1, pp) != 0 + if (fgets(buffer, (int) (sizeof(buffer) - 1), pp) != 0 && *buffer == '#' && ((t = strstr(buffer, " file: ")) || (t = strstr(buffer, " file ")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/package/debian/changelog new/tack-1.08-20190721/package/debian/changelog --- old/tack-1.08-20170818/package/debian/changelog 2017-08-18 18:43:54.000000000 +0200 +++ new/tack-1.08-20190721/package/debian/changelog 2019-07-21 14:26:44.000000000 +0200 @@ -1,3 +1,9 @@ +tack (1.08+20190721) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Sun, 21 Jul 2019 08:26:44 -0400 + tack (1.08+20170818) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/package/tack.spec new/tack-1.08-20190721/package/tack.spec --- old/tack-1.08-20170818/package/tack.spec 2017-08-18 18:43:54.000000000 +0200 +++ new/tack-1.08-20190721/package/tack.spec 2019-07-21 14:26:44.000000000 +0200 @@ -1,8 +1,8 @@ Summary: tack - terminfo action checker %define AppProgram tack %define AppVersion 1.08 -%define AppRelease 20170818 -# $XTermId: tack.spec,v 1.16 2017/08/18 16:43:54 tom Exp $ +%define AppRelease 20190721 +# $XTermId: tack.spec,v 1.17 2019/07/21 12:26:44 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/sysdep.c new/tack-1.08-20190721/sysdep.c --- old/tack-1.08-20170818/sysdep.c 2017-07-29 01:37:53.000000000 +0200 +++ new/tack-1.08-20190721/sysdep.c 2019-07-21 14:57:58.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -44,7 +44,7 @@ #endif #endif -MODULE_ID("$Id: sysdep.c,v 1.27 2017/07/28 23:37:53 tom Exp $") +MODULE_ID("$Id: sysdep.c,v 1.28 2019/07/21 12:57:58 tom Exp $") #ifdef TERMIOS #define PUT_TTY(fd, buf) tcsetattr(fd, TCSAFLUSH, buf) @@ -108,17 +108,17 @@ #endif new_modes.c_cc[VTIME] = 2; new_modes.c_lflag &= - (unsigned) ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK | ECHONL); + (tcflag_t) ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK | ECHONL); #ifdef LOBLK - new_modes.c_lflag &= (unsigned) ~LOBLK; + new_modes.c_lflag &= (tcflag_t) ~LOBLK; #endif - new_modes.c_oflag &= (unsigned) ~(OPOST | OLCUC | TABDLY); + new_modes.c_oflag &= (tcflag_t) ~(OPOST | OLCUC | TABDLY); if (mask == ALLOW_PARITY) { - new_modes.c_cflag &= (unsigned) ~(CSIZE | PARENB | HUPCL); + new_modes.c_cflag &= (tcflag_t) ~(CSIZE | PARENB | HUPCL); new_modes.c_cflag |= CS8; } new_modes.c_iflag &= - (unsigned) ~(IGNBRK + (tcflag_t) ~(IGNBRK | BRKINT | IGNPAR | PARMRK @@ -146,17 +146,17 @@ #ifdef TERMIOS new_modes.c_cc[VMIN] = 1; new_modes.c_cc[VTIME] = 1; - new_modes.c_lflag &= (unsigned) ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL); + new_modes.c_lflag &= (tcflag_t) ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL); #if defined(ONLCR) && defined(OCRNL) && defined(ONLRET) && defined(OFILL) - new_modes.c_oflag &= (unsigned) ~(ONLCR | OCRNL | ONLRET | OFILL); + new_modes.c_oflag &= (tcflag_t) ~(ONLCR | OCRNL | ONLRET | OFILL); #else - new_modes.c_oflag &= (unsigned) ~(OPOST); + new_modes.c_oflag &= (tcflag_t) ~(OPOST); #endif if (char_mask == ALLOW_PARITY) - new_modes.c_iflag &= (unsigned) ~ISTRIP; + new_modes.c_iflag &= (tcflag_t) ~ISTRIP; switch (select_xon_xoff) { case 0: - new_modes.c_iflag &= (unsigned) ~(IXON | IXOFF); + new_modes.c_iflag &= (tcflag_t) ~(IXON | IXOFF); break; case 1: #if defined(sequent) && sequent @@ -171,21 +171,21 @@ case 0: #ifdef NLDLY new_modes.c_oflag &= - (unsigned) ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); + (tcflag_t) ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); #endif /* NLDLY */ break; case 1: #ifdef NLDLY new_modes.c_oflag &= - (unsigned) ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); + (tcflag_t) ~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); #endif /* NLDLY */ #ifdef NL1 new_modes.c_oflag |= NL1 | CR2; #endif /* NL1 */ break; } - if ((new_modes.c_oflag & (unsigned long) ~OPOST) == 0) - new_modes.c_oflag &= (unsigned long) ~OPOST; + if ((new_modes.c_oflag & (tcflag_t) ~OPOST) == 0) + new_modes.c_oflag &= (tcflag_t) ~OPOST; #else new_modes.sg_flags |= RAW; if (not_a_tty) @@ -228,7 +228,7 @@ new_modes = old_modes; #ifdef TERMIOS #ifdef TABDLY - new_modes.c_oflag &= (unsigned) ~TABDLY; + new_modes.c_oflag &= (tcflag_t) ~TABDLY; #endif /* TABDLY */ #endif if (PUT_TTY(fileno(stdin), &new_modes) == -1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/tack.c new/tack-1.08-20190721/tack.c --- old/tack-1.08-20170818/tack.c 2017-08-18 18:16:20.000000000 +0200 +++ new/tack-1.08-20190721/tack.c 2019-07-21 21:09:13.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -22,7 +22,7 @@ #include <tack.h> #include <stdarg.h> -MODULE_ID("$Id: tack.c,v 1.27 2017/08/18 16:16:20 tom Exp $") +MODULE_ID("$Id: tack.c,v 1.28 2019/07/21 19:09:13 tom Exp $") /* This program is designed to test terminfo, not curses. Therefore @@ -574,7 +574,7 @@ #ifdef DEBUG void -TackMsg(const char *fmt,...) +TackMsg(const char *fmt, ...) { static FILE *my_fp; static const char *my_filename = "TackMsg.out"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20170818/tack.h new/tack-1.08-20190721/tack.h --- old/tack-1.08-20170818/tack.h 2017-08-18 18:43:54.000000000 +0200 +++ new/tack-1.08-20190721/tack.h 2019-07-21 21:08:15.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright (C) 1991, 1997-2015,2017 Free Software Foundation, Inc. +** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. ** ** This file is part of TACK. ** @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.71 2017/08/18 16:43:54 tom Exp $ */ +/* $Id: tack.h,v 1.74 2019/07/21 19:08:15 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -28,7 +28,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 8 -#define PATCH_VERSION 20170818 +#define PATCH_VERSION 20190721 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> @@ -218,6 +218,7 @@ #define UChar(c) ((unsigned char)(c)) +#define NAME_SIZE 32 #define TEMP_SIZE 1024 extern FILE *log_fp; @@ -443,7 +444,7 @@ #endif #ifdef DEBUG #define TACKMSG(p) p -extern void TackMsg(const char *,...) GCC_PRINTFLIKE(1,2); +extern void TackMsg(const char *, ...) GCC_PRINTFLIKE(1,2); #else #define TACKMSG(p) /* nothing */ #endif
