Initialize for ncurses
This commit is contained in:
commit
eb92711357
19 changed files with 7160 additions and 0 deletions
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
ncurses-6.1-patches.tar.bz2
|
||||
ncurses-6.1.tar.gz
|
||||
tack-1.08-20170818.tgz
|
||||
3
.ncurses.metadata
Normal file
3
.ncurses.metadata
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
d587c3abbb943b2a1595e1a77e02a4421686b5f776f99e5648f536d8c5083a69 ncurses-6.1-patches.tar.bz2
|
||||
092945ca1e30b7e27edd0d85503d5c19cee8aa10b898e069e02d8c3b01f59a30 ncurses-6.1.tar.gz
|
||||
4fae20a4f2660731c4c27a26a983ab354661bd338bc2a861a90d1618a3a56762 tack-1.08-20170818.tgz
|
||||
35
CVE-2019-17594.patch
Normal file
35
CVE-2019-17594.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
Based on ncurses 6.1 - patch 20191012
|
||||
From: Thomas E. Dickey
|
||||
|
||||
+ check for invalid hashcode in _nc_find_type_entry and
|
||||
_nc_find_name_entry.
|
||||
+ check for invalid hashcode in _nc_find_entry.
|
||||
|
||||
---
|
||||
ncurses/tinfo/comp_hash.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
--- ncurses/tinfo/comp_hash.c
|
||||
+++ ncurses/tinfo/comp_hash.c 2019-10-12 16:32:13.000000000 +0000
|
||||
@@ -63,7 +63,9 @@ _nc_find_entry(const char *string,
|
||||
|
||||
hashvalue = data->hash_of(string);
|
||||
|
||||
- if (data->table_data[hashvalue] >= 0) {
|
||||
+ if (hashvalue >= 0
|
||||
+ && (unsigned) hashvalue < data->table_size
|
||||
+ && data->table_data[hashvalue] >= 0) {
|
||||
|
||||
real_table = _nc_get_table(termcap);
|
||||
ptr = real_table + data->table_data[hashvalue];
|
||||
@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string,
|
||||
const HashData *data = _nc_get_hash_info(termcap);
|
||||
int hashvalue = data->hash_of(string);
|
||||
|
||||
- if (data->table_data[hashvalue] >= 0) {
|
||||
+ if (hashvalue >= 0
|
||||
+ && (unsigned) hashvalue < data->table_size
|
||||
+ && data->table_data[hashvalue] >= 0) {
|
||||
const struct name_table_entry *const table = _nc_get_table(termcap);
|
||||
|
||||
ptr = table + data->table_data[hashvalue];
|
||||
30
CVE-2019-17595.patch
Normal file
30
CVE-2019-17595.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
Based on ncurses 6.1 - patch 20191012
|
||||
From: Thomas E. Dickey
|
||||
|
||||
+ check for missing character after backslash in fmt_entry
|
||||
|
||||
---
|
||||
progs/dump_entry.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
--- progs/dump_entry.c
|
||||
+++ progs/dump_entry.c 2019-10-12 15:59:07.000000000 +0000
|
||||
@@ -1110,7 +1110,8 @@ fmt_entry(TERMTYPE2 *tterm,
|
||||
*d++ = '\\';
|
||||
*d = ':';
|
||||
} else if (*d == '\\') {
|
||||
- *++d = *s++;
|
||||
+ if ((*++d = *s++) == '\0')
|
||||
+ break;
|
||||
}
|
||||
d++;
|
||||
*d = '\0';
|
||||
@@ -1370,7 +1371,7 @@ one_one_mapping(const char *mapping)
|
||||
|
||||
if (VALID_STRING(mapping)) {
|
||||
int n = 0;
|
||||
- while (mapping[n] != '\0') {
|
||||
+ while (mapping[n] != '\0' && mapping[n + 1] != '\0') {
|
||||
if (isLine(mapping[n]) &&
|
||||
mapping[n] != mapping[n + 1]) {
|
||||
result = FALSE;
|
||||
72
README.devel
Normal file
72
README.devel
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
Versions of Ncurses Libraries
|
||||
=============================
|
||||
|
||||
There are several Ncurses Libraries which can be used for building
|
||||
with an terminal based application. The standard Ncurses Libraries
|
||||
is given with ABI 5.9
|
||||
|
||||
/usr/include/ncurses/*.h
|
||||
/usr/lib/libncurses.so or /usr/lib64/libncurses.so
|
||||
/usr/lib/libform.so or /usr/lib64/libform.so
|
||||
/usr/lib/libmenu.so or /usr/lib64/libmenu.so
|
||||
/usr/lib/libpanel.so or /usr/lib64/libpanel.so
|
||||
|
||||
and its header are installed in /usr/include/ncurses/ e.g.
|
||||
ncurses.h. For backward compatibility with simply older
|
||||
programs the headers curses.h, ncurses.h, and term.h
|
||||
will be also found in /usr/include/. Use the output of
|
||||
|
||||
ncurses5-config --cflags for CFLAGS
|
||||
ncurses5-config --libs for LDFLAGS
|
||||
|
||||
to extend the CFLAGS and the LDFLAGS.
|
||||
For a version with wide character support please use the
|
||||
libraries with old ABI 5.9
|
||||
|
||||
/usr/include/ncursesw/*.h
|
||||
/usr/lib/libncursesw.so or /usr/lib64/libncursesw.so
|
||||
/usr/lib/libformw.so or /usr/lib64/libformw.so
|
||||
/usr/lib/libmenuw.so or /usr/lib64/libmenuw.so
|
||||
/usr/lib/libpanelw.so or /usr/lib64/libpanelw.so
|
||||
|
||||
Use the output of
|
||||
|
||||
ncursesw5-config --cflags for CFLAGS
|
||||
ncursesw5-config --libs for LDFLAGS
|
||||
|
||||
to extend the CFLAGS and the LDFLAGS.
|
||||
For a thread safe version (also known as `reentrant') please
|
||||
use the libraries with ABI 6.0
|
||||
|
||||
/usr/include/ncurses6/ncurses/*.h
|
||||
/usr/lib/ncurses6/libncurses.so or /usr/lib64/ncurses6/libncurses.so
|
||||
/usr/lib/ncurses6/libform.so or /usr/lib64/ncurses6/libform.so
|
||||
/usr/lib/ncurses6/libmenu.so or /usr/lib64/ncurses6/libmenu.so
|
||||
/usr/lib/ncurses6/libpanel.so or /usr/lib64/ncurses6/libpanel.so
|
||||
|
||||
together with the header files found at /usr/include/ncurses6/ncurses/
|
||||
e.g. ncurses.h. For backward compatibility with simply older programs
|
||||
the headers curses.h, ncurses.h, and term.h will be also found in
|
||||
/usr/include/ncurses6/. Use the output of
|
||||
|
||||
ncurses6-config --cflags for CFLAGS
|
||||
ncurses6-config --libs for LDFLAGS
|
||||
|
||||
to extend the CFLAGS and the LDFLAGS.
|
||||
For a version with both wide character support and thread safe
|
||||
please use the libraries with ABI 6.0
|
||||
|
||||
/usr/include/ncurses6/ncursesw/*.h
|
||||
/usr/lib/ncurses6/libncursesw.so or /usr/lib64/ncurses6/libncursesw.so
|
||||
/usr/lib/ncurses6/libformw.so or /usr/lib64/ncurses6/libformw.so
|
||||
/usr/lib/ncurses6/libmenuw.so or /usr/lib64/ncurses6/libmenuw.so
|
||||
/usr/lib/ncurses6/libpanelw.so or /usr/lib64/ncurses6/libpanelw.so
|
||||
|
||||
Use the output of
|
||||
|
||||
ncursesw6-config --cflags for CFLAGS
|
||||
ncursesw6-config --libs for LDFLAGS
|
||||
|
||||
to extend the CFLAGS and the LDFLAGS. It should be noted that the ABI 6.0
|
||||
is not only thread safe but also includes extended mouse support and in
|
||||
case of the wide character version also extended color support.
|
||||
13
baselibs.conf
Normal file
13
baselibs.conf
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
libncurses5
|
||||
targettype x86 provides "baselibs-x86:<prefix>/lib/libncurses.so.5"
|
||||
provides "ncurses-<targettype> = <version>"
|
||||
obsoletes "ncurses-<targettype> <= <version>"
|
||||
libncurses6
|
||||
targettype x86 provides "baselibs-x86:<prefix>/lib/libncurses.so.6"
|
||||
provides "libncurses6-<targettype> = <version>"
|
||||
ncurses-devel
|
||||
requires -ncurses-<targettype>
|
||||
requires "libncurses6-<targettype> = <version>"
|
||||
ncurses5-devel
|
||||
requires -ncurses-<targettype>
|
||||
requires "libncurses5-<targettype> = <version>"
|
||||
281
boo1201384.patch
Normal file
281
boo1201384.patch
Normal file
|
|
@ -0,0 +1,281 @@
|
|||
---
|
||||
progs/reset_cmd.c | 239 +++++++++++++++++++++++++-------------------
|
||||
1 file changed, 141 insertions(+), 98 deletions(-)
|
||||
|
||||
--- progs/reset_cmd.c
|
||||
+++ progs/reset_cmd.c 2023-12-12 09:57:14.586500611 +0000
|
||||
@@ -74,6 +74,9 @@ MODULE_ID("$Id: reset_cmd.c,v 1.13 2017/
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#define set_flags(target, mask) target |= mask
|
||||
+#define clear_flags(target, mask) target &= ~((unsigned)(mask))
|
||||
+
|
||||
static FILE *my_file;
|
||||
|
||||
static bool use_reset = FALSE; /* invoked as reset */
|
||||
@@ -188,12 +191,90 @@ out_char(int c)
|
||||
tty_settings->c_cc[item] = CHK(tty_settings->c_cc[item], value)
|
||||
|
||||
/*
|
||||
+ * Simplify ifdefs
|
||||
+ */
|
||||
+#ifndef BSDLY
|
||||
+#define BSDLY 0
|
||||
+#endif
|
||||
+#ifndef CRDLY
|
||||
+#define CRDLY 0
|
||||
+#endif
|
||||
+#ifndef ECHOCTL
|
||||
+#define ECHOCTL 0
|
||||
+#endif
|
||||
+#ifndef ECHOKE
|
||||
+#define ECHOKE 0
|
||||
+#endif
|
||||
+#ifndef ECHOPRT
|
||||
+#define ECHOPRT 0
|
||||
+#endif
|
||||
+#ifndef FFDLY
|
||||
+#define FFDLY 0
|
||||
+#endif
|
||||
+#ifndef IMAXBEL
|
||||
+#define IMAXBEL 0
|
||||
+#endif
|
||||
+#ifndef IUCLC
|
||||
+#define IUCLC 0
|
||||
+#endif
|
||||
+#ifndef IXANY
|
||||
+#define IXANY 0
|
||||
+#endif
|
||||
+#ifndef NLDLY
|
||||
+#define NLDLY 0
|
||||
+#endif
|
||||
+#ifndef OCRNL
|
||||
+#define OCRNL 0
|
||||
+#endif
|
||||
+#ifndef OFDEL
|
||||
+#define OFDEL 0
|
||||
+#endif
|
||||
+#ifndef OFILL
|
||||
+#define OFILL 0
|
||||
+#endif
|
||||
+#ifndef OLCUC
|
||||
+#define OLCUC 0
|
||||
+#endif
|
||||
+#ifndef ONLCR
|
||||
+#define ONLCR 0
|
||||
+#endif
|
||||
+#ifndef ONLRET
|
||||
+#define ONLRET 0
|
||||
+#endif
|
||||
+#ifndef ONOCR
|
||||
+#define ONOCR 0
|
||||
+#endif
|
||||
+#ifndef OXTABS
|
||||
+#define OXTABS 0
|
||||
+#endif
|
||||
+#ifndef TAB3
|
||||
+#define TAB3 0
|
||||
+#endif
|
||||
+#ifndef TABDLY
|
||||
+#define TABDLY 0
|
||||
+#endif
|
||||
+#ifndef TOSTOP
|
||||
+#define TOSTOP 0
|
||||
+#endif
|
||||
+#ifndef VTDLY
|
||||
+#define VTDLY 0
|
||||
+#endif
|
||||
+#ifndef XCASE
|
||||
+#define XCASE 0
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
* Reset the terminal mode bits to a sensible state. Very useful after
|
||||
* a child program dies in raw mode.
|
||||
*/
|
||||
void
|
||||
reset_tty_settings(int fd, TTY * tty_settings)
|
||||
{
|
||||
+ unsigned mask;
|
||||
+#ifdef TIOCMGET
|
||||
+ int modem_bits;
|
||||
+#endif
|
||||
+
|
||||
GET_TTY(fd, tty_settings);
|
||||
|
||||
#ifdef TERMIOS
|
||||
@@ -202,6 +283,9 @@ reset_tty_settings(int fd, TTY * tty_set
|
||||
#endif
|
||||
reset_char(VEOF, CEOF);
|
||||
reset_char(VERASE, CERASE);
|
||||
+#if defined(VERASE2) && defined(CERASE2)
|
||||
+ reset_char(VERASE2, CERASE2);
|
||||
+#endif
|
||||
#if defined(VFLUSH) && defined(CFLUSH)
|
||||
reset_char(VFLUSH, CFLUSH);
|
||||
#endif
|
||||
@@ -227,106 +311,65 @@ reset_tty_settings(int fd, TTY * tty_set
|
||||
reset_char(VWERASE, CWERASE);
|
||||
#endif
|
||||
|
||||
- tty_settings->c_iflag &= ~((unsigned) (IGNBRK
|
||||
- | PARMRK
|
||||
- | INPCK
|
||||
- | ISTRIP
|
||||
- | INLCR
|
||||
- | IGNCR
|
||||
-#ifdef IUCLC
|
||||
- | IUCLC
|
||||
-#endif
|
||||
-#ifdef IXANY
|
||||
- | IXANY
|
||||
-#endif
|
||||
- | IXOFF));
|
||||
-
|
||||
- tty_settings->c_iflag |= (BRKINT
|
||||
- | IGNPAR
|
||||
- | ICRNL
|
||||
- | IXON
|
||||
-#ifdef IMAXBEL
|
||||
- | IMAXBEL
|
||||
-#endif
|
||||
- );
|
||||
-
|
||||
- tty_settings->c_oflag &= ~((unsigned) (0
|
||||
-#ifdef OLCUC
|
||||
- | OLCUC
|
||||
-#endif
|
||||
-#ifdef OCRNL
|
||||
- | OCRNL
|
||||
-#endif
|
||||
-#ifdef ONOCR
|
||||
- | ONOCR
|
||||
-#endif
|
||||
-#ifdef ONLRET
|
||||
- | ONLRET
|
||||
-#endif
|
||||
-#ifdef OFILL
|
||||
- | OFILL
|
||||
-#endif
|
||||
-#ifdef OFDEL
|
||||
- | OFDEL
|
||||
-#endif
|
||||
-#ifdef NLDLY
|
||||
- | NLDLY
|
||||
-#endif
|
||||
-#ifdef CRDLY
|
||||
- | CRDLY
|
||||
-#endif
|
||||
-#ifdef TABDLY
|
||||
- | TABDLY
|
||||
-#endif
|
||||
-#ifdef BSDLY
|
||||
- | BSDLY
|
||||
-#endif
|
||||
-#ifdef VTDLY
|
||||
- | VTDLY
|
||||
-#endif
|
||||
-#ifdef FFDLY
|
||||
- | FFDLY
|
||||
-#endif
|
||||
- ));
|
||||
-
|
||||
- tty_settings->c_oflag |= (OPOST
|
||||
-#ifdef ONLCR
|
||||
- | ONLCR
|
||||
-#endif
|
||||
- );
|
||||
-
|
||||
- tty_settings->c_cflag &= ~((unsigned) (CSIZE
|
||||
- | CSTOPB
|
||||
- | PARENB
|
||||
- | PARODD
|
||||
- | CLOCAL));
|
||||
- tty_settings->c_cflag |= (CS8 | CREAD);
|
||||
- tty_settings->c_lflag &= ~((unsigned) (ECHONL
|
||||
- | NOFLSH
|
||||
-#ifdef TOSTOP
|
||||
- | TOSTOP
|
||||
-#endif
|
||||
-#ifdef ECHOPTR
|
||||
- | ECHOPRT
|
||||
-#endif
|
||||
-#ifdef XCASE
|
||||
- | XCASE
|
||||
+ clear_flags(tty_settings->c_iflag, (IGNBRK
|
||||
+ | PARMRK
|
||||
+ | INPCK
|
||||
+ | ISTRIP
|
||||
+ | INLCR
|
||||
+ | IGNCR
|
||||
+ | IUCLC
|
||||
+ | IXANY
|
||||
+ | IXOFF));
|
||||
+
|
||||
+ set_flags(tty_settings->c_iflag, (BRKINT
|
||||
+ | IGNPAR
|
||||
+ | ICRNL
|
||||
+ | IXON
|
||||
+ | IMAXBEL));
|
||||
+
|
||||
+ clear_flags(tty_settings->c_oflag, (0
|
||||
+ | OLCUC
|
||||
+ | OCRNL
|
||||
+ | ONOCR
|
||||
+ | ONLRET
|
||||
+ | OFILL
|
||||
+ | OFDEL
|
||||
+ | NLDLY
|
||||
+ | CRDLY
|
||||
+ | TABDLY
|
||||
+ | BSDLY
|
||||
+ | VTDLY
|
||||
+ | FFDLY));
|
||||
+
|
||||
+ set_flags(tty_settings->c_oflag, (OPOST
|
||||
+ | ONLCR));
|
||||
+
|
||||
+ mask = (CSIZE | CSTOPB | PARENB | PARODD);
|
||||
+#ifdef TIOCMGET
|
||||
+ /* leave clocal alone if this appears to use a modem */
|
||||
+ if (ioctl(fd, TIOCMGET, &modem_bits) == -1)
|
||||
+ mask |= CLOCAL;
|
||||
+#else
|
||||
+ /* cannot check - use the behavior from tset */
|
||||
+ mask |= CLOCAL;
|
||||
#endif
|
||||
- ));
|
||||
+ clear_flags(tty_settings->c_cflag, mask);
|
||||
|
||||
- tty_settings->c_lflag |= (ISIG
|
||||
- | ICANON
|
||||
- | ECHO
|
||||
- | ECHOE
|
||||
- | ECHOK
|
||||
-#ifdef ECHOCTL
|
||||
- | ECHOCTL
|
||||
-#endif
|
||||
-#ifdef ECHOKE
|
||||
- | ECHOKE
|
||||
-#endif
|
||||
- );
|
||||
-#endif
|
||||
+ set_flags(tty_settings->c_cflag, (CS8 | CREAD));
|
||||
+ clear_flags(tty_settings->c_lflag, (ECHONL
|
||||
+ | NOFLSH
|
||||
+ | TOSTOP
|
||||
+ | ECHOPRT
|
||||
+ | XCASE));
|
||||
+
|
||||
+ set_flags(tty_settings->c_lflag, (ISIG
|
||||
+ | ICANON
|
||||
+ | ECHO
|
||||
+ | ECHOE
|
||||
+ | ECHOK
|
||||
+ | ECHOCTL
|
||||
+ | ECHOKE));
|
||||
+#endif /* TERMIOS */
|
||||
|
||||
SET_TTY(fd, tty_settings);
|
||||
}
|
||||
30
bsc1190793-63ca9e06.patch
Normal file
30
bsc1190793-63ca9e06.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
Based on 63ca9e061f4644795d6f3f559557f3e1ed8c738b Mon Sep 17 00:00:00 2001
|
||||
From: "Thomas E. Dickey" <dickey@invisible-island.net>
|
||||
Date: Sun, 31 May 2020 00:51:32 +0000
|
||||
Subject: [PATCH] snapshot of project "ncurses", label v6_2_20200530
|
||||
|
||||
---
|
||||
ncurses/tinfo/captoinfo.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
--- ncurses/tinfo/captoinfo.c
|
||||
+++ ncurses/tinfo/captoinfo.c 2021-10-13 09:23:41.597110283 +0000
|
||||
@@ -215,12 +215,15 @@ cvtchar(register const char *sp)
|
||||
}
|
||||
break;
|
||||
case '^':
|
||||
+ len = 2;
|
||||
c = UChar(*++sp);
|
||||
- if (c == '?')
|
||||
+ if (c == '?') {
|
||||
c = 127;
|
||||
- else
|
||||
+ } else if (c == '\0') {
|
||||
+ len = 1;
|
||||
+ } else {
|
||||
c &= 0x1f;
|
||||
- len = 2;
|
||||
+ }
|
||||
break;
|
||||
default:
|
||||
c = UChar(*sp);
|
||||
64
bsc1218014-cve-2023-50495.patch
Normal file
64
bsc1218014-cve-2023-50495.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
---
|
||||
ncurses/tinfo/parse_entry.c | 23 ++++++++++++++++-------
|
||||
1 file changed, 16 insertions(+), 7 deletions(-)
|
||||
|
||||
--- ncurses/tinfo/parse_entry.c
|
||||
+++ ncurses/tinfo/parse_entry.c 2023-04-24 22:32:33.000000000 +0000
|
||||
@@ -109,7 +109,7 @@ _nc_extend_names(ENTRY * entryp, char *n
|
||||
/* Well, we are given a cancel for a name that we don't recognize */
|
||||
return _nc_extend_names(entryp, name, STRING);
|
||||
default:
|
||||
- return 0;
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
/* Adjust the 'offset' (insertion-point) to keep the lists of extended
|
||||
@@ -141,6 +141,11 @@ _nc_extend_names(ENTRY * entryp, char *n
|
||||
for (last = (unsigned) (max - 1); last > tindex; last--)
|
||||
|
||||
if (!found) {
|
||||
+ char *saved;
|
||||
+
|
||||
+ if ((saved = _nc_save_str(name)) == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
switch (token_type) {
|
||||
case BOOLEAN:
|
||||
tp->ext_Booleans++;
|
||||
@@ -168,7 +173,7 @@ _nc_extend_names(ENTRY * entryp, char *n
|
||||
TYPE_REALLOC(char *, actual, tp->ext_Names);
|
||||
while (--actual > offset)
|
||||
tp->ext_Names[actual] = tp->ext_Names[actual - 1];
|
||||
- tp->ext_Names[offset] = _nc_save_str(name);
|
||||
+ tp->ext_Names[offset] = saved;
|
||||
}
|
||||
|
||||
temp.nte_name = tp->ext_Names[offset];
|
||||
@@ -303,6 +308,8 @@ _nc_parse_entry(ENTRY * entryp, int lite
|
||||
bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0);
|
||||
bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0);
|
||||
if (is_use || is_tc) {
|
||||
+ char *saved;
|
||||
+
|
||||
if (!VALID_STRING(_nc_curr_token.tk_valstring)
|
||||
|| _nc_curr_token.tk_valstring[0] == '\0') {
|
||||
_nc_warning("missing name for use-clause");
|
||||
@@ -316,11 +323,13 @@ _nc_parse_entry(ENTRY * entryp, int lite
|
||||
_nc_curr_token.tk_valstring);
|
||||
continue;
|
||||
}
|
||||
- entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring);
|
||||
- entryp->uses[entryp->nuses].line = _nc_curr_line;
|
||||
- entryp->nuses++;
|
||||
- if (entryp->nuses > 1 && is_tc) {
|
||||
- BAD_TC_USAGE
|
||||
+ if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) {
|
||||
+ entryp->uses[entryp->nuses].name = saved;
|
||||
+ entryp->uses[entryp->nuses].line = _nc_curr_line;
|
||||
+ entryp->nuses++;
|
||||
+ if (entryp->nuses > 1 && is_tc) {
|
||||
+ BAD_TC_USAGE
|
||||
+ }
|
||||
}
|
||||
} else {
|
||||
/* normal token lookup */
|
||||
38
edit.sed
Normal file
38
edit.sed
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/sh
|
||||
|
||||
while test "${1::2}" = "--" ; do
|
||||
case "$1" in
|
||||
--cflags=*)
|
||||
cflags="${cflags:+$cflags }${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--cflags)
|
||||
cflags="${cflags:+$cflags }$2"
|
||||
shift 2
|
||||
;;
|
||||
--libs=*)
|
||||
libs="${libs:+$libs }${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--libs)
|
||||
libs="${libs:+$libs }$2"
|
||||
shift 2
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
sed -ri -e "
|
||||
/^[[:blank:]]*--cflags\)/,/;;/ {
|
||||
/;;/ a\\
|
||||
--cflags)\\
|
||||
echo $cflags\\
|
||||
;;
|
||||
d
|
||||
}
|
||||
/^[[:blank:]]*--libs\)/,/;;/ {
|
||||
/;;/ a\\
|
||||
--libs)\\
|
||||
echo $libs\\
|
||||
;;
|
||||
d
|
||||
}" ${1+"$@"}
|
||||
85
handle.linux
Normal file
85
handle.linux
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
#!/bin/bash
|
||||
|
||||
tmp1=$(mktemp ${TMPDIR:-/tmp}/${0##*/}.XXXXXX) || exit 1
|
||||
trap "rm -f $tmp1; exit" EXIT SIGPIPE SIGTERM SIGINT
|
||||
tmp2=$(mktemp ${TMPDIR:-/tmp}/${0##*/}.XXXXXX) || exit 1
|
||||
trap "rm -f $tmp1 $tmp2; exit" EXIT SIGPIPE SIGTERM SIGINT
|
||||
|
||||
: ${TERMCAP:=/etc/termcap}
|
||||
: ${TERMINFO:=/usr/share/terminfo}
|
||||
: ${BUILD_TIC:=/usr/bin/tic}
|
||||
: ${BUILD_INFOCMP:=/usr/bin/infocmp}
|
||||
acsc=
|
||||
sgr=
|
||||
mpch=
|
||||
new=
|
||||
ed=
|
||||
declare -i line=0
|
||||
|
||||
if test -r run_cmd.sh ; then
|
||||
function tc { sh run_cmd.sh $BUILD_TIC -U -C -r ${1+"$@"}; }
|
||||
function ic { sh run_cmd.sh $BUILD_INFOCMP -A $TERMINFO ${1+"$@"}; }
|
||||
else
|
||||
function tc { $BUILD_TIC -U -C -r ${1+"$@"}; }
|
||||
function ic { $BUILD_INFOCMP -A $TERMINFO ${1+"$@"}; }
|
||||
fi
|
||||
|
||||
cp $TERMCAP ${TERMCAP##*/}.new
|
||||
set -o noglob
|
||||
OIFS="$IFS"
|
||||
IFS='
|
||||
'
|
||||
for l in $(grep '^linux' $TERMCAP); do
|
||||
[[ $l =~ linux-vt* ]] && continue
|
||||
[[ $l =~ linux-basic* ]] && continue
|
||||
ic -1 -T ${l%%|*} > $tmp2
|
||||
|
||||
grep -E '^linux|acsc=' < $tmp2 > $tmp1
|
||||
acsc="$(tc $tmp1 | grep -v '^linux')"
|
||||
|
||||
grep -E '^linux|sgr=' < $tmp2 > $tmp1
|
||||
sgr="$(tc $tmp1 | grep -v '^linux')"
|
||||
|
||||
grep -E '^linux|(smpch|rmpch)=' < $tmp2 > $tmp1
|
||||
mpch="$(tc $tmp1 | grep -v '^linux')"
|
||||
|
||||
entry="$(tc $tmp2 | grep -v '^#')"
|
||||
|
||||
new=$(echo "$entry" | sed -e '/:a[el]=.*/a\
|
||||
:ac=' | sed -e "s/\t:ac=/${acsc//\\/\\\\}\\\\/")
|
||||
new=$(echo "$new" | sed -e '/:a[el]=.*/i\
|
||||
:S2=' | sed -e "s/\t:S2=/${mpch//\\/\\\\}\\\\/")
|
||||
new=$(echo "$new" | sed -e '/:s.=.*/i\
|
||||
:\.\.sa=' | sed -e "s/\t:\.\.sa=/${sgr//\\/\\\\}\\\\/")
|
||||
|
||||
if test "${#new}" -gt 1024 ; then
|
||||
new=$(echo "$entry" | sed -e '/\t:a[el]=.*/a\
|
||||
:ac=' | sed -e "s/\t:ac=/${acsc//\\/\\\\}\\\\/")
|
||||
new=$(echo "$new" | sed -e '/\t:a[el]=.*/i\
|
||||
:S2=' | sed -e "s/\t:S2=/${mpch//\\/\\\\}\\\\/")
|
||||
fi
|
||||
|
||||
if test "${#new}" -gt 1024 ; then
|
||||
new=$(echo "$entry" | sed -e '/\t:a[el]=.*/i\
|
||||
:S2=' | sed -e "s/\t:S2=/${mpch//\\/\\\\}\\\\/")
|
||||
fi
|
||||
|
||||
if test "${#new}" -gt 1024 ; then
|
||||
new="$entry"
|
||||
fi
|
||||
|
||||
line=$(grep -n "${l//\\/\\\\}" ${TERMCAP##*/}.new| sed 's/:.*//')
|
||||
: $((line--))
|
||||
echo "$entry" > $tmp1
|
||||
echo "$new" > $tmp2
|
||||
|
||||
ed=$(diff -e $tmp1 $tmp2| sed "s/^\([0-9]\+a\)/$line\n+\1/")
|
||||
|
||||
ed ${TERMCAP##*/}.new &> /dev/null <<-EOF
|
||||
${ed}
|
||||
w
|
||||
q
|
||||
EOF
|
||||
done
|
||||
IFS="$OIFS"
|
||||
unset entry acsc sgr mpch
|
||||
46
ncurses-5.7-tack.dif
Normal file
46
ncurses-5.7-tack.dif
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
---
|
||||
tack/Makefile.in | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
--- tack/Makefile.in
|
||||
+++ tack/Makefile.in 2018-01-22 11:17:39.717358930 +0000
|
||||
@@ -84,7 +84,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
|
||||
CFLAGS_NORMAL = $(CCFLAGS)
|
||||
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
|
||||
CFLAGS_PROFILE = $(CCFLAGS) -pg
|
||||
-CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
|
||||
+CFLAGS_SHARED = $(CCFLAGS) -fPIE
|
||||
|
||||
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
|
||||
|
||||
@@ -93,7 +93,7 @@ ABI_VERSION = @cf_cv_abi_version@
|
||||
LOCAL_LIBDIR = @top_builddir@/lib
|
||||
|
||||
LD = @LD@
|
||||
-LINK = @LINK_PROGS@ $(LIBTOOL_LINK)
|
||||
+LINK = @LINK_PROGS@ $(CC)
|
||||
LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \
|
||||
@LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@
|
||||
|
||||
@@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI
|
||||
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
|
||||
LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
|
||||
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
|
||||
-LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
|
||||
+LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) -pie
|
||||
|
||||
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
|
||||
|
||||
@@ -165,10 +165,10 @@ DEPS_TACK = \
|
||||
$(MODEL)/tack$o
|
||||
|
||||
tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES)
|
||||
- @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
|
||||
+ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
|
||||
|
||||
tackgen$x: $(MODEL)/tackgen$o @NCURSES_TREE@$(DEPS_CURSES)
|
||||
- @ECHO_LINK@ $(LINK) $(MODEL)/tackgen$o $(LDFLAGS_DEFAULT) -o $@
|
||||
+ $(LINK) $(MODEL)/tackgen$o $(LDFLAGS_DEFAULT) -o $@
|
||||
|
||||
tackgen.h: tackgen$x
|
||||
$(SHELL) -c "if test -f $(srcdir)/../misc/shlib; then\
|
||||
54
ncurses-5.9-bsc1115929.patch
Normal file
54
ncurses-5.9-bsc1115929.patch
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
For bug bsc#1115929 port back null pointer checks
|
||||
to catch e.g. the crash in _nc_parse_entry()
|
||||
|
||||
---
|
||||
form/frm_driver.c | 2 +-
|
||||
ncurses/tinfo/comp_parse.c | 6 +++++-
|
||||
ncurses/tinfo/parse_entry.c | 3 ++-
|
||||
3 files changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
--- form/frm_driver.c
|
||||
+++ form/frm_driver.c 2018-11-20 09:46:26.195713565 +0000
|
||||
@@ -4353,7 +4353,7 @@ form_driver(FORM *form, int c)
|
||||
if (!form)
|
||||
RETURN(E_BAD_ARGUMENT);
|
||||
|
||||
- if (!(form->field))
|
||||
+ if (!(form->field) || !(form->current))
|
||||
RETURN(E_NOT_CONNECTED);
|
||||
|
||||
assert(form->page);
|
||||
--- ncurses/tinfo/comp_parse.c
|
||||
+++ ncurses/tinfo/comp_parse.c 2018-11-20 09:38:48.206001951 +0000
|
||||
@@ -425,6 +425,9 @@ _nc_resolve_uses2(bool fullresolve, bool
|
||||
char *lookfor = qp->uses[i].name;
|
||||
long lookline = qp->uses[i].line;
|
||||
|
||||
+ if (lookfor == 0)
|
||||
+ continue;
|
||||
+
|
||||
foundit = FALSE;
|
||||
|
||||
_nc_set_type(child);
|
||||
@@ -502,7 +505,8 @@ _nc_resolve_uses2(bool fullresolve, bool
|
||||
* subsequent pass.
|
||||
*/
|
||||
for (i = 0; i < qp->nuses; i++)
|
||||
- if (qp->uses[i].link->nuses) {
|
||||
+ if (qp->uses[i].link
|
||||
+ && qp->uses[i].link->nuses) {
|
||||
DEBUG(2, ("%s: use entry %d unresolved",
|
||||
_nc_first_name(qp->tterm.term_names), i));
|
||||
goto incomplete;
|
||||
--- ncurses/tinfo/parse_entry.c
|
||||
+++ ncurses/tinfo/parse_entry.c 2018-11-20 09:42:59.245131721 +0000
|
||||
@@ -544,7 +544,8 @@ _nc_parse_entry(ENTRY * entryp, int lite
|
||||
* have picked up defaults via translation.
|
||||
*/
|
||||
for (i = 0; i < entryp->nuses; i++)
|
||||
- if (!strchr((char *) entryp->uses[i].name, '+'))
|
||||
+ if (entryp->uses[i].name != 0
|
||||
+ && !strchr((char *) entryp->uses[i].name, '+'))
|
||||
has_base_entry = TRUE;
|
||||
}
|
||||
|
||||
17
ncurses-5.9-ibm327x.dif
Normal file
17
ncurses-5.9-ibm327x.dif
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
---
|
||||
misc/terminfo.src | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- misc/terminfo.src
|
||||
+++ misc/terminfo.src 2018-02-26 09:11:11.405411875 +0000
|
||||
@@ -16487,8 +16487,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
|
||||
#
|
||||
|
||||
ibm327x|line mode IBM 3270 style,
|
||||
- gn,
|
||||
- clear=\r\n, el=\r, home=\r,
|
||||
+ cols#80,
|
||||
+ clear=\r\n, cr=\r, cud1=\n, el=\r, home=\r, ind=\n,
|
||||
|
||||
ibm3101|i3101|IBM 3101-10,
|
||||
OTbs, am, xon,
|
||||
1074
ncurses-6.1.dif
Normal file
1074
ncurses-6.1.dif
Normal file
File diff suppressed because it is too large
Load diff
75
ncurses-bnc1198627.patch
Normal file
75
ncurses-bnc1198627.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
---
|
||||
ncurses/tinfo/alloc_entry.c | 12 +++++-------
|
||||
ncurses/tinfo/read_entry.c | 17 +++++++++++++++--
|
||||
2 files changed, 20 insertions(+), 9 deletions(-)
|
||||
|
||||
--- ncurses/tinfo/alloc_entry.c
|
||||
+++ ncurses/tinfo/alloc_entry.c 2022-07-15 10:54:20.340284549 +0000
|
||||
@@ -52,8 +52,6 @@ MODULE_ID("$Id: alloc_entry.c,v 1.61 201
|
||||
#define ABSENT_OFFSET -1
|
||||
#define CANCELLED_OFFSET -2
|
||||
|
||||
-#define MAX_STRTAB 4096 /* documented maximum entry size */
|
||||
-
|
||||
static char *stringbuf; /* buffer for string capabilities */
|
||||
static size_t next_free; /* next free character in stringbuf */
|
||||
|
||||
@@ -70,8 +68,8 @@ _nc_init_entry(ENTRY * const tp)
|
||||
}
|
||||
#endif
|
||||
|
||||
- if (stringbuf == 0)
|
||||
- TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
|
||||
+ if (stringbuf == NULL)
|
||||
+ TYPE_MALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf);
|
||||
|
||||
next_free = 0;
|
||||
|
||||
@@ -107,11 +105,11 @@ _nc_save_str(const char *const string)
|
||||
* Cheat a little by making an empty string point to the end of the
|
||||
* previous string.
|
||||
*/
|
||||
- if (next_free < MAX_STRTAB) {
|
||||
+ if (next_free < MAX_ENTRY_SIZE) {
|
||||
result = (stringbuf + next_free - 1);
|
||||
}
|
||||
- } else if (next_free + len < MAX_STRTAB) {
|
||||
- _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
|
||||
+ } else if (next_free + len < MAX_ENTRY_SIZE) {
|
||||
+ _nc_STRCPY(&stringbuf[next_free], string, MAX_ENTRY_SIZE);
|
||||
DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
|
||||
DEBUG(7, ("at location %d", (int) next_free));
|
||||
next_free += len;
|
||||
--- ncurses/tinfo/read_entry.c
|
||||
+++ ncurses/tinfo/read_entry.c 2022-04-16 21:00:00.000000000 +0000
|
||||
@@ -144,6 +144,7 @@ convert_strings(char *buf, char **String
|
||||
{
|
||||
int i;
|
||||
char *p;
|
||||
+ bool corrupt = FALSE;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
if (IS_NEG1(buf + 2 * i)) {
|
||||
@@ -153,8 +154,20 @@ convert_strings(char *buf, char **String
|
||||
} else if (MyNumber(buf + 2 * i) > size) {
|
||||
Strings[i] = ABSENT_STRING;
|
||||
} else {
|
||||
- Strings[i] = (MyNumber(buf + 2 * i) + table);
|
||||
- TR(TRACE_DATABASE, ("Strings[%d] = %s", i, _nc_visbuf(Strings[i])));
|
||||
+ int nn = MyNumber(buf + 2 * i);
|
||||
+ if (nn >= 0 && nn < size) {
|
||||
+ Strings[i] = (nn + table);
|
||||
+ TR(TRACE_DATABASE, ("Strings[%d] = %s", i,
|
||||
+ _nc_visbuf(Strings[i])));
|
||||
+ } else {
|
||||
+ if (!corrupt) {
|
||||
+ corrupt = TRUE;
|
||||
+ TR(TRACE_DATABASE,
|
||||
+ ("ignore out-of-range index %d to Strings[]", nn));
|
||||
+ _nc_warning("corrupt data found in convert_strings");
|
||||
+ }
|
||||
+ Strings[i] = ABSENT_STRING;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* make sure all strings are NUL terminated */
|
||||
4
ncurses-rpmlintrc
Normal file
4
ncurses-rpmlintrc
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
addFilter(".*files-duplicate.*")
|
||||
addFilter(".*shared-lib-calls-exit.*")
|
||||
addFilter(".*non-etc-or-var-file-marked-as-conffile.*")
|
||||
addFilter(".*macro-in-comment.*jobs.*")
|
||||
4099
ncurses.changes
Normal file
4099
ncurses.changes
Normal file
File diff suppressed because it is too large
Load diff
1137
ncurses.spec
Normal file
1137
ncurses.spec
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue