From 0ff19ae2268cad93d77451119af8ffb171639dec5c4b15b1e6196a142b6386be Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Oct 2019 10:06:32 +0000 Subject: [PATCH 1/4] Update to 6.1-20191012 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=444 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 25 +++++++++++++++++++++++++ ncurses.spec | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 4b310a7..8da5cef 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6d8df4715c593b4eb3982bfa31cfcfe9a157a606c5297d47437f3de3ce075c7 -size 1879736 +oid sha256:aa91f15bcbb81254825737ffb3bd9fb5b4fc4e3f88e20b199c8b515eea6141b4 +size 1892656 diff --git a/ncurses.changes b/ncurses.changes index 802f841..92b30ec 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Oct 14 10:04:05 UTC 2019 - Dr. Werner Fink + +- Avoid recursion trouble in spec file cause by undefined _lto_cflags + +------------------------------------------------------------------- +Mon Oct 14 06:38:31 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20191012 + + amend recent changes to ncurses*-config and pc-files to filter out + Debian linker-flags (report by Sven Joachim, cf: 20150516). + + clarify relationship between tic, infocmp and captoinfo in manpage. + + check for invalid hashcode in _nc_find_type_entry and + _nc_find_name_entry. + > fix several errata in tic (reports/testcases by "zjuchenyuan"): + + check for invalid hashcode in _nc_find_entry. + + check for missing character after backslash in fmt_entry + + check for acsc with odd length in dump_entry in check for one-one + mapping (cf: 20060415); + + check length when converting from old AIX box_chars_1 capability, + overlooked in changes to eliminate strcpy (cf: 20001007). +- Add ncurses patch 20191005 + + modify the ncurse*-config and pc-files to more closely match for the + -I and -l options. + ------------------------------------------------------------------- Tue Oct 1 07:28:54 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index ff92afe..4d360fb 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -314,7 +314,7 @@ mv tack-* tack %patch0 -p0 -b .p0 %build -%global _lto_cflags %{_lto_cflags} -ffat-lto-objects +%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects # # Note that there is a test if the system call poll(2) really works # on terminal or files. To make sure that even in OBS the configure From f6e037c2b9af3d192424b0ff7d267cb955c226b419cc826a3c92bb7b8887ea65 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Oct 2019 10:24:07 +0000 Subject: [PATCH 2/4] Fix main patch ncurses-6.1.dif OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=445 --- ncurses-6.1.dif | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 3b5a7c6..76f29d2 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -359,16 +359,7 @@ arrays of characters representing all or part of a CRT screen. --- misc/gen-pkgconfig.in +++ misc/gen-pkgconfig.in 2019-08-12 08:07:59.759015287 +0000 -@@ -78,7 +78,7 @@ if [ "$includedir" != "/usr/include" ]; - fi - - LDFLAGS= --if [ "$libdir" != "/usr/lib" ]; then -+if [ "$libdir" != "/usr/lib" -a "$libdir" != "/usr/lib64" ]; then - LDFLAGS="$LDFLAGS -L\${libdir}" - fi - if [ "x@EXTRA_LDFLAGS@" != "x" ]; then -@@ -101,6 +101,7 @@ do +@@ -127,6 +127,7 @@ do LIBS="-l$name" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" @@ -376,7 +367,7 @@ reqs= if [ $name = $MAIN_LIBRARY ]; then -@@ -110,9 +111,11 @@ do +@@ -137,9 +138,11 @@ do desc="$desc terminal interface library" elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" @@ -388,7 +379,7 @@ desc="$desc add-on library" fi -@@ -122,6 +125,8 @@ do +@@ -149,6 +152,8 @@ do [ $NEED_TINFO != yes ] ; then [ -n "$reqs" ] && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" From d49b15ba4732c14583021a2c027d003a9be81c99ebc4acf68b76bc7fd5084ecb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Oct 2019 08:31:45 +0000 Subject: [PATCH 3/4] Update to 6.1-20191015 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=446 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 8da5cef..76d358c 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa91f15bcbb81254825737ffb3bd9fb5b4fc4e3f88e20b199c8b515eea6141b4 -size 1892656 +oid sha256:59ce1326db94b5295bd4dff94678176673395c41748b5c9e6ae5f42c2a981e50 +size 1894356 diff --git a/ncurses.changes b/ncurses.changes index 92b30ec..8783faa 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 16 08:29:53 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20191015 + + improve buffer-checks in captoinfo.c, for some cases when the + input string is shorter than expected. + > fix two errata in tic (report/testcases by Hongxu Chen): + + check for missing character after backslash in write_it + + check for missing characters after "%>" when converting from termcap + syntax (cf: 980530). + ------------------------------------------------------------------- Mon Oct 14 10:04:05 UTC 2019 - Dr. Werner Fink From eee3264944b85ab73a40d06956737d8dd8e428b61e6d072d79c083505e830f19 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 21 Oct 2019 09:36:31 +0000 Subject: [PATCH 4/4] Update to 6.1-20191019 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=447 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 76d358c..0ae5b4d 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59ce1326db94b5295bd4dff94678176673395c41748b5c9e6ae5f42c2a981e50 -size 1894356 +oid sha256:b400fba7133897bd151f9f3eac34fc35148232347c7fc9f09ddd6e9c371e1476 +size 1895002 diff --git a/ncurses.changes b/ncurses.changes index 8783faa..183117a 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Oct 21 09:33:41 UTC 2019 - Dr. Werner Fink + +- Add ncurses 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). + ------------------------------------------------------------------- Wed Oct 16 08:29:53 UTC 2019 - Dr. Werner Fink