rpms/ncurses
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6.1.20200118-2mamba
ncurses/ncurses-6.1-20191019.patch

257 lines
9.4 KiB
Diff
Raw Permalink Normal View History

postrans workaround to fix libtinfo.so.6 disappearing on upgrade [release 6.1.20200118-2mamba;Mon Feb 10 2020]
2024-01-06 07:33:58 +01:00
# ncurses 6.1 - patch 20191019 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.1 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.1 can be found at
# ftp://ftp.invisible-island.net/ncurses/6.1
# http://invisible-mirror.net/archives/ncurses/6.1
#
# ------------------------------------------------------------------------------
# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20191019.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 20 01:10:33 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 9 ++++++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# ncurses/tinfo/comp_parse.c | 6 +++---
# ncurses/tinfo/make_hash.c | 7 ++-----
# 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 +-
# 12 files changed, 27 insertions(+), 23 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3393
--- ncurses-6.1-20191015+/NEWS 2019-10-16 00:04:31.000000000 +0000
+++ ncurses-6.1-20191019/NEWS 2019-10-19 21:16:45.000000000 +0000
@@ -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 @@
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.
Index: VERSION
--- ncurses-6.1-20191015+/VERSION 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/VERSION 2019-10-19 12:47:53.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20191015
+5:0:10 6.1 20191019
Index: dist.mk
Prereq: 1.1310
--- ncurses-6.1-20191015+/dist.mk 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/dist.mk 2019-10-19 12:47:53.000000000 +0000
@@ -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 @@
# 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)
Index: ncurses/tinfo/comp_parse.c
Prereq: 1.106
--- ncurses-6.1-20191015+/ncurses/tinfo/comp_parse.c 2018-05-26 14:16:46.000000000 +0000
+++ ncurses-6.1-20191019/ncurses/tinfo/comp_parse.c 2019-10-19 20:47:43.000000000 +0000
@@ -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 @@
++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;
}
}
Index: ncurses/tinfo/make_hash.c
Prereq: 1.28
--- ncurses-6.1-20191015+/ncurses/tinfo/make_hash.c 2019-07-27 23:06:54.000000000 +0000
+++ ncurses-6.1-20191019/ncurses/tinfo/make_hash.c 2019-10-19 21:02:19.000000000 +0000
@@ -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 @@
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 @@
}
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;
}
Index: package/debian-mingw/changelog
--- ncurses-6.1-20191015+/package/debian-mingw/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian-mingw/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -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
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20191015+/package/debian-mingw64/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian-mingw64/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -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
Index: package/debian/changelog
--- ncurses-6.1-20191015+/package/debian/changelog 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/debian/changelog 2019-10-19 12:47:53.000000000 +0000
@@ -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
Index: package/mingw-ncurses.nsi
Prereq: 1.356
--- ncurses-6.1-20191015+/package/mingw-ncurses.nsi 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/mingw-ncurses.nsi 2019-10-19 12:47:53.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.356 2019/10/15 21:46:57 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "1"
!define VERSION_YYYY "2019"
-!define VERSION_MMDD "1015"
+!define VERSION_MMDD "1019"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20191015+/package/mingw-ncurses.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/mingw-ncurses.spec 2019-10-19 12:47:53.000000000 +0000
@@ -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
Index: package/ncurses.spec
--- ncurses-6.1-20191015+/package/ncurses.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/ncurses.spec 2019-10-19 12:47:53.000000000 +0000
@@ -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
Index: package/ncursest.spec
--- ncurses-6.1-20191015+/package/ncursest.spec 2019-10-15 21:46:57.000000000 +0000
+++ ncurses-6.1-20191019/package/ncursest.spec 2019-10-19 12:47:53.000000000 +0000
@@ -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
Reference in New Issue Copy Permalink