Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2024-07-03 20:26:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncurses" Wed Jul 3 20:26:34 2024 rev:267 rq:1184207 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2024-06-12 15:39:02.067697045 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new.18349/ncurses.changes 2024-07-03 20:28:04.236168654 +0200 @@ -1,0 +2,52 @@ +Mon Jul 1 06:32:41 UTC 2024 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20240629 + + build-fix for ncurses-examples with newer PDCurses, which no longer + has stubs for unimplemented features. + + add help-popup for test_instr.c, test_inwstr.c + + modify checks in delwin to avoid checking if the window is a pad + until first checking if it is still on the active window-list + (cf: 20211115). + + improve -t option of test/gdc.c, allowing hours only, or hours and + minutes only. +- Update to tack 1.10 (patch 20240501) + * init.c, edit.c: gcc warning (NetBSD) + * edit.c: + check to avoid printing a non-printable character, per Coverity + * tack.c: initialize variables, per Coverity + * tack.1: change limit for SGR tool to allow for aixterm's colors + * ansi.c: change the SGR tool to show up to 120 (past aixterm's 108) + * color.c: + when reloading the colors 0-7, use the index for the named color rather than + just the array-index (fixing an interchanged red/blue for instance). + Also, initialize the palette using the ANSI codes if the terminal supports + setaf/setab. + * color.c, charset.c, ansi.c, edit.c, crum.c, pad.c, tack.c, tack.h: + use "const" in a few places reported by cppcheck + * tack.1: improve formatting/style + +------------------------------------------------------------------- +Mon Jun 24 07:57:50 UTC 2024 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20240622 + + improve test/gdc.c (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + adjust naming of mingw *-config scripts to match the pkg-config names + + widen pattern in pc/*-config scripts to disallow more linker options + + add --cflags-only-I and --cflags-only-other options to + misc/ncurses-config.in + + revert change to CF_BUILD_CC macro (report by Vassili Courzakis, + cf: 20240518). +- Port patch ncurses-6.4.dif +- Port edit.sed script to new ncurses-config + +------------------------------------------------------------------- +Mon Jun 17 06:42:12 UTC 2024 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20240615 + + improve formatting/style of manpages (patches by Branden Robinson). + + review/update modules files. + + improve install-rules in Ada95 makefiles (report by Branden Robinson). + + improve formatting/style of manpages in test-directory. + +------------------------------------------------------------------- Old: ---- tack-1.09-20230201.tgz tack-1.09-20230201.tgz.asc New: ---- tack-1.10-20240501.tgz tack-1.10-20240501.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.w4rGBl/_old 2024-07-03 20:28:11.148421644 +0200 +++ /var/tmp/diff_new_pack.w4rGBl/_new 2024-07-03 20:28:11.148421644 +0200 @@ -37,8 +37,8 @@ %global patchlvl %(bash %{_sourcedir}/get_version_number.sh %{_sourcedir}) %global basevers 6.5 -%global tackvers 1.09 -%global tacklvl 20230201 +%global tackvers 1.10 +%global tacklvl 20240501 Name: ncurses #!BuildIgnore: terminfo ++++++ edit.sed ++++++ --- /var/tmp/diff_new_pack.w4rGBl/_old 2024-07-03 20:28:11.244425158 +0200 +++ /var/tmp/diff_new_pack.w4rGBl/_new 2024-07-03 20:28:11.244425158 +0200 @@ -22,18 +22,10 @@ done sed -ri -e " -/^[[:blank:]]*--cflags\)/,/;;/ { - /;;/ a\\ - --cflags)\\ - echo $cflags\\ - ;; - d +/^[[:blank:]]*--cflags.*\)/,/;;/ { + s|for opt in .*|for opt in ${cflags}| } -/^[[:blank:]]*--libs\)/,/;;/ { - /;;/ a\\ - --libs)\\ - echo $libs\\ - ;; - d +/^[[:blank:]]*--libs.*\)/,/;;/ { + s|for opt in .*|for opt in ${libs}| }" ${1+"$@"} ++++++ ncurses-6.4.dif ++++++ --- /var/tmp/diff_new_pack.w4rGBl/_old 2024-07-03 20:28:11.288426769 +0200 +++ /var/tmp/diff_new_pack.w4rGBl/_new 2024-07-03 20:28:11.292426915 +0200 @@ -349,7 +349,7 @@ --- man/man_db.renames.in +++ man/man_db.renames.in 2024-05-14 06:15:01.767262785 +0000 -@@ -298,6 +298,7 @@ wtimeout.3x wtimeout.3ncurses +@@ -300,6 +300,7 @@ wtimeout.3x wtimeout.3ncurses wunctrl.3x wunctrl.3ncurses # # Other: @@ -359,7 +359,7 @@ ttys.5 ttys.4 --- man/ncurses.3x +++ man/ncurses.3x 2024-04-15 07:09:39.619910505 +0000 -@@ -341,6 +341,10 @@ and \fBmenu\fP(3X) libraries to ease con +@@ -357,6 +357,10 @@ and \fBmenu\fP(3X) libraries to ease con with .IR curses . .SS "Initialization" @@ -371,7 +371,7 @@ .I TERM in the process environment is essential to correct --- misc/gen-pkgconfig.in -+++ misc/gen-pkgconfig.in 2024-04-15 07:05:36.860695856 +0000 ++++ misc/gen-pkgconfig.in 2024-06-24 08:03:55.625517938 +0000 @@ -83,6 +83,8 @@ if [ "$includedir" != "/usr/include" ]; fi @@ -388,7 +388,7 @@ + -Wl,--hash-size=*) # ignore hash as gold linker can not do + continue + ;; - -Wl,-z,*) # ignore flags used to manipulate shared image + -Wl,-z*) # ignore flags used to manipulate shared image continue ;; -Wl,--dynamic-linker*) # ignore ELF interpreter ++++++ ncurses-6.5-patches.tar.bz2 ++++++ Binary files old/patches/ncurses-6.5-20240615.patch.gz and new/patches/ncurses-6.5-20240615.patch.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.5-20240615.patch.gz.asc new/patches/ncurses-6.5-20240615.patch.gz.asc --- old/patches/ncurses-6.5-20240615.patch.gz.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.5-20240615.patch.gz.asc 2024-06-16 01:59:22.000000000 +0200 @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmZuKtoACgkQzCr0RyFn +vgNC2wwA7iwEbujw8zsE02XBIs1wvmexUWtQWxBvr9BVzkT6VucIAP/s2v5LPt4x +AOzfG+qWFX3OIPkran2N3Mh8XsEYWUKviH2SVQD42/qgjVscAIOFv54eSt/B9/VO +eDMcSbQyLnZAKakKAfwMFypoL5hlxgczzCSUtkcIsnkVfj6KbqdnEQLmnPmDZzIS +HC0CXsEA5kytZTVYi3Rjgm21VtoyoNXWrwA2cUGuqzHWKgDQyuZHoyq1aLJ0o145 ++eY5LB4VXNl2Lz3vSCjcx7T4/ejzVB/gp7ozFT0wkRGw+1UG/WdpyNWI9J099oeX +vAH0dnhe5K+oTIN5WKpCuFs7a4dg0M5cJvHAaakyTBm+rRoCsjZpi1qO0TtKTruJ +8FmGzPom4n76aQsUb3bZtfRoJ7mCT97Hhr6CNjZW4mnHyPrQ8hpZSfZ/783POTZp +Vs3dh+POw5oQ4gj0CfyPf+yEYo1ZRZUzCXwVy6UOFEfjnrf8t/hoSLd8tbbgPOh1 +7GQYPe7y +=U061 +-----END PGP SIGNATURE----- Binary files old/patches/ncurses-6.5-20240622.patch.gz and new/patches/ncurses-6.5-20240622.patch.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.5-20240622.patch.gz.asc new/patches/ncurses-6.5-20240622.patch.gz.asc --- old/patches/ncurses-6.5-20240622.patch.gz.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.5-20240622.patch.gz.asc 2024-06-23 01:49:21.000000000 +0200 @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmZ3YwAACgkQzCr0RyFn +vgP25Av/freTSQzDZg8uNYwKct4jaIn5RVeci7V+EfKSWOqNeWcm12t8W3XoyKz5 +nMWa2ScF6819FfEH6P6xNXRlbUfXj05LVtvqqz7/kceycJWWT/fPL6hnM76+pRqb +6cCuXHCtDl9n3PbQwmGIN6q7YG5xrWYkg1QeqEJnr8I6aIyMjpmtnqDxzmeSh82z +cqVRfTmLHyCz/rB6UyjLVRx6iZQKBFto/unwPDzbwPjAxGyJQ7Add+y7kBlvI4ii +i/9bxipYnwCmE7Xxmb0RStLS9RucWMwzKGsljQZf47hAIgA4EPkm2ogRS1Lf3Ght +9xWkLc1344WFNMAIWSBtj2TYxguUFD1g9i36yE8LLUXj5VErZbGegyluUDEC2vCX +GZU8SAfIsMM4/StvSw0b8H6J+LMpU6oEpumvDW8BlreAr5RUfMWang0EoqtgNEPW +4UdDFoStAnoqtyJRjJ3+Y3mNWSPKb403i4J+CsbYsphu7SVqeJ+jLGxD/YR4CxY4 +MMvQeBBq +=EuuR +-----END PGP SIGNATURE----- Binary files old/patches/ncurses-6.5-20240629.patch.gz and new/patches/ncurses-6.5-20240629.patch.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.5-20240629.patch.gz.asc new/patches/ncurses-6.5-20240629.patch.gz.asc --- old/patches/ncurses-6.5-20240629.patch.gz.asc 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.5-20240629.patch.gz.asc 2024-06-30 02:08:37.000000000 +0200 @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNATURE----- +Comment: See https://invisible-island.net/public/public.html for info + +iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmaAogQACgkQzCr0RyFn +vgP8agv+Mb2cpJLYG8VOPRzlX7/Boq6pttTqK7Xj72A0xLS9m8xipVeMR7+j6DMY +IfBZbpkEeRlxTME62acfWzU5JrEXNZiz6JdIRaWEhAZ4zinMAHqLLlVZ9DXq2aa7 +qBDkMirjvmzhLBh8c+PloL3UrJI7E5JH9BeHLFZ1Tqwzp/tyDTVDGcTd1SDlkG36 +DDW3LMUw7Uq8Xb5YQ7NOpVxKLMv7KMDxrkE6vEHGLER/HGTSxfu4IOL8HN0BJQE7 +i9S4aZe4uZP5kZkdbN1icesKHC8MXzwANoBROZDizdwBj4r/HpfCt6X5oivaaJfB +jhyL2csLvNdeNU06IMtFeJVnmCPO6/S5ongSIRrWl1LGZuXRs6wrXuFHriyC0ZQc +I8+QlxtLuHyEjnBvQa7MdoBEuFXvu7BVBzY2w6FXMkZi6pAugUe+S5JB0cmlcIvS +jzcL8/d45Uw8GdL0fKNcdn3S29Ies89p31kPvCNKROVkmRh4eNUm1YIsYMQeSLbT +8JE2P+2T +=Jxgn +-----END PGP SIGNATURE----- ++++++ tack-1.09-20230201.tgz -> tack-1.10-20240501.tgz ++++++ ++++ 8990 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.09-20230201/CHANGES new/tack-1.10-20240501/CHANGES --- old/tack-1.09-20230201/CHANGES 2023-02-02 01:56:51.000000000 +0100 +++ new/tack-1.10-20240501/CHANGES 2024-05-01 23:42:01.000000000 +0200 @@ -1,3 +1,64 @@ +2024-05-01 Thomas E. Dickey <dickey@invisible-island.net> + + * init.c, configure.in: bump + + * configure: regen + + * configure.in: + add a configure-check if terminfo functions use "const" strings, to fix + compiler warnings with NetBSD + + * init.c, edit.c: gcc warning (NetBSD) + + * package/tack.spec, package/debian/changelog, tack.h, HISTORY: + bump to 1.10 + + * package/debian/changelog, package/tack.spec, tack.h: bump + + * edit.c: + check to avoid printing a non-printable character, per Coverity + + * tack.c: initialize variables, per Coverity + + * configure: regen + + * aclocal.m4: + correction for CF_ANSI_CC_CHECK, works around MacOS "c89" confusion of "-O" + +2024-04-30 Thomas E. Dickey <dickey@invisible-island.net> + + * tack.1: change limit for SGR tool to allow for aixterm's colors + + * ansi.c: change the SGR tool to show up to 120 (past aixterm's 108) + + * color.c: + when reloading the colors 0-7, use the index for the named color rather than + just the array-index (fixing an interchanged red/blue for instance). + Also, initialize the palette using the ANSI codes if the terminal supports + setaf/setab. + + * color.c, charset.c, ansi.c, edit.c, crum.c, pad.c, tack.c, tack.h: + use "const" in a few places reported by cppcheck + + * tack.1: improve formatting/style + + * package/debian/changelog, package/tack.spec: bump + +2024-01-07 Thomas E. Dickey <dickey@invisible-island.net> + + * configure: regen + + * aclocal.m4: + resync with my-autoconf, fixing compiler-warnings inside configure script + +2023-12-27 Thomas E. Dickey <dickey@invisible-island.net> + + * config.sub: 2023-12-27 + +2023-12-02 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess: 2023-12-02 + 2023-02-01 Thomas E. Dickey <dickey@invisible-island.net> * configure: regen 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.09-20230201/HISTORY new/tack-1.10-20240501/HISTORY --- old/tack-1.09-20230201/HISTORY 2020-02-02 17:33:29.000000000 +0100 +++ new/tack-1.10-20240501/HISTORY 2024-05-01 22:29:44.000000000 +0200 @@ -1,6 +1,7 @@ Current history: +2024/05/01 1.10 Many portability fixes. 2020/02/02 1.09 Update copyright and license. Also, portability fixes. 2017/07/26 1.08 Reduce reliance on ncurses internals. 2009/12/26 1.07 Fix an allocation-size. 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.09-20230201/ansi.c new/tack-1.10-20240501/ansi.c --- old/tack-1.09-20230201/ansi.c 2020-02-02 15:47:18.000000000 +0100 +++ new/tack-1.10-20240501/ansi.c 2024-05-01 01:49:43.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: ansi.c,v 1.20 2020/02/02 14:47:18 tom Exp $") +MODULE_ID("$Id: ansi.c,v 1.22 2024/04/30 23:49:43 tom Exp $") /* * Standalone tests for ANSI terminals. Three entry points: @@ -630,6 +630,10 @@ } } +#define MAX_SGR 120 +#define LEN_SGR 10 +#define FMT_SGR "Mode %3d " + /* ** display_sgr() ** @@ -643,15 +647,15 @@ temp[0] = (char) puc; temp[1] = '\0'; - for (k = 0; k < 80; k++) { - if (char_count + 8 > 80) + for (k = 0; k < MAX_SGR; k++) { + if (char_count + LEN_SGR > 80) put_crlf(); - else if (char_count + 8 > columns) + else if (char_count + LEN_SGR > columns) put_crlf(); else if (k > 0) printf(" "); - printf("\033[%s%dmMode %2d\033[0m", temp, k, k); - char_count += 8; + printf("\033[%s%dm" FMT_SGR "\033[0m", temp, k, k); + char_count += LEN_SGR; if (puc == '\0') { if (k == 19) printf("\033[10m"); @@ -752,7 +756,7 @@ ** select a graphics character set for ANSI terminals */ static void -select_bank(char *bank) +select_bank(const char *bank) { tc_putp(bank); switch (bank[1] & 3) { 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.09-20230201/charset.c new/tack-1.10-20240501/charset.c --- old/tack-1.09-20230201/charset.c 2020-02-02 15:47:18.000000000 +0100 +++ new/tack-1.10-20240501/charset.c 2024-04-30 21:58:07.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: charset.c,v 1.28 2020/02/02 14:47:18 tom Exp $") +MODULE_ID("$Id: charset.c,v 1.29 2024/04/30 19:58:07 tom Exp $") /* Menu definitions for alternate character set and SGR tests. @@ -126,7 +126,7 @@ { int i, max; char *s; - static char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; + static const char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; if (has_status_line != 1) { return; @@ -160,7 +160,7 @@ { int i, max; char *s; - static char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; + static const char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; if (has_status_line != 1) { return; 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.09-20230201/color.c new/tack-1.10-20240501/color.c --- old/tack-1.09-20230201/color.c 2020-02-02 15:47:18.000000000 +0100 +++ new/tack-1.10-20240501/color.c 2024-05-01 01:27:09.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: color.c,v 1.17 2020/02/02 14:47:18 tom Exp $") +MODULE_ID("$Id: color.c,v 1.19 2024/04/30 23:27:09 tom Exp $") /* * Color terminal tests. Has only one entry point: test_color(). @@ -46,6 +46,10 @@ }; /* *INDENT-ON* */ +/* + * curses.h defines these names, but with different values. These values + * correspond to a pre-ANSI implementation. + */ #ifndef COLOR_BLACK #define COLOR_BLACK 0 #define COLOR_BLUE 1 @@ -278,6 +282,7 @@ static void init_palette(void) { + /* this table uses the old, pre-ANSI color order */ static const int dft_fg_color[] = { COLOR_BLACK, @@ -301,7 +306,10 @@ colors_per_line = 0; for (n = 0; n < MAX_PAIR; ++n) { - fg_color[n] = (n < 8) ? dft_fg_color[n] : COLOR_BLACK; + /* with ANSI colors, the index is the same as the color number */ + fg_color[n] = ((n < 8) + ? (set_a_foreground ? n : dft_fg_color[n]) + : COLOR_BLACK); bg_color[n] = COLOR_BLACK; } } @@ -489,7 +497,7 @@ dump_colors(void) { /* display the colors in some esthetic pattern */ - static int xmap[8] = + static const int xmap[8] = {0, 3, 4, 7, 1, 2, 5, 6}; int xi, xj, width, p, cs; int found_one; @@ -787,15 +795,17 @@ /* redisplay the above test with reinitialized colors */ /* If these colors don't look right to you... */ for (i = 0; i < j; i++) { - sprintf(temp, " %s ", def_colors[i ^ 7].name); + int i7 = i ^ 7; + + sprintf(temp, " %s ", def_colors[i7].name); - new_color(i ^ 7, COLOR_BLACK, TRUE); + new_color(def_colors[i7].index, COLOR_BLACK, TRUE); put_str(temp); new_color(COLOR_BLACK, COLOR_BLACK, TRUE); put_str(" "); - new_color(COLOR_BLACK, i ^ 7, TRUE); + new_color(COLOR_BLACK, def_colors[i7].index, TRUE); put_str(temp); new_color(COLOR_WHITE, COLOR_BLACK, FALSE); 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.09-20230201/configure.in new/tack-1.10-20240501/configure.in --- old/tack-1.09-20230201/configure.in 2023-02-02 01:50:59.000000000 +0100 +++ new/tack-1.10-20240501/configure.in 2024-05-01 23:41:32.000000000 +0200 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2017-2021,2023 Thomas E. Dickey * +dnl Copyright 2017-2023,2024 Thomas E. Dickey * dnl Copyright 2007-2015,2017 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.47 2023/02/02 00:50:59 tom Exp $ +dnl $Id: configure.in,v 1.49 2024/05/01 21:41:32 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). @@ -171,6 +171,26 @@ select \ ) +# check if the terminfo functions use const, as done by ncurses and NetBSD +AC_MSG_CHECKING(if terminfo string parameters are const) +AC_TRY_COMPILE([ +$ac_includes_default +#if defined(HAVE_TERM_H) +#include <term.h> +#elif defined(HAVE_NCURSES_TERM_H) +#include <ncurses/term.h> +#elif defined(HAVE_NCURSESW_TERM_H) +#include <ncursesw/term.h> +#else +#error no term.h found +#endif +extern char *tigetstr(const char *); +],[char *foo = tigetstr("cup"); (void) foo],[ +cf_terminfo_const=yes],[ +cf_terminfo_const=no]) +AC_MSG_RESULT($cf_terminfo_const) +test $cf_terminfo_const = yes && AC_DEFINE(NCURSES_CONST,const,[define to const if terminfo needs it]) + CF_SIG_ATOMIC_T CF_TERMIOS_TYPES 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.09-20230201/crum.c new/tack-1.10-20240501/crum.c --- old/tack-1.09-20230201/crum.c 2020-02-14 22:20:53.000000000 +0100 +++ new/tack-1.10-20240501/crum.c 2024-04-30 21:57:08.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017,2020 Thomas E. Dickey +** Copyright 2017,2020,2024 Thomas E. Dickey ** Copyright 1997-2011,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: crum.c,v 1.15 2020/02/14 21:20:53 tom Exp $") +MODULE_ID("$Id: crum.c,v 1.16 2024/04/30 19:57:08 tom Exp $") /* * Test cursor movement. @@ -188,7 +188,7 @@ static void display_it( int sel, - char *txt) + const char *txt) { int i, done_line; 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.09-20230201/edit.c new/tack-1.10-20240501/edit.c --- old/tack-1.09-20230201/edit.c 2020-02-14 22:13:30.000000000 +0100 +++ new/tack-1.10-20240501/edit.c 2024-05-01 22:42:06.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -24,7 +24,7 @@ #include <tack.h> -MODULE_ID("$Id: edit.c,v 1.48 2020/02/14 21:13:30 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.51 2024/05/01 20:42:06 tom Exp $") /* * These are adapted from tic.h @@ -250,7 +250,7 @@ char *result = 0; const NAME_TABLE *p = find_cap_by_index(num, STRING); if (p != 0) - result = tigetstr((char *) p->nt_name); + result = tigetstr((NCURSES_CONST char *) p->nt_name); return result; } @@ -357,7 +357,7 @@ */ static void mark_cap( - char *name, + const char *name, int flag) { NAME_TABLE const *nt; @@ -1469,7 +1469,10 @@ } else if (ch == '.') { dot = 1; } else { - sprintf(temp, "Illegal character: %c", ch); + if (REALPRINT(buf + j)) + sprintf(temp, "Illegal character: %c", ch); + else + sprintf(temp, "Illegal character: %#x", ch); ptextln(temp); ptext("General format: 99.9*/ "); generic_done_message(test, state, chp); 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.09-20230201/init.c new/tack-1.10-20240501/init.c --- old/tack-1.09-20230201/init.c 2020-02-20 22:54:47.000000000 +0100 +++ new/tack-1.10-20240501/init.c 2024-05-01 23:42:01.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2013,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -26,7 +26,7 @@ #include <tack.h> -MODULE_ID("$Id: init.c,v 1.41 2020/02/20 21:54:47 tom Exp $") +MODULE_ID("$Id: init.c,v 1.43 2024/05/01 21:42:01 tom Exp $") FILE *debug_fp; char temp[TEMP_SIZE]; @@ -226,9 +226,9 @@ int max_b = 200; int max_n = 200; int max_s = 200; - boolnames = calloc(max_b, sizeof(*boolnames)); - numnames = calloc(max_n, sizeof(*numnames)); - strnames = calloc(max_s, sizeof(*strnames)); + boolnames = calloc((size_t) max_b, sizeof(*boolnames)); + numnames = calloc((size_t) max_n, sizeof(*numnames)); + strnames = calloc((size_t) max_s, sizeof(*strnames)); while (fgets(buffer, sizeof(buffer) - 1, pp) != 0) { int mytype = BOOLEAN; if (*buffer != '\t') 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.09-20230201/package/debian/changelog new/tack-1.10-20240501/package/debian/changelog --- old/tack-1.09-20230201/package/debian/changelog 2023-02-02 01:33:41.000000000 +0100 +++ new/tack-1.10-20240501/package/debian/changelog 2024-05-01 22:33:35.000000000 +0200 @@ -1,3 +1,15 @@ +tack (1.10+20240501) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Wed, 01 May 2024 04:13:49 -0400 + +tack (1.09+20240430) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 30 Apr 2024 03:40:32 -0400 + tack (1.09+20230201) 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.09-20230201/package/tack.spec new/tack-1.10-20240501/package/tack.spec --- old/tack-1.09-20230201/package/tack.spec 2023-02-02 01:33:41.000000000 +0100 +++ new/tack-1.10-20240501/package/tack.spec 2024-05-01 22:34:01.000000000 +0200 @@ -1,9 +1,9 @@ Summary: terminfo action checker %global AppProgram tack -%global AppVersion 1.09 -%global AppPatched 20230201 +%global AppVersion 1.10 +%global AppPatched 20240501 %global MySite https://invisible-island.net -# $XTermId: tack.spec,v 1.31 2023/02/02 00:33:41 tom Exp $ +# $XTermId: tack.spec,v 1.34 2024/05/01 20:34:01 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppPatched} 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.09-20230201/pad.c new/tack-1.10-20240501/pad.c --- old/tack-1.09-20230201/pad.c 2020-11-28 16:53:32.000000000 +0100 +++ new/tack-1.10-20240501/pad.c 2024-04-30 21:56:36.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017,2020 Thomas E. Dickey +** Copyright 2017,2020,2024 Thomas E. Dickey ** Copyright 1997-2010,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -22,7 +22,7 @@ #include <tack.h> #include <time.h> -MODULE_ID("$Id: pad.c,v 1.18 2020/11/28 15:53:32 tom Exp $") +MODULE_ID("$Id: pad.c,v 1.19 2024/04/30 19:56:36 tom Exp $") /* test the pad counts on the terminal */ @@ -885,7 +885,7 @@ int *state, int *ch) { - static char xch1[] = + static const char xch1[] = "This line should not be garbled. It should be left justified."; if (enter_insert_mode || exit_insert_mode || 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.09-20230201/tack.1 new/tack-1.10-20240501/tack.1 --- old/tack-1.09-20230201/tack.1 2020-11-21 20:17:42.000000000 +0100 +++ new/tack-1.10-20240501/tack.1 2024-05-01 01:51:37.000000000 +0200 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020 Thomas E. Dickey * +.\" Copyright 2020,2024 Thomas E. Dickey * .\" Copyright 1997-2011,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,18 +27,46 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tack.1,v 1.9 2020/11/21 19:17:42 tom Exp $ -.TH tack 1 "" -.ie \n(.g .ds `` \(lq -.el .ds `` `` -.ie \n(.g .ds '' \(rq -.el .ds '' '' +.\" $Id: tack.1,v 1.11 2024/04/30 23:51:37 tom Exp $ +.TH tack 1 2024-04-30 "terminfo action checker" "User commands" .ds n 5 +. +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.ds ' \(aq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.ie t .ds ' \(aq +.el .ds ' ' +.\} +. +.ie n .ds CW R +.el \{ +.ie \n(.g .ds CW CR +.el .ds CW CW +.\} +. +.de Ex +.RS +7 +.PP +.nf +.ft \*(CW +.. +.de Ee +.fi +.ft R +.RE +.. .SH NAME -\fBtack\fR \- \fIterminfo\fR action checker +\fBtack\fR \- +\fIterminfo\fR action checker .SH SYNOPSIS \fBtack\fR [\-diltV] [term] -.br .SH DESCRIPTION The \fBtack\fR program has three purposes: .TP 4 @@ -101,7 +129,7 @@ If not present, then the $TERM environment variable will be used. .SH OVERVIEW Since \fBtack\fR is designed to test terminfo entries it is not possible -to rely on the correctness of the terminfo data base. +to rely on the correctness of the terminfo database. Because of this, the menuing system used with \fBtack\fR is very primitive. When a menu is printed, it will scroll the entire screen. To compensate for this verbose menu system, @@ -140,7 +168,8 @@ information about the terminal. Although these functions are not dependent on terminal type, you may wish to execute \fBtack\fR -with options \fI\-it\fR. This will turn off initialization +with options \fI\-it\fR. +This will turn off initialization and default the standard entries. .PP These tools may be reached from the main menu by selecting @@ -168,16 +197,20 @@ after a carriage return will be expanded to the up arrow format. For example on a standard ANSI terminal you may type: - - CR ESC [ c - +.PP +.Ex +\fICR ESC\fP [ c +.Ee +.PP and the response will be echoed as something like: - - ^[ [ ? 6 c +.PP +.Ex +^[ [ ? 6 c +.Ee .PP \fBANSI sgr display\fR: This test assumes you have an ANSI terminal. -It -goes through attribute numbers 0 to 79, displaying each in turn and using that +It goes through attribute numbers 0 to 119, +displaying each in turn and using that SGR number to write the text. This shows you which of the SGR modes are actually implemented by the terminal. @@ -193,9 +226,10 @@ determine what options are supported by your terminal. .PP \fBANSI character sets\fR: This test displays the character sets -available on a ANSI/VT-100 style terminal. +available on an ANSI/VT-100 style terminal. Character sets on a real VT-100 terminal are usually defined -with smacs=\\E(0 and rmacs=\\E(B. The first character after the +with smacs=\\E(0 and rmacs=\\E(B. +The first character after the escape defines the font bank. The second character defines the character set. @@ -204,7 +238,6 @@ Private use character sets are defined by the digits. Standard character sets are located in the alphabetic range. .SH VERIFYING AN EXISTING ENTRY -.PP You can verify the correctness of an entry with the \*(``begin testing\*('' function. This entry is the default action and will be chosen @@ -234,12 +267,10 @@ terminfo \fBtack\fR will ask you if you want to save the file to disc before it exits. The filename will be the same as the terminal name. -After the program exits you can run the tic(1M) compiler on the -new terminfo to install it in the terminfo data base. -.PP +After the program exits you can run the \fBtic\fR(1M) compiler on the +new terminfo to install it in the terminfo database. .SH CORRECTING PAD TIMINGS -.SS Theory of Overruns and Padding -.PP +.SS "Theory of Overruns and Padding" Some terminals require significant amounts of time (that is, more than one transmitted-character interval) to do screen updates that change large portions of the screen, such as screen clears, line insertions, @@ -298,9 +329,7 @@ (RTS/CTS handshaking does not have this problem because the UARTs are signal-connected and the "stop flow" is done at the lowest level, without software intervention). -.PP -.SS Timing your terminal -.PP +.SS "Timing your terminal" In order to get accurate timings from your terminal \fBtack\fR needs to know when the terminal has finished processing all the characters that were sent. @@ -312,13 +341,15 @@ This is the preferred method since the sequence is short. ANSI/VT-100 style terminals can mimic this handshake with the escape sequence that requests \*(``primary device attributes\*(''. - - ESC [ c - +.Ex +\fIESC\fP [ c +.Ee +.PP The terminal will respond with a sequence like: - - ESC [ ? 1 ; 0 c - +.Ex +\fIESC\fP [ ? 1 ; 0 c +.Ee +.PP \fBTack\fR assumes that (u9) is the enquire sequence and that (u8) is the acknowledge string. A VT-100 style terminal could set u9=\\E[c @@ -344,15 +375,14 @@ \fBTack\fR will test this sequence before running any of the pad tests or the function key tests. \fBTack\fR will ask you the following: - - Hit lower case g to start testing... - +.Ex +Hit lower case g to start testing... +.Ee +.PP After it sends this message it will send the enquire string. It will then read characters from the terminal until it sees the letter g. -.PP -.SS Testing and Repairing Pad Timings -.PP +.SS "Testing and Repairing Pad Timings" The pad timings in distributed terminfo entries are often incorrect. One major motivation for this program is to make it relatively easy to tune these @@ -399,14 +429,6 @@ System load will also effect the results (a heavily loaded system will not stress the terminal as much, possibly leading to pad timings that are too short). -.PP -.SH NOTE -The tests done at the beginning of the program are assumed to be correct later -in the code. -In particular, \fBtack\fR displays the number of lines and -columns indicated in the terminfo entry as part of its initial output. -If these values are wrong a large number of tests will fail or give incorrect -results. .SH FILES .TP 12 tack.log @@ -421,16 +443,18 @@ the new terminfo to a file. The file will have the same name as the terminal name. -.SH SEE ALSO -\fBterminfo\fR(\*n), \fBncurses\fR(3X), \fBtic\fR(1M), \fBinfocmp\fR(1M). -You should also have the documentation supplied by the terminal -manufacturer. +.SH NOTES +The tests done at the beginning of the program are assumed to be correct later +in the code. +In particular, \fBtack\fR displays the number of lines and +columns indicated in the terminfo entry as part of its initial output. +If these values are wrong a large number of tests will fail or give incorrect +results. .SH BUGS If the screen size is incorrect, many of the tests will fail. -.SH AUTHOR +.SH AUTHORS .na .hy 0 -.PP Concept, design, and original implementation by Daniel Weaver <dan.weaver@znyx.com>. .PP @@ -442,9 +466,10 @@ and to allow \fBtack\fP to work with other implementations of curses and terminfo than \fBncurses\fP. -.\"# -.\"# The following sets edit modes for GNU EMACS -.\"# Local Variables: -.\"# mode:nroff -.\"# fill-column:79 -.\"# End: +.SH SEE ALSO +\fBinfocmp\fR(1M), +\fBtic\fR(1M), +\fBncurses\fR(3X), +\fBterminfo\fR(\*n). +You should also have the documentation supplied by the terminal +manufacturer. 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.09-20230201/tack.c new/tack-1.10-20240501/tack.c --- old/tack-1.09-20230201/tack.c 2020-11-28 14:47:02.000000000 +0100 +++ new/tack-1.10-20240501/tack.c 2024-05-01 21:16:08.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 2017-2020,2024 Thomas E. Dickey ** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -23,7 +23,7 @@ #include <stdarg.h> #include <unistd.h> -MODULE_ID("$Id: tack.c,v 1.38 2020/11/28 13:47:02 tom Exp $") +MODULE_ID("$Id: tack.c,v 1.40 2024/05/01 19:16:08 tom Exp $") /* This program is designed to test terminfo, not curses. Therefore @@ -549,7 +549,7 @@ */ void show_usage( - char *name) + const char *name) { (void) fprintf(stderr, "usage: %s [-diltV] [term]\n", name); } @@ -566,7 +566,7 @@ MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION); - printf("Copyright 2017-2020 Thomas E. Dickey\n"); + printf("Copyright 2017-2024 Thomas E. Dickey\n"); printf("Copyright 1997-2017 Free Software Foundation, Inc.\n"); printf("Tack comes with NO WARRANTY, to the extent permitted by law.\n"); printf("You may redistribute copies of Tack under the terms of the\n"); @@ -627,7 +627,7 @@ main(int argc, char *argv[]) { #if TACK_CAN_EDIT - int i, j; + int i = 0, j = 0; #endif int ch; 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.09-20230201/tack.h new/tack-1.10-20240501/tack.h --- old/tack-1.09-20230201/tack.h 2023-02-02 01:33:41.000000000 +0100 +++ new/tack-1.10-20240501/tack.h 2024-05-01 22:33:12.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2017-2022,2023 Thomas E. Dickey +** Copyright 2017-2023,2024 Thomas E. Dickey ** Copyright 1997-2015,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.95 2023/02/02 00:33:41 tom Exp $ */ +/* $Id: tack.h,v 1.98 2024/05/01 20:33:12 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -27,8 +27,8 @@ /* terminfo action checker include file */ #define MAJOR_VERSION 1 -#define MINOR_VERSION 9 -#define PATCH_VERSION 20230201 +#define MINOR_VERSION 10 +#define PATCH_VERSION 20240501 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> @@ -456,7 +456,7 @@ #else #define TACKMSG(p) /* nothing */ #endif -extern void show_usage(char *); +extern void show_usage(const char *); extern void print_version(void); /* output.c */