ncurses 6.3 - patch 20220305

+ replace obsolescent "-gnatg" option with "-gnatwa" and "-gnatyg", to
  work around build problems with gnat 12.
+ update external links in Ada95.html
+ trim unused return-value from canonical_name().

diff --git a/Ada95/configure b/Ada95/configure
index dfb128ddfae990f827358bc519282dab5954f853..012719aa5290f473b5ebe1cbf2d9be716340d07d 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.84 .
+# From configure.in Revision: 1.85 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20210509.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20210509.
 #


@@ -15826,7 +15826,7 @@ fi
 
 if test "x$enable_warnings" = "xyes"; then
 
 
 if test "x$enable_warnings" = "xyes"; then
 

-       ADAFLAGS="$ADAFLAGS -gnatg"
+       ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"

 
 fi
 
 
 fi
 

diff --git a/Ada95/configure.in b/Ada95/configure.in
index a69c183302054781702e83f9117e2bd558ebb424..1fbd5935533868f58091340a85a4a3e17b77800f 100644 (file)
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
+dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *

 dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: configure.in,v 1.84 2021/10/30 20:47:52 tom Exp $
+dnl $Id: configure.in,v 1.85 2022/03/05 22:20:52 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see


@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)

-AC_REVISION($Revision: 1.84 $)
+AC_REVISION($Revision: 1.85 $)

 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -356,7 +356,7 @@ CF_DISABLE_ECHO
 
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 if test "x$enable_warnings" = "xyes"; then
 
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 if test "x$enable_warnings" = "xyes"; then

-       CF_ADD_ADAFLAGS(-gnatg)
+       CF_ADD_ADAFLAGS(-gnatwa -gnatyg)

 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

diff --git a/NEWS b/NEWS
index 68ee00e477cf4f062cc2d07b4d69fdffb4e8be6e..041bd45d63ead34d15075a29dbd42073a96360ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3782 2022/02/26 23:50:53 tom Exp $
+-- $Id: NEWS,v 1.3784 2022/03/05 22:15:20 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -46,6 +46,12 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20220305
+       + replace obsolescent "-gnatg" option with "-gnatwa" and "-gnatyg", to
+         work around build problems with gnat 12.
+       + update external links in Ada95.html
+       + trim unused return-value from canonical_name().
+

 20220226
        + fix issues found with coverity:
          + rewrite canonical_name() function of infocmp to ensure buffer size
 20220226
        + fix issues found with coverity:
          + rewrite canonical_name() function of infocmp to ensure buffer size

diff --git a/VERSION b/VERSION
index 1b5a4fdc1e6593e8ee070780cb91bf49942213f8..b0796aa3a5ff84c446f6d96600c730c556bca813 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.3     20220226
+5:0:10 6.3     20220305

diff --git a/configure b/configure
index 70a02f1d72b0ddaf05f6774de307c526f00eb37c..23589d23f46e257ab35bab9f1ad3a53d30a564e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.741 .
+# From configure.in Revision: 1.742 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20210509.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20210509.
 #


@@ -17253,7 +17253,7 @@ fi
 
 if test "x$enable_warnings" = "xyes"; then
 
 
 if test "x$enable_warnings" = "xyes"; then
 

-       ADAFLAGS="$ADAFLAGS -gnatg"
+       ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"

 
        if test "x$cf_with_cxx" = xyes ; then
 
 
        if test "x$cf_with_cxx" = xyes ; then
 

diff --git a/configure.in b/configure.in
index b27e83cef958ec8212d8f423ea212daaf90aeda0..d4af03b255a56e8cc0a76561a049da1adae3485a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.741 2022/01/23 00:11:08 tom Exp $
+dnl $Id: configure.in,v 1.742 2022/03/05 22:13:12 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see


@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)

-AC_REVISION($Revision: 1.741 $)
+AC_REVISION($Revision: 1.742 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1640,7 +1640,7 @@ AC_SUBST(INSTALL_OPT_P)
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 
 if test "x$enable_warnings" = "xyes"; then
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 
 if test "x$enable_warnings" = "xyes"; then

-       CF_ADD_ADAFLAGS(-gnatg)
+       CF_ADD_ADAFLAGS(-gnatwa -gnatyg)

        if test "x$cf_with_cxx" = xyes ; then
                CF_GXX_WARNINGS(Wno-unused)
        fi
        if test "x$cf_with_cxx" = xyes ; then
                CF_GXX_WARNINGS(Wno-unused)
        fi

diff --git a/dist.mk b/dist.mk
index 3c653a864f0a042a369632baf6e7a7c301621ee0..de245d5641f4920ccfdfa998ae3ef21e512886d2 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1468 2022/02/26 12:23:15 tom Exp $
+# $Id: dist.mk,v 1.1469 2022/03/05 12:07:05 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 3
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 3

-NCURSES_PATCH = 20220226
+NCURSES_PATCH = 20220305

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/doc/html/Ada95.html b/doc/html/Ada95.html
index 8154c3e02cc9edfd4a834fb64728887ec73b9dda..1affa3fbbab59cac3696257dd83cad4ec31033ea 100644 (file)
--- a/doc/html/Ada95.html
+++ b/doc/html/Ada95.html
@@ -1,7 +1,7 @@
 <!--
 <!--

-  $Id: Ada95.html,v 1.17 2021/09/04 10:52:55 tom Exp $
+  $Id: Ada95.html,v 1.18 2022/03/05 16:09:29 tom Exp $

   ****************************************************************************
   ****************************************************************************

-  * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2019-2021,2022 Thomas E. Dickey                                *

   * Copyright 2000-2010,2013 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * Copyright 2000-2010,2013 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -57,13 +57,13 @@
     ncurses package, a clone of the SVr4 curses model.<br>
     I did the development on an Intel box running the latest stable
     release of <a href="http://www.linux.org">Linux</a>, ncurses
     ncurses package, a clone of the SVr4 curses model.<br>
     I did the development on an Intel box running the latest stable
     release of <a href="http://www.linux.org">Linux</a>, ncurses

-    and the most recent released <a href="http://www.gnat.com">GNU
+    and the most recent released <a href="https://ftp.gnu.org/gnu/gcc/">GNU 

     Ada Translator</a> gnat versions. For any older versions of
     ncurses and gnat it is not guaranteed to work.</li>
 
     <li>You must have the m4 macroprocessor to build this package.
     If you don't have this program, you can get the FSF version
     Ada Translator</a> gnat versions. For any older versions of
     ncurses and gnat it is not guaranteed to work.</li>
 
     <li>You must have the m4 macroprocessor to build this package.
     If you don't have this program, you can get the FSF version

-    <a href="ftp://ftp.gnu.org/pub/gnu/">here</a>.</li>
+    <a href="https://ftp.gnu.org/pub/gnu/">here</a>.</li>

 
     <li>Ada programs are supposed to be readable. One of my
     favorite methods to make code readable is to use expressive
 
     <li>Ada programs are supposed to be readable. One of my
     favorite methods to make code readable is to use expressive

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index abab0a0e5f8130f2ef97b5f3a0ac966047fc8e48..3e07c2da53893fa0b28cd6e15b4cfa239dc5cdb8 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Feb 2022 07:23:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Mar 2022 07:07:05 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index abab0a0e5f8130f2ef97b5f3a0ac966047fc8e48..3e07c2da53893fa0b28cd6e15b4cfa239dc5cdb8 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Feb 2022 07:23:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Mar 2022 07:07:05 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index ef72f2f30c72f4c41193a6353df6e9741201c788..2d87630ff5ac2adc147f1bfd887d7efa089f0ddb 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Feb 2022 07:23:15 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Mar 2022 07:07:05 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 09cca7d3adf44a9cb541e48fb478a3f1a60c952f..a450b8a6133734fa59878e67307b4a85d87c79a2 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.508 2022/02/26 12:23:15 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.509 2022/03/05 12:07:05 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "3"\r
 !define VERSION_YYYY  "2022"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "3"\r
 !define VERSION_YYYY  "2022"\r

-!define VERSION_MMDD  "0226"\r
+!define VERSION_MMDD  "0305"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index f904d9a8fc231d92508e9eb73d76d412bfec4f5f..8e5f74d3590a894761bf92f78627ab103e0e3f1e 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.3
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.3

-Release: 20220226
+Release: 20220305

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 95314868496cd657dde9466242722a97c791037d..27d62fc48ca3e00b4f69e1df1b71b659d48555a8 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.3
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.3

-Release: 20220226
+Release: 20220305

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 2367c2e156e91e2648ffaf657a399dee7d07abe7..0061503b520f30fa962e2994d9abde0b531a711b 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.3
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.3

-Release: 20220226
+Release: 20220305

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/infocmp.c b/progs/infocmp.c
index d2f5eabe8847c81b4752b5a82d7fda4be0eeb3ad..0ee0b958bd1c902567b3e4553358b88dc7ab4490 100644 (file)
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -43,7 +43,7 @@
 
 #include <dump_entry.h>
 
 
 #include <dump_entry.h>
 

-MODULE_ID("$Id: infocmp.c,v 1.152 2022/02/26 23:25:55 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.153 2022/03/05 16:15:48 tom Exp $")

 
 #define MAX_STRING     1024    /* maximum formatted string */
 
 
 #define MAX_STRING     1024    /* maximum formatted string */
 


@@ -124,7 +124,7 @@ failed(const char *s)
     ExitProgram(EXIT_FAILURE);
 }
 
     ExitProgram(EXIT_FAILURE);
 }
 

-static char *
+static void

 canonical_name(char *source, char *target)
 /* extract the terminal type's primary name */
 {
 canonical_name(char *source, char *target)
 /* extract the terminal type's primary name */
 {


@@ -137,8 +137,6 @@ canonical_name(char *source, char *target)
        *target++ = ch;
     }
     *target = '\0';
        *target++ = ch;
     }
     *target = '\0';

-
-    return (target);

 }
 
 static bool
 }
 
 static bool


@@ -1136,8 +1134,8 @@ file_comparison(int argc, char *argv[])
            if (entryeq(&qp->tterm, &rp->tterm) && useeq(qp, rp)) {
                char name1[NAMESIZE], name2[NAMESIZE];
 
            if (entryeq(&qp->tterm, &rp->tterm) && useeq(qp, rp)) {
                char name1[NAMESIZE], name2[NAMESIZE];
 

-               (void) canonical_name(qp->tterm.term_names, name1);
-               (void) canonical_name(rp->tterm.term_names, name2);
+               canonical_name(qp->tterm.term_names, name1);
+               canonical_name(rp->tterm.term_names, name2);

 
                (void) printf("%s = %s\n", name1, name2);
            }
 
                (void) printf("%s = %s\n", name1, name2);
            }


@@ -1165,8 +1163,8 @@ file_comparison(int argc, char *argv[])
                entries[0] = *qp;
                entries[1] = *rp;
 
                entries[0] = *qp;
                entries[1] = *rp;
 

-               (void) canonical_name(qp->tterm.term_names, name1);
-               (void) canonical_name(rp->tterm.term_names, name2);
+               canonical_name(qp->tterm.term_names, name1);
+               canonical_name(rp->tterm.term_names, name2);

 
                switch (compare) {
                case C_DIFFERENCE:
 
                switch (compare) {
                case C_DIFFERENCE: