1# ncurses 6.1 - patch 20191019 - Thomas E. Dickey 2# 3# ------------------------------------------------------------------------------ 4# 5# Ncurses 6.1 is at 6# ftp.gnu.org:/pub/gnu 7# 8# Patches for ncurses 6.1 can be found at 9# ftp://ftp.invisible-island.net/ncurses/6.1 10# http://invisible-mirror.net/archives/ncurses/6.1 11# 12# ------------------------------------------------------------------------------ 13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191019.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Oct 20 01:10:33 UTC 2019 16# ------------------------------------------------------------------------------ 17# NEWS | 9 ++++++++- 18# VERSION | 2 +- 19# dist.mk | 4 ++-- 20# ncurses/tinfo/comp_parse.c | 6 +++--- 21# ncurses/tinfo/make_hash.c | 7 ++----- 22# package/debian-mingw/changelog | 4 ++-- 23# package/debian-mingw64/changelog | 4 ++-- 24# package/debian/changelog | 4 ++-- 25# package/mingw-ncurses.nsi | 4 ++-- 26# package/mingw-ncurses.spec | 2 +- 27# package/ncurses.spec | 2 +- 28# package/ncursest.spec | 2 +- 29# 12 files changed, 27 insertions(+), 23 deletions(-) 30# ------------------------------------------------------------------------------ 31Index: NEWS 32Prereq: 1.3393 33--- ncurses-6.1-20191015+/NEWS 2019-10-16 00:04:31.000000000 +0000 34+++ ncurses-6.1-20191019/NEWS 2019-10-19 21:16:45.000000000 +0000 35@@ -25,7 +25,7 @@ 36 -- sale, use or other dealings in this Software without prior written -- 37 -- authorization. -- 38 ------------------------------------------------------------------------------- 39--- $Id: NEWS,v 1.3393 2019/10/16 00:04:31 tom Exp $ 40+-- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $ 41 ------------------------------------------------------------------------------- 42 43 This is a log of changes that ncurses has gone through since Zeyd started 44@@ -45,6 +45,13 @@ 45 Changes through 1.9.9e did not credit all contributions; 46 it is not possible to add this information. 47 48+20191019 49+ + modify make_hash to not require --disable-leaks, to simplify building 50+ with address-sanitizer. 51+ + modify tic to exit if it cannot remove a conflicting name, because 52+ treating that as a partial success can cause an infinite loop in 53+ use-resolution (report/testcase by Hongxu Chen, cf: 20111001). 54+ 55 20191015 56 + improve buffer-checks in captoinfo.c, for some cases when the 57 input string is shorter than expected. 58Index: VERSION 59--- ncurses-6.1-20191015+/VERSION 2019-10-15 21:46:57.000000000 +0000 60+++ ncurses-6.1-20191019/VERSION 2019-10-19 12:47:53.000000000 +0000 61@@ -1 +1 @@ 62-5:0:10 6.1 20191015 63+5:0:10 6.1 20191019 64Index: dist.mk 65Prereq: 1.1310 66--- ncurses-6.1-20191015+/dist.mk 2019-10-15 21:46:57.000000000 +0000 67+++ ncurses-6.1-20191019/dist.mk 2019-10-19 12:47:53.000000000 +0000 68@@ -25,7 +25,7 @@ 69 # use or other dealings in this Software without prior written # 70 # authorization. # 71 ############################################################################## 72-# $Id: dist.mk,v 1.1310 2019/10/15 21:46:57 tom Exp $ 73+# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $ 74 # Makefile for creating ncurses distributions. 75 # 76 # This only needs to be used directly as a makefile by developers, but 77@@ -37,7 +37,7 @@ 78 # These define the major/minor/patch versions of ncurses. 79 NCURSES_MAJOR = 6 80 NCURSES_MINOR = 1 81-NCURSES_PATCH = 20191015 82+NCURSES_PATCH = 20191019 83 84 # We don't append the patch to the version, since this only applies to releases 85 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 86Index: ncurses/tinfo/comp_parse.c 87Prereq: 1.106 88--- ncurses-6.1-20191015+/ncurses/tinfo/comp_parse.c 2018-05-26 14:16:46.000000000 +0000 89+++ ncurses-6.1-20191019/ncurses/tinfo/comp_parse.c 2019-10-19 20:47:43.000000000 +0000 90@@ -1,5 +1,5 @@ 91 /**************************************************************************** 92- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 93+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 94 * * 95 * Permission is hereby granted, free of charge, to any person obtaining a * 96 * copy of this software and associated documentation files (the * 97@@ -47,7 +47,7 @@ 98 99 #include <tic.h> 100 101-MODULE_ID("$Id: comp_parse.c,v 1.106 2018/05/26 14:16:46 tom Exp $") 102+MODULE_ID("$Id: comp_parse.c,v 1.107 2019/10/19 20:47:43 tom Exp $") 103 104 static void sanity_check2(TERMTYPE2 *, bool); 105 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2; 106@@ -180,11 +180,11 @@ 107 ++qend; 108 while ((*qstart++ = *qend++) != '\0') ; 109 fprintf(stderr, "...now\t%s\n", p2); 110+ removed = TRUE; 111 } else { 112 fprintf(stderr, "Cannot remove alias '%.*s'\n", 113 (int) (qend - qstart), qstart); 114 } 115- removed = TRUE; 116 break; 117 } 118 } 119Index: ncurses/tinfo/make_hash.c 120Prereq: 1.28 121--- ncurses-6.1-20191015+/ncurses/tinfo/make_hash.c 2019-07-27 23:06:54.000000000 +0000 122+++ ncurses-6.1-20191019/ncurses/tinfo/make_hash.c 2019-10-19 21:02:19.000000000 +0000 123@@ -43,7 +43,7 @@ 124 125 #include <ctype.h> 126 127-MODULE_ID("$Id: make_hash.c,v 1.28 2019/07/27 23:06:54 tom Exp $") 128+MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $") 129 130 /* 131 * _nc_make_hash_table() 132@@ -164,13 +164,11 @@ 133 134 int col = 0; 135 136-#if NO_LEAKS 137 if (buffer == 0) { 138 free(list); 139 list = 0; 140 return 0; 141 } 142-#endif 143 144 if (*buffer != '#') { 145 if (list == 0) { 146@@ -433,12 +431,11 @@ 147 } 148 149 free(hash_table); 150-#if NO_LEAKS 151 for (n = 0; (n < tablesize); ++n) { 152 free((void *) name_table[n].ute_name); 153 } 154 free(name_table); 155 parse_columns(0); 156-#endif 157+ 158 return EXIT_SUCCESS; 159 } 160Index: package/debian-mingw/changelog 161--- ncurses-6.1-20191015+/package/debian-mingw/changelog 2019-10-15 21:46:57.000000000 +0000 162+++ ncurses-6.1-20191019/package/debian-mingw/changelog 2019-10-19 12:47:53.000000000 +0000 163@@ -1,8 +1,8 @@ 164-ncurses6 (6.1+20191015) unstable; urgency=low 165+ncurses6 (6.1+20191019) unstable; urgency=low 166 167 * latest weekly patch 168 169- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400 170+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400 171 172 ncurses6 (5.9-20131005) unstable; urgency=low 173 174Index: package/debian-mingw64/changelog 175--- ncurses-6.1-20191015+/package/debian-mingw64/changelog 2019-10-15 21:46:57.000000000 +0000 176+++ ncurses-6.1-20191019/package/debian-mingw64/changelog 2019-10-19 12:47:53.000000000 +0000 177@@ -1,8 +1,8 @@ 178-ncurses6 (6.1+20191015) unstable; urgency=low 179+ncurses6 (6.1+20191019) unstable; urgency=low 180 181 * latest weekly patch 182 183- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400 184+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400 185 186 ncurses6 (5.9-20131005) unstable; urgency=low 187 188Index: package/debian/changelog 189--- ncurses-6.1-20191015+/package/debian/changelog 2019-10-15 21:46:57.000000000 +0000 190+++ ncurses-6.1-20191019/package/debian/changelog 2019-10-19 12:47:53.000000000 +0000 191@@ -1,8 +1,8 @@ 192-ncurses6 (6.1+20191015) unstable; urgency=low 193+ncurses6 (6.1+20191019) unstable; urgency=low 194 195 * latest weekly patch 196 197- -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Oct 2019 17:46:57 -0400 198+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2019 08:47:53 -0400 199 200 ncurses6 (5.9-20120608) unstable; urgency=low 201 202Index: package/mingw-ncurses.nsi 203Prereq: 1.356 204--- ncurses-6.1-20191015+/package/mingw-ncurses.nsi 2019-10-15 21:46:57.000000000 +0000 205+++ ncurses-6.1-20191019/package/mingw-ncurses.nsi 2019-10-19 12:47:53.000000000 +0000 206@@ -1,4 +1,4 @@ 207-; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $ 208+; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $ 209 210 ; TODO add examples 211 ; TODO bump ABI to 6 212@@ -10,7 +10,7 @@ 213 !define VERSION_MAJOR "6" 214 !define VERSION_MINOR "1" 215 !define VERSION_YYYY "2019" 216-!define VERSION_MMDD "1015" 217+!define VERSION_MMDD "1019" 218 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 219 220 !define MY_ABI "5" 221Index: package/mingw-ncurses.spec 222--- ncurses-6.1-20191015+/package/mingw-ncurses.spec 2019-10-15 21:46:57.000000000 +0000 223+++ ncurses-6.1-20191019/package/mingw-ncurses.spec 2019-10-19 12:47:53.000000000 +0000 224@@ -3,7 +3,7 @@ 225 Summary: shared libraries for terminal handling 226 Name: mingw32-ncurses6 227 Version: 6.1 228-Release: 20191015 229+Release: 20191019 230 License: X11 231 Group: Development/Libraries 232 Source: ncurses-%{version}-%{release}.tgz 233Index: package/ncurses.spec 234--- ncurses-6.1-20191015+/package/ncurses.spec 2019-10-15 21:46:57.000000000 +0000 235+++ ncurses-6.1-20191019/package/ncurses.spec 2019-10-19 12:47:53.000000000 +0000 236@@ -1,7 +1,7 @@ 237 Summary: shared libraries for terminal handling 238 Name: ncurses6 239 Version: 6.1 240-Release: 20191015 241+Release: 20191019 242 License: X11 243 Group: Development/Libraries 244 Source: ncurses-%{version}-%{release}.tgz 245Index: package/ncursest.spec 246--- ncurses-6.1-20191015+/package/ncursest.spec 2019-10-15 21:46:57.000000000 +0000 247+++ ncurses-6.1-20191019/package/ncursest.spec 2019-10-19 12:47:53.000000000 +0000 248@@ -1,7 +1,7 @@ 249 Summary: Curses library with POSIX thread support. 250 Name: ncursest6 251 Version: 6.1 252-Release: 20191015 253+Release: 20191019 254 License: X11 255 Group: Development/Libraries 256 Source: ncurses-%{version}-%{release}.tgz 257