# ncurses 6.3 - patch 20220305 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.3 is at
# ftp://ftp.invisible-island.net/ncurses/
# https://invisible-mirror.net/archives/ncurses/
# https://ftp.gnu.org/gnu/ncurses/
#
# Patches for ncurses 6.3 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.3
# https://invisible-mirror.net/archives/ncurses/6.3
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220305.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Mar 6 02:01:23 UTC 2022
# ------------------------------------------------------------------------------
# Ada95/configure | 4 ++--
# Ada95/configure.in | 8 ++++----
# NEWS | 8 +++++++-
# VERSION | 2 +-
# configure | 4 ++--
# configure.in | 6 +++---
# dist.mk | 4 ++--
# doc/html/Ada95.html | 8 ++++----
# 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 +-
# progs/infocmp.c | 14 ++++++--------
# 16 files changed, 42 insertions(+), 38 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/configure
--- ncurses-6.3-20220226+/Ada95/configure 2022-01-29 22:07:15.000000000 +0000
+++ ncurses-6.3-20220305/Ada95/configure 2022-03-05 22:27:52.000000000 +0000
@@ -1,5 +1,5 @@
#! /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.
#
@@ -15826,7 +15826,7 @@
if test "x$enable_warnings" = "xyes"; then
- ADAFLAGS="$ADAFLAGS -gnatg"
+ ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"
fi
Index: Ada95/configure.in
Prereq: 1.84
--- ncurses-6.3-20220226+/Ada95/configure.in 2021-10-30 20:47:52.000000000 +0000
+++ ncurses-6.3-20220305/Ada95/configure.in 2022-03-05 22:20:52.000000000 +0000
@@ -1,5 +1,5 @@
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 *
@@ -29,7 +29,7 @@
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
@@ -38,7 +38,7 @@
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)
@@ -356,7 +356,7 @@
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
Index: NEWS
Prereq: 1.3782
--- ncurses-6.3-20220226+/NEWS 2022-02-26 23:50:53.000000000 +0000
+++ ncurses-6.3-20220305/NEWS 2022-03-05 22:15:20.000000000 +0000
@@ -26,7 +26,7 @@
-- 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
@@ -46,6 +46,12 @@
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
Index: VERSION
--- ncurses-6.3-20220226+/VERSION 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/VERSION 2022-03-05 12:07:05.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.3 20220226
+5:0:10 6.3 20220305
Index: configure
--- ncurses-6.3-20220226+/configure 2022-02-05 17:56:41.000000000 +0000
+++ ncurses-6.3-20220305/configure 2022-03-05 22:21:11.000000000 +0000
@@ -1,5 +1,5 @@
#! /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.
#
@@ -17253,7 +17253,7 @@
if test "x$enable_warnings" = "xyes"; then
- ADAFLAGS="$ADAFLAGS -gnatg"
+ ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"
if test "x$cf_with_cxx" = xyes ; then
Index: configure.in
Prereq: 1.741
--- ncurses-6.3-20220226+/configure.in 2022-01-23 00:11:08.000000000 +0000
+++ ncurses-6.3-20220305/configure.in 2022-03-05 22:13:12.000000000 +0000
@@ -29,7 +29,7 @@
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
@@ -38,7 +38,7 @@
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)
@@ -1640,7 +1640,7 @@
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
Index: dist.mk
Prereq: 1.1468
--- ncurses-6.3-20220226+/dist.mk 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/dist.mk 2022-03-05 12:07:05.000000000 +0000
@@ -26,7 +26,7 @@
# 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
@@ -38,7 +38,7 @@
# 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)
Index: doc/html/Ada95.html
Prereq: 1.17
--- ncurses-6.3-20220226+/doc/html/Ada95.html 2021-09-04 10:52:55.000000000 +0000
+++ ncurses-6.3-20220305/doc/html/Ada95.html 2022-03-05 16:09:29.000000000 +0000
@@ -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 *
@@ -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
- 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
- <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
Index: package/debian-mingw/changelog
--- ncurses-6.3-20220226+/package/debian-mingw/changelog 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/debian-mingw/changelog 2022-03-05 12:07:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low
* 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
Index: package/debian-mingw64/changelog
--- ncurses-6.3-20220226+/package/debian-mingw64/changelog 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/debian-mingw64/changelog 2022-03-05 12:07:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low
* 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
Index: package/debian/changelog
--- ncurses-6.3-20220226+/package/debian/changelog 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/debian/changelog 2022-03-05 12:07:05.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220226) unstable; urgency=low
+ncurses6 (6.3+20220305) unstable; urgency=low
* 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
Index: package/mingw-ncurses.nsi
Prereq: 1.508
--- ncurses-6.3-20220226+/package/mingw-ncurses.nsi 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/mingw-ncurses.nsi 2022-03-05 12:07:05.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.508 2022/02/26 12:23:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.509 2022/03/05 12:07:05 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "3"
!define VERSION_YYYY "2022"
-!define VERSION_MMDD "0226"
+!define VERSION_MMDD "0305"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.3-20220226+/package/mingw-ncurses.spec 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/mingw-ncurses.spec 2022-03-05 12:07:05.000000000 +0000
@@ -3,7 +3,7 @@
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
Index: package/ncurses.spec
--- ncurses-6.3-20220226+/package/ncurses.spec 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/ncurses.spec 2022-03-05 12:07:05.000000000 +0000
@@ -1,7 +1,7 @@
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
Index: package/ncursest.spec
--- ncurses-6.3-20220226+/package/ncursest.spec 2022-02-26 12:23:15.000000000 +0000
+++ ncurses-6.3-20220305/package/ncursest.spec 2022-03-05 12:07:05.000000000 +0000
@@ -1,7 +1,7 @@
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
Index: progs/infocmp.c
Prereq: 1.152
--- ncurses-6.3-20220226+/progs/infocmp.c 2022-02-26 23:25:55.000000000 +0000
+++ ncurses-6.3-20220305/progs/infocmp.c 2022-03-05 16:15:48.000000000 +0000
@@ -43,7 +43,7 @@
#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 */
@@ -124,7 +124,7 @@
ExitProgram(EXIT_FAILURE);
}
-static char *
+static void
canonical_name(char *source, char *target)
/* extract the terminal type's primary name */
{
@@ -137,8 +137,6 @@
*target++ = ch;
}
*target = '\0';
-
- return (target);
}
static bool
@@ -1136,8 +1134,8 @@
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);
}
@@ -1165,8 +1163,8 @@
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:
