Auto sync2gitlab import of ncurses-6.1-9.20180224.el8.src.rpm

2022-05-26 11:58:33 -04:00 · 2022-05-26 11:58:33 -04:00 · f20c6051e8
commit f20c6051e8
parent 9514566144
12 changed files with 1460 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+/ncurses-6.1-20180224.tgz
--- a/1
+++ b/1
@ -1 +0,0 @@
- 
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@ -0,0 +1,32 @@
+diff -up ncurses-6.1-20180127/misc/ncurses-config.in.config ncurses-6.1-20180127/misc/ncurses-config.in
+--- ncurses-6.1-20180127/misc/ncurses-config.in.config	2017-12-09 23:45:44.000000000 +0100
+++ ncurses-6.1-20180127/misc/ncurses-config.in	2018-01-29 10:57:48.596590822 +0100
+@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
+ includedir="@includedir@"
+-libdir="@libdir@"
+ datarootdir="@datarootdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+@@ -111,12 +110,7 @@ while test $# -gt 0; do
+ ENDECHO
+ 		;;
+ 	--libs)
+-		if test "$libdir" = /usr/lib
+-		then
+ 			LIBDIR=
+-		else
+-			LIBDIR=-L$libdir
+-		fi
+ 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ 			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+@@ -154,7 +148,6 @@ ENDECHO
+ 		echo $INCS
+ 		;;
+ 	--libdir)
+-		echo "${libdir}"
+ 		;;
+ 	--mandir)
+ 		echo "${mandir}"
--- a/ncurses-cve-2019-17594.patch
+++ b/ncurses-cve-2019-17594.patch
@ -0,0 +1,28 @@
+From snapshot 6.1-20191012
+
+diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
+index 21f165ca..a62d38f9 100644
+--- a/ncurses/tinfo/comp_hash.c
+++ b/ncurses/tinfo/comp_hash.c
+@@ -63,7 +63,9 @@ _nc_find_entry(const char *string,
+ 
+     hashvalue = data->hash_of(string);
+ 
+-    if (data->table_data[hashvalue] >= 0) {
+    if (hashvalue >= 0
+	&& (unsigned) hashvalue < data->table_size
+	&& data->table_data[hashvalue] >= 0) {
+ 
+ 	real_table = _nc_get_table(termcap);
+ 	ptr = real_table + data->table_data[hashvalue];
+@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string,
+     const HashData *data = _nc_get_hash_info(termcap);
+     int hashvalue = data->hash_of(string);
+ 
+-    if (data->table_data[hashvalue] >= 0) {
+    if (hashvalue >= 0
+	&& (unsigned) hashvalue < data->table_size
+	&& data->table_data[hashvalue] >= 0) {
+ 	const struct name_table_entry *const table = _nc_get_table(termcap);
+ 
+ 	ptr = table + data->table_data[hashvalue];
--- a/ncurses-cve-2019-17595.patch
+++ b/ncurses-cve-2019-17595.patch
@ -0,0 +1,16 @@
+From snapshot 6.1-20191012
+
+diff --git a/progs/dump_entry.c b/progs/dump_entry.c
+index d0e420ec..8a47084a 100644
+--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
+@@ -1136,7 +1136,8 @@ fmt_entry(TERMTYPE2 *tterm,
+ 				*d++ = '\\';
+ 				*d = ':';
+ 			    } else if (*d == '\\') {
+-				*++d = *s++;
+				if ((*++d = *s++) == '\0')
+				    break;
+ 			    }
+ 			    d++;
+ 			    *d = '\0';
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@ -0,0 +1,46 @@
+diff -up ncurses-6.1-20180127/misc/terminfo.src.kbs ncurses-6.1-20180127/misc/terminfo.src
+--- ncurses-6.1-20180127/misc/terminfo.src.kbs	2018-01-29 10:59:01.644758573 +0100
+++ ncurses-6.1-20180127/misc/terminfo.src	2018-01-29 11:02:34.018246276 +0100
+@@ -5713,7 +5713,7 @@ rxvt-basic|rxvt terminal base (X Window
+ 	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 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, kbs=^H,
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ 	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,
+@@ -5725,7 +5725,7 @@ rxvt-basic|rxvt terminal base (X Window
+ 	    %p9%t\016%e\017%;,
+ 	sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
+ 	smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
+-	use=rxvt+pcfkeys, use=vt220+keypad,
+	use=rxvt+pcfkeys, use=vt220+keypad, use=xterm+kbs,
+ # Key Codes from rxvt reference:
+ #
+ # Note: Shift + F1-F10 generates F11-F20
+@@ -6897,7 +6897,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,
+-	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
+	ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z,
+ 	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,
+@@ -6911,6 +6911,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=ecma+color,
+	use=xterm+kbs,
+ # The bce and status-line entries are from screen 3.9.13 (and require some
+ # changes to .screenrc).
+ screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
+@@ -7026,6 +7027,7 @@ screen.xterm-r6|screen customized for X1
+ # on Solaris because Sun's curses implementation gets confused.
+ screen.teraterm|disable ncv in teraterm,
+ 	ncv#127,
+	kbs=^H,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+ 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
--- a/ncurses-libs.patch
+++ b/ncurses-libs.patch
@ -0,0 +1,58 @@
+diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Makefile.in
+--- ncurses-6.0-20150810/c++/Makefile.in.libs	2015-08-06 01:15:41.000000000 +0200
+++ ncurses-6.0-20150810/c++/Makefile.in	2015-08-12 17:07:35.573822650 +0200
+@@ -112,7 +112,7 @@ LOCAL_LIBDIR	= @top_builddir@/lib
+ 
+ LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ LIBROOT		= ncurses++
+ 
+@@ -147,8 +147,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
+ LDFLAGS_DEFAULT	= $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
+ 
+ # flags for library built by this makefile
+-LDFLAGS		= $(TEST_ARGS) @LDFLAGS@ \
+-	@LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
+LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)
+ 
+ AUTO_SRC	= \
+ 		etip.h
+diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Makefile.in
+--- ncurses-6.0-20150810/form/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
+++ ncurses-6.0-20150810/form/Makefile.in	2015-08-12 17:08:14.945939259 +0200
+@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ RPATH_LIST	= @RPATH_LIST@
+ RESULTING_SYMS	= @RESULTING_SYMS@
+diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Makefile.in
+--- ncurses-6.0-20150810/menu/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
+++ ncurses-6.0-20150810/menu/Makefile.in	2015-08-12 17:09:10.135102716 +0200
+@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ RPATH_LIST	= @RPATH_LIST@
+ RESULTING_SYMS	= @RESULTING_SYMS@
+diff -up ncurses-6.0-20150810/panel/Makefile.in.libs ncurses-6.0-20150810/panel/Makefile.in
+--- ncurses-6.0-20150810/panel/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
+++ ncurses-6.0-20150810/panel/Makefile.in	2015-08-12 17:09:33.324171396 +0200
+@@ -109,7 +109,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ RPATH_LIST	= @RPATH_LIST@
+ RESULTING_SYMS	= @RESULTING_SYMS@
--- a/ncurses-tputx.patch
+++ b/ncurses-tputx.patch
@ -0,0 +1,15 @@
+From snapshot 6.1-20180630
+
+diff --git a/progs/tput.c b/progs/tput.c
+index fd051eb4..88e75799 100644
+--- a/progs/tput.c
+++ b/progs/tput.c
+@@ -293,7 +293,7 @@ main(int argc, char **argv)
+ 
+     term = getenv("TERM");
+ 
+-    while ((c = getopt(argc, argv, "ST:V")) != -1) {
+    while ((c = getopt(argc, argv, "ST:Vx")) != -1) {
+ 	switch (c) {
+ 	case 'S':
+ 	    cmdline = FALSE;
--- a/ncurses-urxvt.patch
+++ b/ncurses-urxvt.patch
@ -0,0 +1,179 @@
+diff -up ncurses-6.0-20150810/misc/terminfo.src.urxvt ncurses-6.0-20150810/misc/terminfo.src
+--- ncurses-6.0-20150810/misc/terminfo.src.urxvt	2015-07-25 21:27:20.000000000 +0200
+++ ncurses-6.0-20150810/misc/terminfo.src	2015-08-12 17:38:46.050362567 +0200
+@@ -5214,6 +5214,175 @@ rxvt-cygwin-native|rxvt terminal emulato
+ rxvt-16color|rxvt with 16 colors like aixterm,
+ 	ncv#32, use=ibm+16color, use=rxvt,
+ 
+# rxvt-unicode
+# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?revision=1.34
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005
+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
+# Updated: Marc Lehmann <schmorp@schmorp.de>, 24 Nov 2014: implement cvvis as blinking cursor
+# Updated: Marc Lehmann <schmorp@schmorp.de>, 13 Dec 2014: removed superfluous 0 from sgr
+rxvt-unicode|rxvt-unicode terminal (X Window System),
+	am,
+	bce,
+	eo,
+	km,
+	msgr,
+	xenl,
+	hs,
+	cols#80,
+	it#8,
+	lines#24,
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
+	bel=^G,
+	blink=\E[5m,
+	bold=\E[1m,
+	clear=\E[H\E[2J,
+	civis=\E[?25l,
+	cnorm=\E[?12l\E[?25h,
+	cvvis=\E[?12;25h,
+	cr=^M,
+	csr=\E[%i%p1%d;%p2%dr,
+	cub=\E[%p1%dD,
+	cub1=^H,
+	cud=\E[%p1%dB,
+	cud1=^J,
+	cuf=\E[%p1%dC,
+	cuf1=\E[C,
+	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,
+	el1=\E[1K,
+	flash=\E[?5h$<20/>\E[?5l,
+	home=\E[H,
+	hpa=\E[%i%p1%dG,
+	ht=^I,
+	hts=\EH,
+	ich=\E[%p1%d@,
+	ich1=\E[@,
+	il=\E[%p1%dL,
+	il1=\E[L,
+	ind=^J,
+	is1=\E[\041p,
+	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
+	kDC=\E[3$,
+	kIC=\E[2$,
+	kEND=\E[8$,
+	kHOM=\E[7$,
+	kLFT=\E[d,
+	kNXT=\E[6$,
+	kPRV=\E[5$,
+	kRIT=\E[c,
+	kbs=\177,
+	ka1=\EOw,
+	ka3=\EOy,
+	kb2=\EOu,
+	kc1=\EOq,
+	kc3=\EOs,
+	kcbt=\E[Z,
+	kcub1=\E[D,
+	kcud1=\E[B,
+	kcuf1=\E[C,
+	kcuu1=\E[A,
+	kdch1=\E[3~,
+	kel=\E[8\^,
+	kend=\E[8~,
+	kent=\EOM,
+	kf1=\E[11~,
+	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~,
+	kf3=\E[13~,
+	kf4=\E[14~,
+	kf5=\E[15~,
+	kf6=\E[17~,
+	kf7=\E[18~,
+	kf8=\E[19~,
+	kf9=\E[20~,
+	kfnd=\E[1~,
+	khome=\E[7~,
+	kich1=\E[2~,
+	kmous=\E[M,
+	knp=\E[6~,
+	kpp=\E[5~,
+	kslt=\E[4~,
+	rc=\E8,
+	rev=\E[7m,
+	ri=\EM,
+	rmso=\E[27m,
+	rmul=\E[24m,
+	rs1=\Ec,
+	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
+	sgr0=\E[m\E(B,
+	enacs=,
+	smacs=\E(0,
+	rmacs=\E(B,
+	smso=\E[7m,
+	smul=\E[4m,
+	tbc=\E[3g,
+	vpa=\E[%i%p1%dd,
+	colors#88,
+	pairs#7744,
+	btns#5,
+	lm#0,
+	ccc,
+	npc,
+	mc5i,
+	ncv#0,
+	mir,
+	xon,
+	bw,
+	ech=\E[%p1%dX,
+	mc0=\E[i,
+	mc4=\E[4i,
+	mc5=\E[5i,
+	sitm=\E[3m,
+	ritm=\E[23m,
+	smam=\E[?7h,
+	rmam=\E[?7l,
+	smir=\E[4h,
+	rmir=\E[4l,
+	smcup=\E[?1049h,
+	rmcup=\E[r\E[?1049l,
+	smkx=\E=,
+	rmkx=\E>,
+	indn=\E[%p1%dS,
+	rin=\E[%p1%dT,
+	sgr=\E[%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+	op=\E[39;49m,
+	setaf=\E[38;5;%p1%dm,
+	setab=\E[48;5;%p1%dm,
+	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
+	sc=\E7,
+	s0ds=\E(B,
+	s1ds=\E(0,
+	s2ds=\E*B,
+	s3ds=\E+B,
+	u6=\E[%i%d;%dR,
+	u7=\E[6n,
+	u8=\E[?1;2c,
+	u9=\E[c,
+	tsl=\E]2;,
+	fsl=\007,
+	dsl=\E]2;\007,
+
+ #### MRXVT
+ # mrxvt 0.5.4
+ #
--- a/ncurses-usecap.patch
+++ b/ncurses-usecap.patch
@ -0,0 +1,22 @@
+20180414
+	+ 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).
+
+diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
+index 2b54f45d..437f1223 100644
+--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
+@@ -543,9 +543,11 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent)
+ 		 * Otherwise, look for a base entry that will already
+ 		 * have picked up defaults via translation.
+ 		 */
+-		for (i = 0; i < entryp->nuses; i++)
+-		    if (!strchr((char *) entryp->uses[i].name, '+'))
+		for (i = 0; i < entryp->nuses; i++) {
+		    if (entryp->uses[i].name != 0
+			&& !strchr(entryp->uses[i].name, '+'))
+ 			has_base_entry = TRUE;
+		}
+ 	    }
+ 
+ 	    postprocess_termcap(&entryp->tterm, has_base_entry);
--- a/ncurses.spec
+++ b/ncurses.spec
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (ncurses-6.1-20180224.tgz) = 26a0b8a88e965fa4089a48cd0af46b0ffa90d621a7d207c5c09c8cbd60f2cf073953c64ad109469bef9f52e5137067924148c33880cdd2161024a6e42ea4607d
				`@ -0,0 +1 @@`
				`SHA512 (ncurses-6.1-20180224.tgz) = 26a0b8a88e965fa4089a48cd0af46b0ffa90d621a7d207c5c09c8cbd60f2cf073953c64ad109469bef9f52e5137067924148c33880cdd2161024a6e42ea4607d`