From 84bc26225d01369e1f081968c61d2c63da2d394478c6c3a201833c285fc3eb7b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 3 Jul 2017 08:23:52 +0000 Subject: [PATCH] Update to ncurses 6.0 patch level 20170701 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=310 --- ncurses-6.0-patches.tar.bz2 | 4 ++-- ncurses-6.0.dif | 40 ++++++++++++++++++------------------- ncurses.changes | 30 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 3d67cb3..e97ffca 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9940715a415c48daef98d79cda759e378c653429405d53eb58cad652826d3ebd -size 2630873 +oid sha256:e22e836f1947eb2f7eef184ad82581f168069c80b6db593e488d0a600a340f13 +size 2638435 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index bb18159..fbc827b 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 247 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-06-25 07:14:07.696621894 +0000 ++++ aclocal.m4 2017-07-03 07:09:04.699399144 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -150,7 +150,7 @@ esac done --- configure -+++ configure 2017-06-25 07:14:07.700621820 +0000 ++++ configure 2017-07-03 07:09:04.699399144 +0000 @@ -5925,7 +5925,7 @@ case $cf_cv_system_name in fi ;; @@ -287,7 +287,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2017-06-25 07:14:07.700621820 +0000 ++++ include/curses.h.in 2017-07-03 07:09:04.699399144 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -299,7 +299,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2017-06-25 07:14:07.700621820 +0000 ++++ include/termcap.h.in 2017-07-03 07:09:04.699399144 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-06-25 07:14:07.700621820 +0000 ++++ include/tic.h 2017-07-03 07:09:04.699399144 +0000 @@ -205,12 +205,12 @@ struct alias */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-06-25 07:14:07.700621820 +0000 ++++ man/man_db.renames 2017-07-03 07:09:04.703399070 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -345,7 +345,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-06-25 07:14:07.700621820 +0000 ++++ man/ncurses.3x 2017-07-03 07:09:04.703399070 +0000 @@ -137,6 +137,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -358,7 +358,7 @@ called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. --- misc/gen-pkgconfig.in -+++ misc/gen-pkgconfig.in 2017-06-25 07:14:07.700621820 +0000 ++++ misc/gen-pkgconfig.in 2017-07-03 07:09:04.703399070 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -398,7 +398,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-06-25 07:14:07.700621820 +0000 ++++ misc/ncurses-config.in 2017-07-03 07:09:04.703399070 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -409,7 +409,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2017-06-25 07:14:07.760620704 +0000 ++++ misc/terminfo.src 2017-07-03 07:09:04.763397957 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -803,7 +803,7 @@ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in -+++ ncurses/Makefile.in 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/Makefile.in 2017-07-03 07:09:04.707398995 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -814,8 +814,8 @@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2017-06-25 07:14:07.704621745 +0000 -@@ -2099,6 +2099,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2017-07-03 07:09:04.707398995 +0000 +@@ -2122,6 +2122,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -825,7 +825,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/run_cmd.sh 2017-07-03 07:09:04.707398995 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -839,7 +839,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-07-03 07:09:04.707398995 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -872,7 +872,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/tinfo/access.c 2017-07-03 07:09:04.707398995 +0000 @@ -35,6 +35,9 @@ #include @@ -915,7 +915,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-07-03 07:09:04.707398995 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -927,7 +927,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-06-25 07:14:07.704621745 +0000 ++++ ncurses/tinfo/read_entry.c 2017-07-03 07:09:04.711398921 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -945,7 +945,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-06-25 07:14:07.708621671 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-07-03 07:09:04.711398921 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -992,7 +992,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-06-25 07:14:07.708621671 +0000 ++++ test/test.priv.h 2017-07-03 07:09:04.711398921 +0000 @@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index e62e861..7ec70ac 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Jul 3 07:01:41 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170701 (bsc#1046853, bsc#1046858) + + modify update_getenv() in db_iterator.c to ensure that environment + variables which are not initially set will be checked later if an + application happens to set them (patch by Guillaume Maudoux). + + remove initialization-check for calling napms() in the term-driver + configuration; none is needed. + + add help-screen to test/test_getstr.c and test/test_get_wstr.c + + improve compatibility between different configurations of new_prescr, + fixing a case with threaded code and term-driver where c++/demo did + not work (cf: 20160213). + + the fixes for Redhat #1464685 obscured a problem subsequently + reported in Redhat #1464687; the given test-case was no longer + reproducible. Testing without the fixes for the earlier reports + showed a problem with buffer overflow in dump_entry.c, which is + addressed by reducing the use of a fixed-size buffer. + + add/improve checks in tic's parser to address invalid input + (Redhat #1464684, #1464685, #1464686, #1464691). + + alloc_entry.c, add a check for a null-pointer. + + parse_entry.c, add several checks for valid pointers as well as + one check to ensure that a single character on a line is not + treated as the 2-character termcap short-name. + + fix a memory leak in delscreen() (report by Bai Junq). + + improve tracemunch, showing thread identifiers as names. + + fix a use-after-free in NCursesMenu::~NCursesMenu() + + further amend incorrect calls for memory-leaks from 20170617 changes + (report by Allen Hewes). + ------------------------------------------------------------------- Sun Jun 25 07:12:59 UTC 2017 - werner@suse.de