diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 968529b..bd28fc7 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17624,8 +17624,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17635,8 +17635,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index c8f8cba..c903209 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:df4473b7d9f606a00457b96b1aa0ab52ad78e4a361da541f260dbf4aa92b6bcf -size 3322249 +oid sha256:334453e45a427b5b7a6850d2db97e67ae7e250b39d1bf0acd3033ec4b4e43014 +size 3569381 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 8ecfd9f..be6f3f8 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -19,7 +19,7 @@ --- aclocal.m4 +++ aclocal.m4 2021-06-07 07:18:38.416598899 +0000 -@@ -639,7 +639,7 @@ AC_CHECK_SIZEOF(bool,,[ +@@ -658,7 +658,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([ @@ -28,7 +28,7 @@ #include #if defined(__cplusplus) -@@ -5784,12 +5784,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 -@@ -5914,9 +5917,9 @@ 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 <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -14845,9 +14848,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, @@ -513,7 +513,7 @@ kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -6455,8 +6486,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6466,8 +6497,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -524,7 +524,7 @@ kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, -@@ -6546,6 +6577,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6557,6 +6588,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -563,7 +563,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -6610,7 +6673,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6621,7 +6684,7 @@ Eterm|Eterm-color|Eterm with xterm-style home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E>\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@, @@ -572,7 +572,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -7704,7 +7767,7 @@ pty|4bsd pseudo teletype, +@@ -7715,7 +7778,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -581,7 +581,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7717,6 +7780,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7728,6 +7791,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -595,7 +595,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -7844,7 +7914,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7855,7 +7925,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -604,7 +604,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, -@@ -7964,6 +8034,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7975,6 +8045,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -618,7 +618,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -8051,7 +8128,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -8062,7 +8139,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -627,7 +627,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -9987,7 +10064,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9998,7 +10075,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -636,7 +636,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -17634,7 +17711,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17645,7 +17722,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -645,7 +645,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -17892,7 +17969,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17903,7 +17980,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -656,7 +656,7 @@ ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in +++ ncurses/Makefile.in 2021-06-07 07:18:38.424598755 +0000 -@@ -240,7 +240,7 @@ $(DESTDIR)$(libdir) : +@@ -242,7 +242,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh @@ -777,6 +777,6 @@ @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl - # $Id: tracemunch,v 1.40 2021/02/13 19:29:12 tom Exp $ + # $Id: tracemunch,v 1.41 2021/09/04 10:31:03 tom Exp $ ############################################################################## # Copyright 2018-2020,2021 Thomas E. Dickey # diff --git a/ncurses-rpmlintrc b/ncurses-rpmlintrc index 44816f3..d8a8086 100644 --- a/ncurses-rpmlintrc +++ b/ncurses-rpmlintrc @@ -1,8 +1,5 @@ addFilter(".*files-duplicate.*") -addFilter(".*shared-lib-calls-exit.*") addFilter(".*non-etc-or-var-file-marked-as-conffile.*") addFilter(".*macro-in-comment.*jobs.*") -addFilter(".*W:.*no-version-in-last-changelog.*") -addFilter(".*W:.*shared-lib-without-dependency-information.*/libtinfow\.so\..*") -addFilter(".*W:.*shared-lib-without-dependency-information.*/libtinfow\.so\..*") -addFilter(".*-devel-static.*:.*W:.*useless-provides.*-devel.*") +addFilter(".*E:.*shared-lib.*-without-dependency-information.*/libtinfow\.so\..*") +addFilter(".*ncurses.*-devel.*:.*W:.*missing-dependency-on.*/libncurses.*\*.*") diff --git a/ncurses.changes b/ncurses.changes index 88ea908..8da58de 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Mon Sep 6 09:45:07 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210905 + + correct logic in filtering of redefinitions (report by Sven Joachim, + cf: 20210828). +- Add ncurses patch 20210904 + + modify linux3.0 entry to reflect default mapping of shift-tab by + kbd 1.14 (report by Jan Engelhardt) -TD + + add historical note to tput, curses-terminfo and curses-color + manpages based on source-code for SVr2, SVr3 and SVr4. + + minor grammatical fixes for "it's" vs "its" (report by Nick Black). + + amend fix for --disable-root-environ (report by Arnav Singh). + + build-fix for compiling link_test + + drop symbols GCC_PRINTF and GCC_SCANF from curses.h.in, to simplify + use (Debian #993179). +- Add ncurses patch 20210828 + + correct reversed check for --disable-root-environ (report/analysis + by Arnav Singh, cf: 20210626). + + apply gcc format attribute to prototypes which use a va_list + parameter rather than a "..." variable-length parameter list + (prompted by discussion in a tmux pull-request). + + modify configure scripts to filter out redefinitions of _XOPEN_SOURCE, + e.g., for NetBSD which generally supports 500, but 600 is needed for + ncursesw. + + improve documentation for tparm and static/dynamic variables. + + improve typography in terminfo.5 (patch by Branden Robinson). +- Add ncurses patch 20210821 + + improve tparm implementation of %P and %g, more closely matching + SVr4 terminfo. + + move internals of TERMINAL structure to new header term.priv.h + + add "check" rule for ncurses/Makefile + + corrected tsl capability for terminator -TD + + add check in tic to report instances where tparm would detect an + error in an expression (cf: 20201010). + + correct a few places where SP->_pair_limit was used rather than + SP->_pair_alloc (cf: 20170812). + + fix missing "%d" for setaf/setab code 8-15 in xterm+direct16 (report + by Florian Weimer) -TD + + fix some documentation errata from OpenBSD changes. + + update config.sub +- Correct offsets and dates of patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon Aug 16 07:10:22 UTC 2021 - Dr. Werner Fink