Accepting request 602959 from Base:System

- Add ncurses patch 6.1-20180414 + modify form library to optionally delay cursor movement on a field edge/boundary (patch by Leon Winter). + modify form library to avoid unnecessary update of cursor position in non-public fields (patch by Leon Winter). + remove unused _nc_import_termtype2() function. + also add/improve null-pointer checks in other places + add a null-pointer check in _nc_parse_entry to handle an error when a use-name is invalid syntax (report by Chung-Yi Lin). - Add ncurses patch 6.1-20180407 + clarify in manual pages that vwprintw and vwscanw are obsolete, not part of X/Open Curses since 2007. + use "const" in some prototypes rather than NCURSES_CONST where X/Open Curses was updated to do this, e.g., wscanw, newterm, the terminfo interface. Also use "const" for consistency in the termcap interface, which was withdrawn by X/Open Curses in Issue 5 (2007). As of Issue 7, X/Open Curses still lacks "const" for certain return values, e.g., keyname(). OBS-URL: https://build.opensuse.org/request/show/602959 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=146
2018-05-07 12:50:19 +00:00 · 2018-05-07 12:50:19 +00:00 · e2232562c4
commit e2232562c4
parent edba42a90c 25a1cd4f17
4 changed files with 61 additions and 35 deletions
--- a/ncurses-5.9-ibm327x.dif
+++ b/ncurses-5.9-ibm327x.dif
@ -3,8 +3,8 @@
 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
+++ misc/terminfo.src	2018-04-09 09:36:58.372082389 +0000
+@@ -16481,8 +16481,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
 #
 
 ibm327x|line mode IBM 3270 style,
--- 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:c8e4c9f4c4b8b1c39513c333f66d10207bb62a0358d619b43b96b2665782e80b
-size 119567
+oid sha256:95c32f44b7368f3155457bb83e7019c49ac6035d92bd4fdacc8ea2d6c7a08996
+size 137017
--- a/ncurses-6.1.dif
+++ b/ncurses-6.1.dif
@ -22,7 +22,7 @@
 20 files changed, 248 insertions(+), 81 deletions(-)

 --- aclocal.m4
-+++ aclocal.m4	2018-04-03 09:30:51.952306743 +0000
+++ aclocal.m4	2018-04-09 09:37:20.983663432 +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
@ -151,7 +151,7 @@
 esac
 done
 --- configure
-+++ configure	2018-04-03 09:30:51.956306670 +0000
+++ configure	2018-04-09 09:37:20.991663283 +0000
@@ -5972,7 +5972,7 @@ case $cf_cv_system_name in
 	fi
 	;;
@ -288,7 +288,7 @@
 	# the next lines are needed for linking libtic over libncurses
 	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2018-04-03 09:30:51.956306670 +0000
+++ include/curses.h.in	2018-04-09 09:37:20.991663283 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
 typedef @cf_cv_typeof_mmask_t@ mmask_t;
 #endif
@ -300,7 +300,7 @@
  * We need FILE, etc.  Include this before checking any feature symbols.
  */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2018-04-03 09:30:51.956306670 +0000
+++ include/termcap.h.in	2018-04-09 09:37:57.598984990 +0000
@@ -46,6 +46,8 @@ extern "C"
 {
 #endif /* __cplusplus */
@ -309,9 +309,9 @@
 +#include <termios.h>
 #include <sys/types.h>
 
- #undef  NCURSES_CONST 
+ #undef  NCURSES_OSPEED 
 --- include/tic.h
-+++ include/tic.h	2018-04-03 09:30:51.956306670 +0000
+++ include/tic.h	2018-04-09 09:37:20.991663283 +0000
@@ -221,12 +221,12 @@ struct alias
  */
 
@ -328,7 +328,7 @@
 #define CANCELLED_STRING	(char *)(-1)
 
 --- man/man_db.renames
-+++ man/man_db.renames	2018-04-03 09:30:51.956306670 +0000
+++ man/man_db.renames	2018-04-09 09:37:20.991663283 +0000
@@ -163,6 +163,7 @@ term.7				term.7
 term_variables.3x		terminfo_variables.3ncurses
 terminfo.5			terminfo.5
@ -346,7 +346,7 @@
 #
 getty.1				getty.8
 --- man/ncurses.3x
-+++ man/ncurses.3x	2018-04-03 09:30:51.956306670 +0000
+++ man/ncurses.3x	2018-04-09 09:37:20.991663283 +0000
@@ -138,6 +138,10 @@ after the shell environment variable \fB
 [See \fBterminfo\fR(\*n) for further details.]
 .SS Datatypes
@ -359,7 +359,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	2018-04-03 09:30:51.956306670 +0000
+++ misc/gen-pkgconfig.in	2018-04-09 09:37:20.991663283 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
 fi
 
@ -399,7 +399,7 @@
 
 	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2018-04-03 09:30:51.956306670 +0000
+++ misc/ncurses-config.in	2018-04-09 09:37:20.991663283 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
 	# compile/link
 	--cflags)
@ -410,7 +410,7 @@
 		fi
 		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2018-04-03 09:30:51.964306521 +0000
+++ misc/terminfo.src	2018-04-09 09:37:20.999663135 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
 	am,
 	cols#80,
@ -695,7 +695,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=,
-@@ -6629,7 +6698,7 @@ pty|4bsd pseudo teletype,
+@@ -6624,7 +6693,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
@ -704,7 +704,7 @@
 	am, mir, xenl,
 	cols#80, lines#24,
 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
-@@ -6642,6 +6711,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -6637,6 +6706,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,
@ -718,7 +718,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,
-@@ -6764,7 +6840,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -6759,7 +6835,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,
@ -727,7 +727,7 @@
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-@@ -6885,6 +6961,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
+@@ -6880,6 +6956,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
 	use=xterm+x11mouse, use=xterm-new,
 #:screen.xterm|screen for modern xterm,
 #:	use=screen.xterm-new,
@ -741,7 +741,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,
-@@ -6972,7 +7055,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -6967,7 +7050,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,
@ -750,7 +750,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,
-@@ -8853,7 +8936,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -8847,7 +8930,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,
@ -759,7 +759,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,
-@@ -12074,6 +12157,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -12068,6 +12151,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
 # at support for the VT320 itself.
 # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
 # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -767,7 +767,7 @@
 vt320-k3|MS-Kermit 3.00's vt320 emulation,
 	am, eslok, hs, km, mir, msgr, xenl,
 	cols#80, it#8, lines#49, pb#9600, vt#3,
-@@ -12083,7 +12167,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -12077,7 +12161,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -776,7 +776,7 @@
 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
 	      ?5l,
-@@ -16497,7 +16581,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -16491,7 +16575,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,
@ -785,7 +785,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
-@@ -16755,7 +16839,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -16749,7 +16833,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
 	tbc=\E[3g,
 # "Megapel" refers to the display adapter, which was used with the IBM RT
 # aka IBM 6150.
@ -795,7 +795,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	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/Makefile.in	2018-04-09 09:37:20.999663135 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
 ../lib : ; mkdir $@
 
@ -806,7 +806,7 @@
 ./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	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/curses.priv.h	2018-04-09 09:37:20.999663135 +0000
@@ -2169,6 +2169,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);
@ -817,7 +817,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	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/run_cmd.sh	2018-04-09 09:37:20.999663135 +0000
@@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@ -831,7 +831,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/tinfo/MKfallback.sh	2018-04-09 09:37:20.999663135 +0000
@@ -68,6 +68,12 @@ else
 	tmp_info=
 fi
@ -864,7 +864,7 @@
 	done
 
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/tinfo/access.c	2018-04-09 09:37:20.999663135 +0000
@@ -35,6 +35,9 @@
 #include <ctype.h>
 
@ -907,7 +907,7 @@
 _nc_access(const char *path, int mode)
 {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/tinfo/lib_setup.c	2018-04-09 09:37:20.999663135 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
     } else if ((value = tigetnum("U8")) >= 0) {
 	result = value;		/* use extension feature */
@ -919,7 +919,7 @@
 	    result = 1;		/* always broken */
 	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/tinfo/read_entry.c	2018-04-09 09:37:20.999663135 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
     FILE *fp = 0;
     int code;
@ -937,7 +937,7 @@
     return (code);
 }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2018-04-03 09:30:51.964306521 +0000
+++ ncurses/tinfo/read_termcap.c	2018-04-09 09:37:20.999663135 +0000
@@ -322,14 +322,18 @@ _nc_getent(
 	     */
 	    if (fd >= 0) {
@ -984,7 +984,7 @@
     }
     if (copied != 0)
 --- progs/Makefile.in
-+++ progs/Makefile.in	2018-04-03 09:30:51.964306521 +0000
+++ progs/Makefile.in	2018-04-09 09:37:20.999663135 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
 CFLAGS_NORMAL	= $(CCFLAGS)
 CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1004,7 +1004,7 @@
 LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
 
 --- test/test.priv.h
-+++ test/test.priv.h	2018-04-03 09:30:51.964306521 +0000
+++ test/test.priv.h	2018-04-09 09:37:20.999663135 +0000
@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s
 #endif
 
--- a/ncurses.changes
+++ b/ncurses.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sun Apr 15 07:53:41 UTC 2018 - werner@suse.de
+
+- Add ncurses patch 6.1-20180414
+  + modify form library to optionally delay cursor movement on a field
+    edge/boundary (patch by Leon Winter).
+  + modify form library to avoid unnecessary update of cursor position in
+    non-public fields (patch by Leon Winter).
+  + remove unused _nc_import_termtype2() function.
+  + also add/improve null-pointer checks in other places
+  + add a null-pointer check in _nc_parse_entry to handle an error when
+    a use-name is invalid syntax (report by Chung-Yi Lin).
+
+-------------------------------------------------------------------
+Mon Apr  9 09:33:21 UTC 2018 - werner@suse.de
+
+- Add ncurses patch 6.1-20180407
+  + clarify in manual pages that vwprintw and vwscanw are obsolete,
+    not part of X/Open Curses since 2007.
+  + use "const" in some prototypes rather than NCURSES_CONST where X/Open
+    Curses was updated to do this, e.g., wscanw, newterm, the terminfo
+    interface.  Also use "const" for consistency in the termcap
+    interface, which was withdrawn by X/Open Curses in Issue 5 (2007).
+    As of Issue 7, X/Open Curses still lacks "const" for certain return
+    values, e.g., keyname().
+
 -------------------------------------------------------------------
 Wed Apr  4 12:22:26 UTC 2018 - werner@suse.de