ncurses 6.1 - patch 20191019

+ modify make_hash to not require --disable-leaks, to simplify building
  with address-sanitizer.
+ modify tic to exit if it cannot remove a conflicting name, because
  treating that as a partial success can cause an infinite loop in
  use-resolution (report/testcase by Hongxu Chen, cf: 20111001).

diff --git a/NEWS b/NEWS
index 509ff3feadeb9be7cc2e2d1c43c7cdb6b11beb5d..5244cbb713cc5fa6c9320c22487f3d6ac3df54ed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 tom Exp $
+-- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,13 @@ 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.
 
+20191019
+       + modify make_hash to not require --disable-leaks, to simplify building
+         with address-sanitizer.
+       + modify tic to exit if it cannot remove a conflicting name, because
+         treating that as a partial success can cause an infinite loop in
+         use-resolution (report/testcase by Hongxu Chen, cf: 20111001).
+
 20191015
        + improve buffer-checks in captoinfo.c, for some cases when the
          input string is shorter than expected.

diff --git a/VERSION b/VERSION
index 0e4e4761acde22ed5a3f2743d4bcb1a280e107c4..56fbfa2d7341b2c7a8b85fe4f40c91f13ff169cc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20191015
+5:0:10 6.1     20191019

diff --git a/dist.mk b/dist.mk
index 66ba0ddfa26ade0765ef18e478581315d5dffeff..13d3daa11d718059cc05cf9d859950c70868b1e9 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 tom Exp $
+# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
-NCURSES_PATCH = 20191015
+NCURSES_PATCH = 20191019
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 24c4852dcedf026cc54397de4c1740a51ac81bdb..52901f13af53e2db3dd262d88e07ec32cef8d43d 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *
@@ -47,7 +47,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.106 2018/05/26 14:16:46 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.107 2019/10/19 20:47:43 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
@@ -180,11 +180,11 @@ remove_collision(char *n1, char *n2)
                        ++qend;
                    while ((*qstart++ = *qend++) != '\0') ;
                    fprintf(stderr, "...now\t%s\n", p2);
+                   removed = TRUE;
                } else {
                    fprintf(stderr, "Cannot remove alias '%.*s'\n",
                            (int) (qend - qstart), qstart);
                }
-               removed = TRUE;
                break;
            }
        }

diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index d5f941825a907f85d9d015f554c2944d9b5efc3d..906dfafa29fa12128c9b30e56b93bd1fadf86ec0 100644 (file)
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -43,7 +43,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: make_hash.c,v 1.28 2019/07/27 23:06:54 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $")
 
 /*
  *     _nc_make_hash_table()
@@ -164,13 +164,11 @@ parse_columns(char *buffer)
 
     int col = 0;
 
-#if NO_LEAKS
     if (buffer == 0) {
        free(list);
        list = 0;
        return 0;
     }
-#endif
 
     if (*buffer != '#') {
        if (list == 0) {
@@ -433,12 +431,11 @@ main(int argc, char **argv)
     }
 
     free(hash_table);
-#if NO_LEAKS
     for (n = 0; (n < tablesize); ++n) {
        free((void *) name_table[n].ute_name);
     }
     free(name_table);
     parse_columns(0);
-#endif
+
     return EXIT_SUCCESS;
 }

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 65032439896b8ab716bee52174fd2ba610522a5d..d989a882d3133aea8265d7ed249b13f0c7a33546 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2019 08:47:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 65032439896b8ab716bee52174fd2ba610522a5d..d989a882d3133aea8265d7ed249b13f0c7a33546 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2019 08:47:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 08605a4f78ff44f4ca3f18464618c3e21dc3cd8a..5d9407bea1e51b8af7cb2101524e08424bbb2a0e 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191015) unstable; urgency=low
+ncurses6 (6.1+20191019) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 15 Oct 2019 17:46:57 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Oct 2019 08:47:53 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d91112de35fc4d04d129bfaf9928af360721ccbe..477c8e636f58ac6d640626186efee9d6b8fc66b6 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r
-!define VERSION_MMDD  "1015"\r
+!define VERSION_MMDD  "1019"\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 8f10c47550005f14d4362f243a4f1d42ac7d72fb..0a21e21157da050e470ef32d4600a03a196ef6a4 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.1
-Release: 20191015
+Release: 20191019
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 84b734cef16b1bf9b7e3a62300ab753417211613..f8e10072e972c3eabd8ecb3e06d60bdf53c626d7 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20191015
+Release: 20191019
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 94556487547ef3154a9d901d81aa284667307080..dc2a7cda27b45ad7f36d357bb4f8e463c99fa06d 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.1
-Release: 20191015
+Release: 20191019
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz