From ed7251b7ddb6213935b8d75a112837097c5487ce57f927a72bc649e9a59132e2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 26 Oct 2020 11:01:46 +0000 Subject: [PATCH] Update to ncurses-6.2-20201010, Update to tack-1.9-20200220, Silent makedepend OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=511 --- ncurses-6.2-patches.tar.bz2 | 4 +-- ncurses-6.2.dif | 20 +++++++-------- ncurses.changes | 51 +++++++++++++++++++++++++++++++++++++ ncurses.spec | 26 +++++++++++++++++-- tack-1.09-20200202.tgz | 3 --- tack-1.09-20200220.tgz | 3 +++ 6 files changed, 90 insertions(+), 17 deletions(-) delete mode 100644 tack-1.09-20200202.tgz create mode 100644 tack-1.09-20200220.tgz diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index dc285d1..e9acc78 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07ff2bd5b8d252422da5a7e0e895657981780a5550f096ab83ea8196f9678c1b -size 1030135 +oid sha256:27f14e612af7bbd515ce9701b7251ea07aac22e2350ab2fb6a469107037ee83c +size 1075480 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 1c5ae15..f7bbc00 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -22,8 +22,8 @@ --- aclocal.m4 +++ aclocal.m4 2020-08-31 12:06:53.682411288 +0000 -@@ -617,7 +617,7 @@ AC_MSG_CHECKING([for size of bool]) - AC_CACHE_VAL(cf_cv_type_of_bool,[ +@@ -639,7 +639,7 @@ AC_CHECK_SIZEOF(bool,,[ + AC_CACHE_CHECK(for type of bool, cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ -#include @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5476,12 +5476,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5606,9 +5609,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- Add ncurses patch 20201024 + + provide workaround configure-check for bool when cross-compiling. + + fix a potential indexing error in _nc_parse_entry(), seen with + Herlim's test data using address-sanitizer. + + change a null-pointer check in set_curterm to a valid-string check, + needed in to tic's use-resolution work pad_char is cancelled + (report/testcase by Robert Sebastian Herlim) + + improve tic's -c option to validate the number and type of parameters + and compare against expected number/type before deciding which set of + parameter-lists to use in tparm calls (report/testcase by Robert + Sebastian Herlim). + + fix a link for tabs.1 manpage in announce.html.in (report by Nick + Black), as well as some fixes via linklint. +- Update to tack 1.9 (patch 20200220) + * sysdep.c: gcc-warning + * tack.c: fix gcc warning for non-ncurses configuration + * init.c: zero-out the debug/log-pointers after closing them + * tack.1: add -d option, for debug.log + * output.c: use debug.log to record putp's and tput's which hint at + the testing done + * sysdep.c: use debug.log to record when the tty is set/reset + * tack.h: split-out log_chr and log_str + * tack.c: add -d option, for debug.log + * tack.1, tack.c, tack.h: add -l option + * tack.c: eliminate a confusing comparison for the logging-menu-entry + state by using #define'd strings for that and the hex-output menu. + * tack.c: use getopt + * fun.c, crum.c, edit.c: + fix coverity warning about copying into fixed-size buffer + * tack.c: do a sanity-check on $TERM + * aclocal.m4: resync with my-autoconf + * configure: regen + * aclocal.m4: split-out CF__CURSES_DATA to simplify ifdef's + * configure: regen +- Use libbsd which provides strlcpy as well as strlcat to avoid + reinvent common BSD standard and string functions +- Let makedepend find standard header files even if not below /usr/include + +------------------------------------------------------------------- +Thu Oct 22 08:07:33 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20201017 + + improve manpage typography. + + improve discussion in curs_addch.3x of the use of unctrl to display + nonprintable characters. + + add a note in terminfo.5 explaining that no-parameter strings such + as sgr0 or cnorm should not be used with tparm. + ------------------------------------------------------------------- Mon Oct 12 06:24:42 UTC 2020 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index f53e4eb..a48ad7d 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -24,6 +24,7 @@ %endif %bcond_with memleakck %bcond_without onlytinfo +%bcond_without libbsd %if %{with onlytinfo} %global soname_tinfo tinfo @@ -42,6 +43,9 @@ BuildRequires: db-devel BuildRequires: expect BuildRequires: gcc-c++ BuildRequires: pkg-config +%if %{with libbsd} +BuildRequires: pkgconfig(libbsd) +%endif BuildRequires: screen %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel @@ -73,7 +77,7 @@ Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ -Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20200202.tgz +Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20200220.tgz Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.2.dif @@ -397,6 +401,24 @@ mv tack-* tack cflags -Wl,--hash-size=8599 LDFLAGS cflags -Wl,--as-needed LDFLAGS CXXFLAGS=$CFLAGS + CPPFLAGS= + include= + for header in stddef.h limits.h + do + set -- $(echo '#include <'$header'>'|gcc -E -|sed -rn 's@[^/]*"([a-z0-9/\._-]+)/'$header'".*@\1@p'| sort -u) + for found + do + case "$found" in + /usr/include*) continue ;; + esac + include=${include+"-I$found $include"} + done + done + if test -n "$include" + then + CPPFLAGS="$include" + unset include + fi test -n "$TERM" || TERM=linux mkdir gzip cat > gzip/gzip <<-'EOF' @@ -405,7 +427,7 @@ mv tack-* tack EOF chmod 0755 gzip/gzip PATH=$PWD/gzip:$PATH - export CC CFLAGS CXX CXXFLAGS TERM LDFLAGS + export CC CFLAGS CXX CXXFLAGS CPPFLAGS TERM LDFLAGS # # Detect 64bit architecures and be sure that we use an # unsigned long for chtype to be backward compatible with diff --git a/tack-1.09-20200202.tgz b/tack-1.09-20200202.tgz deleted file mode 100644 index f2cc523..0000000 --- a/tack-1.09-20200202.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6117f8045e55302cbdc16217342b6169384ddd51873d072c60ca80846f0ea0e0 -size 237953 diff --git a/tack-1.09-20200220.tgz b/tack-1.09-20200220.tgz new file mode 100644 index 0000000..e3396c8 --- /dev/null +++ b/tack-1.09-20200220.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce1937c49a1d7d88a27f1595fc88434f22435d9277ecde70b17f6d02e47d03a +size 240186