.gitignore

@@ -1,2 +1 @@
-/ncurses-6.2-20210508.tgz
+/ncurses-6.1-20180224.tgz
-/ncurses-6.2-20210508.tgz.asc

dickey-invisible-island.txt

@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4
-4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN
-WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg
-EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb
-8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe
-OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb
-oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE
-+bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx
-nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp
-Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PokBIgQQAQIADAUCTZ7Q
-ZQUDABJ1AAAKCRCXELibyletfLKrB/sEVLsrCjFTwevbgKSzgCwLf6EhkifktlFB
-w7/4n9Do1n7/LpgjdMH06YD9RjfSap4tdvEiHpzkpUtCGuzkGc/u4qTMdnWNgFhh
-oHLhjVh4u72B/NtlgrpDEDrn1bnuZpzWxru4uDJGSgL00jV5b3kf1P07eQaguMC6
-VeuzFmukv8LiDFhZcCl492nMZxz7vSRgSi8Ce+/Oc4Q+XTWmF5ZMKd5xNLjBdj2P
-zOABHmDP1aA75grY30vVViPJve+W0h7A3PP9GuugNDkqmdCvTxYeMqiF6Vtv19/N
-EW4jIvmN7GLOBo5F4RYcE9Fv4lV0xXlfpYwCqY7iAx9jyXgCbKXxiF4EExECAB4F
-Aj/4r7ICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQcCNT4Pfkjtt6MQCeKZHo
-SgACIQk95rWefzSLULcpjxoAnjVet8e1/1indwT/wDDnObDDfM2UiEYEExECAAYF
-AlZ3yw8ACgkQXd+Pt2iOMaZ0bACfVCFh+GzDCNXmZ3RcmDKjJxW7v4YAn0ApCgiS
-8tZC2X2ZOs84WwJBIF7vuQENBD/4r7QQBACNOXUR5S3kRSry2IYGr4q0WjdPEh0k
-oG1UVDhu0RN0Xbd2RnWjXrjYaYXskmCfo8pRwkNSUeFQ7ggRykcAECJTgfB6haHz
-JP/JoD0BepEpwmkxDlsQaiigcEiDRSHxqEbpDVwfOCwY5o4r1jMVK9IhFevIyWuH
-WghPO/ASRdF85wADBwP+JFo20ZhpLTkXBppW+bQR7GGHDYnNJpE/o9jev8EaaA9U
-b1ST2G6T5iT+l1b09rcpGPfsA0ray9/AfH0DTvsxr0ai6ln+uM/TVY7S6vy3MLsq
-yoJ6n2bfcr2R0B4lnRR34DCycATL9DVdmKf+NRTkvWXOSjTXQtdj0Kp2uYJeFqqI
-SQQYEQIACQUCP/ivtAIbDAAKCRBwI1Pg9+SO266eAKDZ6zjUkRhpqsJxP6AWnIzR
-YKoBTwCfcvSmQ7jC1nxJ6OkdrtZJH0znjF0=
-=0vnF
------END PGP PUBLIC KEY BLOCK-----

gating.yaml

@@ -1,7 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}

ncurses-config.patch

@@ -1,19 +1,7 @@
-diff -up ncurses-6.2-20210501/misc/gen-pkgconfig.in.config ncurses-6.2-20210501/misc/gen-pkgconfig.in
+diff -up ncurses-6.1-20180127/misc/ncurses-config.in.config ncurses-6.1-20180127/misc/ncurses-config.in
---- ncurses-6.2-20210501/misc/gen-pkgconfig.in.config	2021-05-04 15:25:14.136139064 +0200
+--- ncurses-6.1-20180127/misc/ncurses-config.in.config	2017-12-09 23:45:44.000000000 +0100
-+++ ncurses-6.2-20210501/misc/gen-pkgconfig.in	2021-05-04 15:26:46.473363104 +0200
++++ ncurses-6.1-20180127/misc/ncurses-config.in	2018-01-29 10:57:48.596590822 +0100
-@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ];
+@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
- fi
- 
- lib_flags=
--for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
-+for opt in -L$libdir @LIBS@
- do
- 	case $opt in
- 	-l*) # LIBS is handled specially below
-diff -up ncurses-6.2-20210501/misc/ncurses-config.in.config ncurses-6.2-20210501/misc/ncurses-config.in
---- ncurses-6.2-20210501/misc/ncurses-config.in.config	2021-04-18 00:22:52.000000000 +0200
-+++ ncurses-6.2-20210501/misc/ncurses-config.in	2021-05-04 15:28:41.567642360 +0200
-@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
  
  bindir="@bindir@"
  includedir="@includedir@"
@@ -21,32 +9,20 @@ diff -up ncurses-6.2-20210501/misc/ncurses-config.in.config ncurses-6.2-20210501
  datarootdir="@datarootdir@"
  datadir="@datadir@"
  mandir="@mandir@"
-@@ -101,7 +100,7 @@ fi
+@@ -111,12 +110,7 @@ while test $# -gt 0; do
- # There is no portable way to find the list of standard library directories. 
+ ENDECHO
- # Require a POSIX shell anyway, to keep this simple.
+ 		;;
- lib_flags=
+ 	--libs)
--for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
+-		if test "$libdir" = /usr/lib
-+for opt in $LIBS
+-		then
- do
+ 			LIBDIR=
- 	case $opt in
+-		else
- 	-specs*) # ignore linker specs-files which were used to build library
+-			LIBDIR=-L$libdir
-@@ -114,13 +113,13 @@ do
+-		fi
- 		lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
+ 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
- 		[ -d "$lib_check" ] || continue
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- 		case "$lib_check" in
+ 			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
--		@LD_SEARCHPATH@) # skip standard libdir
+@@ -154,7 +148,6 @@ ENDECHO
-+		////) # skip standard libdir (disabled for multilib)
- 			if [ "$lib_check" = "$libdir" ]
- 			then
- 				lib_first=yes
- 				IFS_save="$IFS"
- 				IFS='|'
--				LIBDIRS="@LD_SEARCHPATH@"
-+				LIBDIRS=""
- 				for lib_check in $LIBDIRS
- 				do
- 					if [ -d "$lib_check" ]
-@@ -268,7 +267,6 @@ ENDECHO
  		echo $INCS
  		;;
  	--libdir)

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];

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';

ncurses-kbs.patch

@@ -1,42 +1,42 @@
-diff -up ncurses-6.2-20210306/misc/terminfo.src.kbs ncurses-6.2-20210306/misc/terminfo.src
+diff -up ncurses-6.1-20180127/misc/terminfo.src.kbs ncurses-6.1-20180127/misc/terminfo.src
---- ncurses-6.2-20210306/misc/terminfo.src.kbs	2021-03-11 12:05:15.951585254 +0100
+--- ncurses-6.1-20180127/misc/terminfo.src.kbs	2018-01-29 10:59:01.644758573 +0100
-+++ ncurses-6.2-20210306/misc/terminfo.src	2021-03-11 12:11:24.568964629 +0100
++++ ncurses-6.1-20180127/misc/terminfo.src	2018-01-29 11:02:34.018246276 +0100
-@@ -6276,7 +6276,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -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@, il=\E[%p1%dL, il1=\E[L,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
- 	ind=\n, is1=\E[?47l\E=\E[?1l,
+ 	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,
-@@ -6288,7 +6288,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -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+cvis, use=vt220+keypad,
+-	use=rxvt+pcfkeys, use=vt220+keypad,
-+	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, use=xterm+kbs,
++	use=rxvt+pcfkeys, use=vt220+keypad, use=xterm+kbs,
  # Key Codes from rxvt reference:
  #
  # Note: Shift + F1-F10 generates F11-F20
-@@ -7829,7 +7829,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -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, kf1=\EOP,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
+ 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
- 	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+ 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-@@ -7842,6 +7842,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -6911,6 +6911,7 @@ screen|VT 100/ANSI X3.64 virtual termina
- 	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
- 	E0=\E(B, S0=\E(%p1%c, use=vt220+pcedit,
+ 	smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g,
- 	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
+ 	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,
-@@ -7957,6 +7958,7 @@ screen.xterm-r6|screen customized for X1
+@@ -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,

ncurses-libs.patch

@@ -1,16 +1,16 @@
-diff -up ncurses-6.2-20210306/c++/Makefile.in.libs ncurses-6.2-20210306/c++/Makefile.in
+diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Makefile.in
---- ncurses-6.2-20210306/c++/Makefile.in.libs	2021-01-23 21:42:08.000000000 +0100
+--- ncurses-6.0-20150810/c++/Makefile.in.libs	2015-08-06 01:15:41.000000000 +0200
-+++ ncurses-6.2-20210306/c++/Makefile.in	2021-03-11 12:02:29.576741101 +0100
++++ ncurses-6.0-20150810/c++/Makefile.in	2015-08-12 17:07:35.573822650 +0200
-@@ -118,7 +118,7 @@ SHLIB_LIST	= $(SHLIB_DIRS) \
+@@ -112,7 +112,7 @@ LOCAL_LIBDIR	= @top_builddir@/lib
- 		-l@FORM_NAME@@USE_LIB_SUFFIX@ \
+ 
- 		-l@MENU_NAME@@USE_LIB_SUFFIX@ \
+ LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
- 		-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
+ SHLIB_DIRS	= -L../lib
--		-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@
-+		-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++
  
-@@ -153,8 +153,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
+@@ -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
@@ -20,10 +20,10 @@ diff -up ncurses-6.2-20210306/c++/Makefile.in.libs ncurses-6.2-20210306/c++/Make
  
  AUTO_SRC	= \
  		etip.h
-diff -up ncurses-6.2-20210306/form/Makefile.in.libs ncurses-6.2-20210306/form/Makefile.in
+diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Makefile.in
---- ncurses-6.2-20210306/form/Makefile.in.libs	2021-01-23 21:42:08.000000000 +0100
+--- ncurses-6.0-20150810/form/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.2-20210306/form/Makefile.in	2021-03-11 12:00:59.001470707 +0100
++++ ncurses-6.0-20150810/form/Makefile.in	2015-08-12 17:08:14.945939259 +0200
-@@ -110,7 +110,7 @@ LINK		= $(LIBTOOL_LINK)
+@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib
@@ -32,10 +32,10 @@ diff -up ncurses-6.2-20210306/form/Makefile.in.libs ncurses-6.2-20210306/form/Ma
  
  RPATH_LIST	= @RPATH_LIST@
  RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.2-20210306/menu/Makefile.in.libs ncurses-6.2-20210306/menu/Makefile.in
+diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Makefile.in
---- ncurses-6.2-20210306/menu/Makefile.in.libs	2020-08-29 16:50:45.000000000 +0200
+--- ncurses-6.0-20150810/menu/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.2-20210306/menu/Makefile.in	2021-03-11 12:00:59.002470754 +0100
++++ ncurses-6.0-20150810/menu/Makefile.in	2015-08-12 17:09:10.135102716 +0200
-@@ -110,7 +110,7 @@ LINK		= $(LIBTOOL_LINK)
+@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib
@@ -44,10 +44,10 @@ diff -up ncurses-6.2-20210306/menu/Makefile.in.libs ncurses-6.2-20210306/menu/Ma
  
  RPATH_LIST	= @RPATH_LIST@
  RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.2-20210306/panel/Makefile.in.libs ncurses-6.2-20210306/panel/Makefile.in
+diff -up ncurses-6.0-20150810/panel/Makefile.in.libs ncurses-6.0-20150810/panel/Makefile.in
---- ncurses-6.2-20210306/panel/Makefile.in.libs	2020-08-29 16:50:45.000000000 +0200
+--- ncurses-6.0-20150810/panel/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.2-20210306/panel/Makefile.in	2021-03-11 12:00:59.002470754 +0100
++++ ncurses-6.0-20150810/panel/Makefile.in	2015-08-12 17:09:33.324171396 +0200
-@@ -112,7 +112,7 @@ LINK		= $(LIBTOOL_LINK)
+@@ -109,7 +109,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib

ncurses-setuid.patch

@@ -1,134 +0,0 @@
-diff -up ncurses-6.2-20210508/configure.setuid ncurses-6.2-20210508/configure
---- ncurses-6.2-20210508/configure.setuid	2021-05-02 02:35:51.000000000 +0200
-+++ ncurses-6.2-20210508/configure	2023-08-21 14:22:48.925376959 +0200
-@@ -784,6 +784,7 @@ Fine-Tuning Your Configuration:
-   --enable-getcap-cache   cache translated termcaps in ~/.terminfo
-   --disable-home-terminfo drop ~/.terminfo from terminfo search-path
-   --disable-root-environ  restrict environment when running as root
-+  --disable-setuid-environ restrict setuid use of ncurses environment variables
-   --enable-symlinks       make tic use symbolic links not hard links
-   --enable-broken_linker  compile with broken-linker support code
-   --enable-bsdpad         recognize BSD-style prefix padding
-@@ -9224,6 +9225,20 @@ cat >>confdefs.h <<\EOF
- #define USE_ROOT_ENVIRON 1
- EOF
- 
-+# Check whether --enable-setuid-environ or --disable-setuid-environ was given.
-+if test "${enable_setuid_environ+set}" = set; then
-+  enableval="$enable_setuid_environ"
-+  with_setuid_environ=$enableval
-+else
-+  with_setuid_environ=$with_root_environ
-+fi;
-+echo "$as_me:9942: result: $with_setuid_environ" >&5
-+echo "${ECHO_T}$with_setuid_environ" >&6
-+test "x$with_setuid_environ" = xyes &&
-+cat >>confdefs.h <<\EOF
-+#define USE_SETUID_ENVIRON 1
-+EOF
-+
- ###   Use option --enable-symlinks to make tic use symlinks, not hard links
- ###   to reduce storage requirements for the terminfo database.
- 
-diff -up ncurses-6.2-20210508/ncurses/curses.priv.h.setuid ncurses-6.2-20210508/ncurses/curses.priv.h
---- ncurses-6.2-20210508/ncurses/curses.priv.h.setuid	2021-04-04 00:12:56.000000000 +0200
-+++ ncurses-6.2-20210508/ncurses/curses.priv.h	2023-08-21 14:22:48.925376959 +0200
-@@ -210,7 +210,7 @@ extern int errno;
-  * If desired, one can configure this, disabling environment variables that
-  * point to custom terminfo/termcap locations.
-  */
--#ifdef USE_ROOT_ENVIRON
-+#if defined(USE_ROOT_ENVIRON) && defined(USE_SETUID_ENVIRON)
- #define use_terminfo_vars() 1
- #else
- #define use_terminfo_vars() _nc_env_access()
-diff -up ncurses-6.2-20210508/ncurses/tinfo/access.c.setuid ncurses-6.2-20210508/ncurses/tinfo/access.c
---- ncurses-6.2-20210508/ncurses/tinfo/access.c.setuid	2020-08-29 18:22:03.000000000 +0200
-+++ ncurses-6.2-20210508/ncurses/tinfo/access.c	2023-08-21 14:22:48.925376959 +0200
-@@ -37,6 +37,8 @@
- 
- #include <tic.h>
- 
-+#include <sys/auxv.h>
-+
- MODULE_ID("$Id: access.c,v 1.27 2020/08/29 16:22:03 juergen Exp $")
- 
- #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
-@@ -169,7 +171,18 @@ _nc_is_file_path(const char *path)
-     return result;
- }
- 
--#ifndef USE_ROOT_ENVIRON
-+#define is_posix_elevated() \
-+	(getuid() != geteuid() \
-+	 || getgid() != getegid())
-+
-+#define is_elevated() \
-+	(getauxval(AT_SECURE) \
-+	 ? TRUE \
-+	 : (errno != ENOENT \
-+	    ? FALSE \
-+	    : is_posix_elevated()))
-+
-+#if !defined(USE_ROOT_ENVIRON) || !defined(USE_SETUID_ENVIRON)
- /*
-  * Returns true if we allow application to use environment variables that are
-  * used for searching lists of directories, etc.
-@@ -177,15 +190,18 @@ _nc_is_file_path(const char *path)
- NCURSES_EXPORT(int)
- _nc_env_access(void)
- {
--#if HAVE_ISSETUGID
--    if (issetugid())
--	return FALSE;
--#elif HAVE_GETEUID && HAVE_GETEGID
--    if (getuid() != geteuid()
--	|| getgid() != getegid())
--	return FALSE;
-+    int result = TRUE;
-+
-+#if !defined(USE_SETUID_ENVIRON)
-+    if (is_elevated()) {
-+	result = FALSE;
-+    }
- #endif
--    /* ...finally, disallow root */
--    return (getuid() != ROOT_UID) && (geteuid() != ROOT_UID);
-+#if !defined(USE_ROOT_ENVIRON)
-+    if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) {
-+	result = FALSE;
-+    }
-+#endif
-+    return result;
- }
- #endif
-diff -up ncurses-6.2-20210508/ncurses/tinfo/comp_error.c.setuid ncurses-6.2-20210508/ncurses/tinfo/comp_error.c
---- ncurses-6.2-20210508/ncurses/tinfo/comp_error.c.setuid	2023-08-21 14:27:08.268309417 +0200
-+++ ncurses-6.2-20210508/ncurses/tinfo/comp_error.c	2023-08-21 14:33:13.716214256 +0200
-@@ -148,8 +148,8 @@ _nc_syserr_abort(const char *const fmt,
-     /* If we're debugging, try to show where the problem occurred - this
-      * will dump core.
-      */
--#ifndef USE_ROOT_ENVIRON
--    if (getuid() != ROOT_UID)
-+#if !defined(USE_ROOT_ENVIRON) || !defined(USE_SETUID_ENVIRON)
-+    if (_nc_env_access())
- #endif
- 	abort();
- #endif
-diff -up ncurses-6.2-20210508/ncurses/tinfo/write_entry.c.setuid ncurses-6.2-20210508/ncurses/tinfo/write_entry.c
---- ncurses-6.2-20210508/ncurses/tinfo/write_entry.c.setuid	2020-08-29 18:22:03.000000000 +0200
-+++ ncurses-6.2-20210508/ncurses/tinfo/write_entry.c	2023-08-21 14:32:22.738227530 +0200
-@@ -215,11 +215,7 @@ _nc_set_writedir(const char *dir)
-     const char *destination;
-     char actual[PATH_MAX];
- 
--    if (dir == 0
--#ifndef USE_ROOT_ENVIRON
--	&& use_terminfo_vars()
--#endif
--	)
-+    if (dir == 0 && use_terminfo_vars())
- 	dir = getenv("TERMINFO");
- 
-     if (dir != 0)

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;

ncurses-urxvt.patch

@@ -1,7 +1,7 @@
 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,181 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -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,
  
@@ -13,7 +13,6 @@ diff -up ncurses-6.0-20150810/misc/terminfo.src.urxvt ncurses-6.0-20150810/misc/
 +# 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
-+# Updated: Robbie Harwood <rharwood@redhat.com>, 25 Oct 2019: restore deleted rxvt-unicode-256color
 +rxvt-unicode|rxvt-unicode terminal (X Window System),
 +	am,
 +	bce,
@@ -174,11 +173,6 @@ diff -up ncurses-6.0-20150810/misc/terminfo.src.urxvt ncurses-6.0-20150810/misc/
 +	tsl=\E]2;,
 +	fsl=\007,
 +	dsl=\E]2;\007,
-+
-+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
-+        colors#256,
-+        pairs#32767,
-+        use=rxvt-unicode,
 +
  #### MRXVT
  # mrxvt 0.5.4

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);

ncurses.spec

@@ -1,21 +1,23 @@
-%global revision 20210508
+%global revision 20180224
 Summary: Ncurses support utilities
 Name: ncurses
-Version: 6.2
+Version: 6.1
 Release: 10.%{revision}%{?dist}
 License: MIT
+Group: System Environment/Base
 URL: https://invisible-island.net/ncurses/ncurses.html
 Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz
-Source1: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz.asc
-Source2: https://invisible-island.net/public/dickey-invisible-island.txt
 
+Patch1: ncurses-usecap.patch
 Patch8: ncurses-config.patch
 Patch9: ncurses-libs.patch
 Patch11: ncurses-urxvt.patch
 Patch12: ncurses-kbs.patch
-Patch13: ncurses-cve-2023-29491.patch
+Patch13: ncurses-cve-2019-17594.patch
-Patch14: ncurses-setuid.patch
+Patch14: ncurses-cve-2019-17595.patch
-BuildRequires: gcc gcc-c++ gpm-devel gnupg2 make pkgconfig
+Patch15: ncurses-tputx.patch
+Patch16: ncurses-cve-2023-29491.patch
+BuildRequires: gcc gcc-c++ gpm-devel pkgconfig
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -31,7 +33,12 @@ tool captoinfo.
 
 %package libs
 Summary: Ncurses libraries
+Group: System Environment/Libraries
 Requires: %{name}-base = %{version}-%{release}
+# libs introduced in 5.6-13 
+Obsoletes: ncurses < 5.6-13
+Conflicts: ncurses < 5.6-13
+Obsoletes: libtermcap < 2.0.8-48
 
 %description libs
 The curses library routines are a terminal-independent method of
@@ -43,6 +50,7 @@ This package contains the ncurses libraries.
 
 %package compat-libs
 Summary: Ncurses compatibility libraries
+Group: System Environment/Libraries
 Requires: %{name}-base = %{version}-%{release}
 
 %description compat-libs
@@ -56,6 +64,7 @@ compatibility.
 
 %package c++-libs
 Summary: Ncurses C++ bindings
+Group: System Environment/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description c++-libs
@@ -68,10 +77,12 @@ This package contains C++ bindings of the ncurses ABI version 6 libraries.
 
 %package base
 Summary: Descriptions of common terminals
-# rxvt-unicode-256color entry used to be in rxvt-unicode and briefly
+Group: System Environment/Base
-# in rxvt-unicode-terminfo
+Obsoletes: termcap < 1:5.5-2
-Conflicts: rxvt-unicode < 9.22-15
+# base introduced in 5.6-13 
-Obsoletes: rxvt-unicode-terminfo < 9.22-18
+Conflicts: ncurses < 5.6-13
+# /lib -> /usr/lib move
+Conflicts: filesystem < 3
 BuildArch: noarch
 
 %description base
@@ -80,6 +91,7 @@ descriptions are included in the ncurses-term package.
 
 %package term
 Summary: Terminal descriptions
+Group: System Environment/Base
 Requires: %{name}-base = %{version}-%{release}
 BuildArch: noarch
 
@@ -89,9 +101,12 @@ the ncurses-base package.
 
 %package devel
 Summary: Development files for the ncurses library
+Group: Development/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: %{name}-c++-libs%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
+Obsoletes: libtermcap-devel < 2.0.8-48
+Provides: libtermcap-devel = 2.0.8-48
 
 %description devel
 The header files and libraries for developing applications that use
@@ -102,22 +117,24 @@ which will use ncurses.
 
 %package static
 Summary: Static libraries for the ncurses library
+Group: Development/Libraries
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description static
 The ncurses-static package includes static libraries of the ncurses library.
 
 %prep
-%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}
-
 %setup -q -n %{name}-%{version}-%{revision}
 
+%patch1 -p1 -b .usecap
 %patch8 -p1 -b .config
 %patch9 -p1 -b .libs
 %patch11 -p1 -b .urxvt
 %patch12 -p1 -b .kbs
-%patch13 -p1 -b .cve-2023-29491
+%patch13 -p1 -b .cve-2019-17594
-%patch14 -p1 -b .setuid
+%patch14 -p1 -b .cve-2019-17595
+%patch15 -p1 -b .tputx
+%patch16 -p1 -b .cve-2023-29491
 
 for f in ANNOUNCE; do
     iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -131,7 +148,6 @@ common_options="\
     --enable-overwrite \
     --enable-pc-files \
     --enable-xmc-glitch \
-    --disable-setuid-environ \
     --disable-stripping \
     --disable-wattr-macros \
     --with-cxx-shared \
@@ -160,8 +176,8 @@ for abi in 5 6; do
             [ $progs = yes ] || echo --without-progs
         )
 
-        %make_build libs
+        make %{?_smp_mflags} libs
-        [ $progs = yes ] && %make_build -C progs
+        [ $progs = yes ] && make %{?_smp_mflags} -C progs
 
         popd
     done
@@ -169,10 +185,8 @@ done
 
 %install
 make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs
-rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.5*
 make -C widec5 DESTDIR=$RPM_BUILD_ROOT install.libs
 make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs
-rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6*
 make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man}
 
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
@@ -184,9 +198,9 @@ baseterms=
 
 # prepare -base and -term file lists
 for termname in \
-    alacritty ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
+    ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
     Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
-    kitty konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-256color} pcansi \
+    konsole konsole-256color mach\* mlterm mrxvt nsterm putty{,-256color} pcansi \
     rxvt{,-\*} screen{,-\*color,.[^mlp]\*,.linux,.mlterm\*,.putty{,-256color},.mrxvt} \
     st{,-\*color} sun teraterm teraterm2.3 tmux{,-\*} vte vte-256color vwmterm \
     wsvt25\* xfce xterm xterm-\*
@@ -232,7 +246,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/ncurses*5-config
 rm -f $RPM_BUILD_ROOT%{_libdir}/terminfo
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*_g.pc
 
-xz NEWS
+bzip2 NEWS
 
 %ldconfig_scriptlets libs
 
@@ -241,7 +255,7 @@ xz NEWS
 %ldconfig_scriptlets compat-libs
 
 %files
-%doc ANNOUNCE AUTHORS NEWS.xz README TO-DO
+%doc ANNOUNCE AUTHORS NEWS.bz2 README TO-DO
 %{_bindir}/[cirt]*
 %{_mandir}/man1/[cirt]*
 %{_mandir}/man5/*
@@ -258,6 +272,7 @@ xz NEWS
 %{_libdir}/libncurses++*.so.6*
 
 %files base -f terms.base
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc README
 %dir %{_sysconfdir}/terminfo
@@ -286,80 +301,25 @@ xz NEWS
 %{_libdir}/lib*.a
 
 %changelog
-* Mon Aug 21 2023 Miroslav Lichvar <mlichvar@redhat.com> 6.2-10.20210508
+* Tue Aug 15 2023 Miroslav Lichvar <mlichvar@redhat.com> 6.1-10.20180224
-- ignore TERMINFO and HOME only if setuid/setgid/capability (#2211666)
-
-* Mon Aug 14 2023 Miroslav Lichvar <mlichvar@redhat.com> 6.2-9.20210508
 - fix buffer overflow on terminfo with too many capabilities (CVE-2023-29491)
-- ignore TERMINFO and HOME environment variables if running as root (#2211666)
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.2-8.20210508
+* Tue May 18 2021 Miroslav Lichvar <mlichvar@redhat.com> 6.1-9.20180224
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- fix tput to accept -x option (#1916340)
-  Related: rhbz#1991688
 
-* Mon May 10 2021 Miroslav Lichvar <mlichvar@redhat.com> 6.2-7.20210508
+* Tue May 18 2021 Miroslav Lichvar <mlichvar@redhat.com> 6.1-8.20180224
-- update to 6.2-20210508
+- fix buffer overflow in terminfo entry hashtable (CVE-2019-17594)
+- handle missing character after backslash in terminfo entry (CVE-2019-17595)
 
-* Tue May 04 2021 Miroslav Lichvar <mlichvar@redhat.com> 6.2-6.20210501
+* Wed Jan 16 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-7.20180224
-- update to 6.2-20210501
+- disable stripping on program installation (#1665177)
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2-5.20200222
+* Tue Jan 08 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-6.20180224
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- rebuild with latest gcc (#1648947)
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.2-4.20200222
+* Fri Jul 27 2018 Miroslav Lichvar <mlichvar@redhat.com> 6.1-5.20180224
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-- Use make macros
-- Remove %license definition
-- Add BuildRequires: make
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2-3.20200222
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Miroslav Lichvar <mlichvar@redhat.com> 6.2-2.20200222
-- move alacritty and kitty entries to -base (#1849974)
-
-* Wed Feb 26 2020 Miroslav Lichvar <mlichvar@redhat.com> 6.2-1.20200222
-- update to 6.2-20200222
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-15.20191109
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 12 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-14.20191109
-- update to 6.1-20191109
-- remove LDFLAGS from pkgconfig files and ncurses-config scripts (#1771137)
-
-* Thu Oct 31 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-13.20191026
-- update to 6.1-20191026 (CVE-2019-17594 CVE-2019-17595)
-- restore rxvt-unicode-256color terminfo (Robbie Harwood) (#1430935)
-- conflict/obsolete rxvt-unicode (sub)packages with terminfo (#1430935)
-- drop old obsoletes and conflicts
-
-* Wed Aug 07 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-12.20190803
-- update to 6.1-20190803
-- verify upstream signatures
-- compress NEWS by xz
-
-* Wed Jul 24 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-11.20190720
-- update to 6.1-20190720
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-10.20180923
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 16 2019 Miroslav Lichvar <mlichvar@redhat.com> 6.1-9.20180923
-- disable stripping on program installation
-
-* Mon Sep 24 2018 Miroslav Lichvar <mlichvar@redhat.com> 6.1-8.20180923
-- update to 6.1-20180923
-
-* Mon Jul 16 2018 Miroslav Lichvar <mlichvar@redhat.com> 6.1-7.20180714
-- update to 6.1-20180714
-- add gcc-c++ to build requirements
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-6.20180224
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed May 09 2018 Miroslav Lichvar <mlichvar@redhat.com> 6.1-5.20180224
 - fix crash in parsing of terminfo use capability (CVE-2018-10754)
+- add gcc-c++ to build requirements
 
 * Mon Feb 26 2018 Miroslav Lichvar <mlichvar@redhat.com> 6.1-4.20180224
 - update to 6.1-20180224

sources

@@ -1,2 +1 @@
-SHA512 (ncurses-6.2-20210508.tgz) = a83165dcd0f08afad4940f222286126f6f3f01ca914f3f9d500478432ffc735c4eb259154555eeeec39847cd207e1b54e1ef2b3add0b47d93c1646c3da831356
+SHA512 (ncurses-6.1-20180224.tgz) = 26a0b8a88e965fa4089a48cd0af46b0ffa90d621a7d207c5c09c8cbd60f2cf073953c64ad109469bef9f52e5137067924148c33880cdd2161024a6e42ea4607d
-SHA512 (ncurses-6.2-20210508.tgz.asc) = 73e460116b347b2fc2f4932b4a73d17d44705a279fc2b8390c835ec912ab046b5cfe7ce59cc35a124e08fe25a2c68160d5389b52a14bf3a320274b4d05d03b83