.

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=38
2011-03-04 15:47:46 +00:00 · 2011-03-04 15:47:46 +00:00 · 24337466d8
commit 24337466d8
parent 8d7e4e9735
7 changed files with 942 additions and 15 deletions
--- a/ncurses-5.7-20101009-patch.tar.bz2
+++ b/ncurses-5.7-20101009-patch.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65b95e9b76903f87b26a7469356084bdb9ef776e743a98c68acf209d05992bf7
-size 1922346
--- a/ncurses-5.7.tar.bz2
+++ b/ncurses-5.7.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94fa65f2e2eda239e87325fc56511892810166f4a262fc67576d82eb92f70047
-size 1822833
--- a/ncurses-5.8-20110226-patch.tar.bz2
+++ b/ncurses-5.8-20110226-patch.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70867196796ea254d092de0a052b4c5d7766929df713b20a9204da981116e271
+size 120
--- a/ncurses-5.8-overwrite.dif
+++ b/ncurses-5.8-overwrite.dif
@ -1,12 +1,12 @@
 --- configure
 +++ configure	2010-10-11 14:04:42.000000000 +0000
-@@ -6083,6 +6083,7 @@ else
+@@ -6159,6 +6159,7 @@ else
 fi;
- echo "$as_me:6084: result: $with_overwrite" >&5
+ echo "$as_me:6160: result: $with_overwrite" >&5
 echo "${ECHO_T}$with_overwrite" >&6
 +WITH_OVERWRITE="$with_overwrite"
 
- echo "$as_me:6087: checking if external terminfo-database is used" >&5
+ echo "$as_me:6163: checking if external terminfo-database is used" >&5
 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
 --- configure.in
 +++ configure.in	2010-10-12 08:14:30.779926168 +0000
--- a/ncurses-5.8.dif
+++ b/ncurses-5.8.dif
@ -0,0 +1,929 @@
+--- aclocal.m4
+++ aclocal.m4	2010-10-11 13:57:42.000000000 +0000
+@@ -549,7 +549,7 @@ AC_MSG_CHECKING([for size of bool])
+ AC_CACHE_VAL(cf_cv_type_of_bool,[
+ 	rm -f cf_test.out
+ 	AC_TRY_RUN([
+-#include <stdlib.h>
+//#include <stdlib.h> // conflict with exit declaration
+ #include <stdio.h>
+ 
+ #if defined(__cplusplus)
+@@ -3851,12 +3851,15 @@ cat >>$cf_edit_man <<CF_EOF
+ 		echo '? missing rename for '\$cf_source
+ 		cf_target="\$cf_source"
+ 	fi
+-	cf_target="\$cf_subdir\${section}/\${cf_target}"
+-
+ CF_EOF
+ fi
+ 
+ cat >>$cf_edit_man <<CF_EOF
+for t in \$cf_target; do
+	t="\$cf_subdir\${section}/\${t}"
+CF_EOF
+
+cat >>$cf_edit_man <<CF_EOF
+ 	sed	-f $cf_man_alias \\
+ CF_EOF
+ 
+@@ -3866,7 +3869,7 @@ cat >>$cf_edit_man <<CF_EOF
+ CF_EOF
+ else
+ cat >>$cf_edit_man <<CF_EOF
+-		< \$i >\$TMP
+		< \$i | sed -f $srcdir/edit_man.sed >\$TMP
+ CF_EOF
+ fi
+ 
+@@ -3899,7 +3902,7 @@ cat >>$cf_edit_man <<CF_EOF
+ 		mv \$TMP.$cf_so_strip \$TMP
+ 	fi
+ 	fi
+-	cf_target="\$cf_target.$cf_so_strip"
+	t="\$t.$cf_so_strip"
+ CF_EOF
+ fi
+ 
+@@ -3908,23 +3911,23 @@ case "$MANPAGE_FORMAT" in #(vi
+ cat >>$cf_edit_man <<CF_EOF
+ 	if test \$form = format ; then
+ 		# BSDI installs only .0 suffixes in the cat directories
+-		cf_target="\`echo \$cf_target|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`"
+		t="\`echo \$t|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`"
+ 	fi
+ CF_EOF
+   ;;
+ esac
+ 
+ cat >>$cf_edit_man <<CF_EOF
+-	suffix=\`basename \$cf_target | sed -e 's%^[[^.]]*%%'\`
+	suffix=\`basename \$t | sed -e 's%^[[^.]]*%%'\`
+ 	if test \$verb = installing ; then
+-		echo \$verb \$cf_target
+-		\$INSTALL_DATA \$TMP \$cf_target
+		echo \$verb \$t
+		\$INSTALL_DATA \$TMP \$t
+ 		test -d \$cf_subdir\${section} &&
+ 		test -n "\$aliases" && (
+ 			cd \$cf_subdir\${section} && (
+-				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
+				cf_source=\`echo \$t |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
+ 				test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
+-				cf_target=\`basename \$cf_target\`
+				t=\`basename \$t\`
+ 				for cf_alias in \$aliases
+ 				do
+ 					if test \$section = 1 ; then
+@@ -3933,7 +3936,7 @@ cat >>$cf_edit_man <<CF_EOF
+ 
+ 					if test "$MANPAGE_SYMLINKS" = yes ; then
+ 						if test -f \$cf_alias\${suffix} ; then
+-							if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+							if ( cmp -s \$t \$cf_alias\${suffix} )
+ 							then
+ 								continue
+ 							fi
+@@ -3943,18 +3946,18 @@ CF_EOF
+ case "x$LN_S" in #(vi
+ *-f) #(vi
+ cat >>$cf_edit_man <<CF_EOF
+-						$LN_S \$cf_target \$cf_alias\${suffix}
+						$LN_S \$t \$cf_alias\${suffix}
+ CF_EOF
+ 	;;
+ *)
+ cat >>$cf_edit_man <<CF_EOF
+ 						rm -f \$cf_alias\${suffix}
+-						$LN_S \$cf_target \$cf_alias\${suffix}
+						$LN_S \$t \$cf_alias\${suffix}
+ CF_EOF
+ 	;;
+ esac
+ cat >>$cf_edit_man <<CF_EOF
+-					elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+					elif test "\$t" != "\$cf_alias\${suffix}" ; then
+ 						echo ".so \$cf_source" >\$TMP
+ CF_EOF
+ if test -n "$cf_compress" ; then
+@@ -3974,9 +3977,9 @@ cat >>$cf_edit_man <<CF_EOF
+ 			)
+ 		)
+ 	elif test \$verb = removing ; then
+-		test -f \$cf_target && (
+-			echo \$verb \$cf_target
+-			rm -f \$cf_target
+		test -f \$t && (
+			echo \$verb \$t
+			rm -f \$t
+ 		)
+ 		test -d \$cf_subdir\${section} &&
+ 		test -n "\$aliases" && (
+@@ -3996,6 +3999,7 @@ cat >>$cf_edit_man <<CF_EOF
+ #		echo ".hy 0"
+ 		cat \$TMP
+ 	fi
+done
+ 	;;
+ esac
+ done
+--- configure.in
+++ configure.in	2010-10-12 08:54:24.000000000 +0000
+@@ -1763,6 +1763,7 @@ if test "$with_termlib" != no ; then
+ 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
+ 	fi
+	TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ else
+ 	# the next lines are needed for linking libtic over libncurses
+ 	TINFO_NAME=${LIB_NAME}
+--- configure
+++ configure	2010-10-12 08:54:46.000000000 +0000
+@@ -5401,7 +5401,7 @@ irix*) #(vi
+ 	fi
+ 	;;
+ linux*|gnu*|k*bsd*-gnu) #(vi
+-	LD_RPATH_OPT="-Wl,-rpath,"
+	LD_RPATH_OPT="-Wl,-rpath-link,"
+ 	;;
+ openbsd[2-9].*) #(vi
+ 	LD_RPATH_OPT="-Wl,-rpath,"
+@@ -9890,12 +9890,15 @@ cat >>$cf_edit_man <<CF_EOF
+ 		echo '? missing rename for '\$cf_source
+ 		cf_target="\$cf_source"
+ 	fi
+-	cf_target="\$cf_subdir\${section}/\${cf_target}"
+-
+ CF_EOF
+ fi
+ 
+ cat >>$cf_edit_man <<CF_EOF
+for t in \$cf_target; do
+	t="\$cf_subdir\${section}/\${t}"
+CF_EOF
+
+cat >>$cf_edit_man <<CF_EOF
+ 	sed	-f $cf_man_alias \\
+ CF_EOF
+ 
+@@ -9905,7 +9908,7 @@ cat >>$cf_edit_man <<CF_EOF
+ CF_EOF
+ else
+ cat >>$cf_edit_man <<CF_EOF
+-		< \$i >\$TMP
+		< \$i | sed -f $srcdir/edit_man.sed >\$TMP
+ CF_EOF
+ fi
+ 
+@@ -9938,7 +9941,7 @@ cat >>$cf_edit_man <<CF_EOF
+ 		mv \$TMP.$cf_so_strip \$TMP
+ 	fi
+ 	fi
+-	cf_target="\$cf_target.$cf_so_strip"
+	t="\$t.$cf_so_strip"
+ CF_EOF
+ fi
+ 
+@@ -9947,23 +9950,23 @@ case "$MANPAGE_FORMAT" in #(vi
+ cat >>$cf_edit_man <<CF_EOF
+ 	if test \$form = format ; then
+ 		# BSDI installs only .0 suffixes in the cat directories
+-		cf_target="\`echo \$cf_target|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`"
+		t="\`echo \$t|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`"
+ 	fi
+ CF_EOF
+   ;;
+ esac
+ 
+ cat >>$cf_edit_man <<CF_EOF
+-	suffix=\`basename \$cf_target | sed -e 's%^[^.]*%%'\`
+	suffix=\`basename \$t | sed -e 's%^[^.]*%%'\`
+ 	if test \$verb = installing ; then
+-		echo \$verb \$cf_target
+-		\$INSTALL_DATA \$TMP \$cf_target
+		echo \$verb \$t
+		\$INSTALL_DATA \$TMP \$t
+ 		test -d \$cf_subdir\${section} &&
+ 		test -n "\$aliases" && (
+ 			cd \$cf_subdir\${section} && (
+-				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
+				cf_source=\`echo \$t |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
+ 				test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
+-				cf_target=\`basename \$cf_target\`
+				t=\`basename \$t\`
+ 				for cf_alias in \$aliases
+ 				do
+ 					if test \$section = 1 ; then
+@@ -9972,7 +9975,7 @@ cat >>$cf_edit_man <<CF_EOF
+ 
+ 					if test "$MANPAGE_SYMLINKS" = yes ; then
+ 						if test -f \$cf_alias\${suffix} ; then
+-							if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+							if ( cmp -s \$t \$cf_alias\${suffix} )
+ 							then
+ 								continue
+ 							fi
+@@ -9982,18 +9985,18 @@ CF_EOF
+ case "x$LN_S" in #(vi
+ *-f) #(vi
+ cat >>$cf_edit_man <<CF_EOF
+-						$LN_S \$cf_target \$cf_alias\${suffix}
+						$LN_S \$t \$cf_alias\${suffix}
+ CF_EOF
+ 	;;
+ *)
+ cat >>$cf_edit_man <<CF_EOF
+ 						rm -f \$cf_alias\${suffix}
+-						$LN_S \$cf_target \$cf_alias\${suffix}
+						$LN_S \$t \$cf_alias\${suffix}
+ CF_EOF
+ 	;;
+ esac
+ cat >>$cf_edit_man <<CF_EOF
+-					elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
+					elif test "\$t" != "\$cf_alias\${suffix}" ; then
+ 						echo ".so \$cf_source" >\$TMP
+ CF_EOF
+ if test -n "$cf_compress" ; then
+@@ -10013,9 +10016,9 @@ cat >>$cf_edit_man <<CF_EOF
+ 			)
+ 		)
+ 	elif test \$verb = removing ; then
+-		test -f \$cf_target && (
+-			echo \$verb \$cf_target
+-			rm -f \$cf_target
+		test -f \$t && (
+			echo \$verb \$t
+			rm -f \$t
+ 		)
+ 		test -d \$cf_subdir\${section} &&
+ 		test -n "\$aliases" && (
+@@ -10035,6 +10038,7 @@ cat >>$cf_edit_man <<CF_EOF
+ #		echo ".hy 0"
+ 		cat \$TMP
+ 	fi
+done
+ 	;;
+ esac
+ done
+@@ -17551,7 +17555,7 @@ else
+ #line 17550 "configure"
+ #include "confdefs.h"
+ 
+-#include <stdlib.h>
+// #include <stdlib.h> // conflict with exit declaration
+ #include <stdio.h>
+ 
+ #if defined(__cplusplus)
+@@ -18705,6 +18709,7 @@ if test "$with_termlib" != no ; then
+ 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
+ 	fi
+    TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ else
+ 	# the next lines are needed for linking libtic over libncurses
+ 	TINFO_NAME=${LIB_NAME}
+--- include/curses.h.in
+++ include/curses.h.in	2010-10-11 13:57:42.000000000 +0000
+@@ -144,6 +144,9 @@ typedef unsigned @cf_cv_typeof_chtype@ c
+ typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
+ #endif
+ 
+#include <features.h>
+#include <sys/types.h>
+
+ /*
+  * We need FILE, etc.  Include this before checking any feature symbols.
+  */
+--- include/termcap.h.in
+++ include/termcap.h.in	2006-05-18 14:07:15.000000000 +0000
+@@ -46,6 +46,8 @@ extern "C"
+ {
+ #endif /* __cplusplus */
+ 
+#include <features.h>
+#include <termios.h>
+ #include <sys/types.h>
+ 
+ #undef  NCURSES_CONST 
+--- include/tic.h
+++ include/tic.h	2006-05-18 14:07:15.000000000 +0000
+@@ -225,12 +225,12 @@ extern NCURSES_EXPORT(const struct alias
+ #define NOTFOUND	((struct name_table_entry *) 0)
+ 
+ /* out-of-band values for representing absent capabilities */
+-#define ABSENT_BOOLEAN		((signed char)-1)	/* 255 */
+#define ABSENT_BOOLEAN		(-1)			/* 255 */
+ #define ABSENT_NUMERIC		(-1)
+ #define ABSENT_STRING		(char *)0
+ 
+ /* out-of-band values for representing cancels */
+-#define CANCELLED_BOOLEAN	((signed char)-2)	/* 254 */
+#define CANCELLED_BOOLEAN	(-2)			/* 254 */
+ #define CANCELLED_NUMERIC	(-2)
+ #define CANCELLED_STRING	(char *)(-1)
+ 
+--- man/man_db.renames
+++ man/man_db.renames	2006-05-18 14:07:15.000000000 +0000
+@@ -167,6 +167,8 @@ tput.1				tput.1
+ tset.1				tset.1
+ vprintf.3s			vprintf.3
+ wresize.3x			wresize.3ncurses
+curs_terminfo.\\\*n		terminfo.5
+tack.1				tack.1
+ #
+ # Other:
+ tack.1m				tack.1
+--- man/ncurses.3x
+++ man/ncurses.3x	2006-05-18 14:07:15.000000000 +0000
+@@ -113,6 +113,10 @@ after the shell environment variable \fB
+ \fBtset(1)\fR is usually responsible for doing this.
+ [See \fBterminfo\fR(\*n) for further details.]
+ .PP
+Beware: the terminal your program is running may or may not have
+the features you expect. Ncurses makes no attempt to check available
+features in advance. This is upto the programmer.
+.PP
+ The \fBncurses\fR library permits manipulation of data structures,
+ called \fIwindows\fR, which can be thought of as two-dimensional
+ arrays of characters representing all or part of a CRT screen.
+--- misc/ncurses-config.in
+++ misc/ncurses-config.in	2010-01-12 10:43:31.000000000 +0000
+@@ -75,7 +75,7 @@ while test $# -gt 0; do
+ 		if test "${includedir}" != /usr/include ; then
+ 			INCS="-I${includedir}"
+ 		fi
+-		if test "x@WITH_OVERWRITE@" = xno ; then
+		if test "${THIS%[0-5]*}" != ncurses ; then
+ 			INCS="$INCS -I${includedir}/${THIS}"
+ 		fi
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+--- misc/terminfo.src
+++ misc/terminfo.src	2011-02-28 13:37:36.107926455 +0000
+@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
+ 	am,
+ 	cols#80,
+ 	bel=^G, cr=^M, cud1=^J, ind=^J,
+-unknown|unknown terminal type,
+unknown|switch|patch|unknown terminal type,
+	gn, use=dumb,
+net|network|arpanet|dialup|unknown network terminal type,
+ 	gn, use=dumb,
+ lpr|printer|line printer,
+ 	OTbs, hc, os,
+@@ -936,9 +938,15 @@ linux-c|linux console 1.3.6+ for older n
+ # The 2.2.x kernels add a private mode that sets the cursor type; use that to
+ # get a block cursor for cvvis.
+ # reported by Frank Heckenbach <frank@g-n-u.de>.
+#
+# Do not use a block cursor, <werner@suse.de>
+# This because many programs do have a workaround for the long time
+# missed cvvis entry. A `\E[?1c' in civis will cause a visible but
+# zero high cusor ... re-add it for kernels 2.6.11+
+#
+ linux|linux console,
+ 	civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c,
+-	cvvis=\E[?25h\E[?8c, use=linux-c-nc,
+	cvvis=\E[?25h\E[?0c, use=linux-c-nc,
+ 
+ # Subject: linux 2.6.26 vt back_color_erase
+ # Changes to the Linux console driver broke bce model as reported in
+@@ -2376,6 +2384,7 @@ vt132|DEC vt132,
+ # at the top of the keyboard.  The "DO" key is used as F10 to avoid conflict
+ # with the key marked (ESC) on the vt220.  See vt220d for an alternate mapping.
+ # PF1--PF4 are used as F1--F4.
+# (cvvis added by werner)
+ #
+ vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
+ 	OTbs, OTpt, am, mir, xenl, xon,
+@@ -2385,7 +2394,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+ 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
+ 	clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M,
+ 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+	cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, cvvis=\E[?25h, dch1=\E[P,
+ 	dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+ 	if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>,
+ 	is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+@@ -2533,6 +2542,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+ # to SMASH the 1k-barrier...
+ # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+ # (vt320: uncommented <fsl> --esr)
+# (cvvis added by werner)
+ vt320|vt300|dec vt320 7 bit terminal,
+ 	am, eslok, hs, mir, msgr, xenl,
+ 	cols#80, lines#24, wsl#80,
+@@ -2542,7 +2552,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+ 	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,
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$},
+ 	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+ 	il1=\E[L, ind=\ED,
+@@ -2976,13 +2986,14 @@ putty-vt100|VT100+ keyboard layout,
+ # retrieving the window title, and for setting the window size (i.e., using
+ # "resize -s"), though it does not pass SIGWINCH to the application if the
+ # user resizes the window with the mouse.
+# (cvvis added by werner)
+ teraterm2.3|Tera Term Pro,
+ 	km, xon@,
+ 	ncv#43, vt@,
+ 	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,
+ 	blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
+ 	cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+	cuu1=\E[A, cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG,
+ 	il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~,
+@@ -3182,6 +3193,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
+ 	use=vt100+enq,
+ # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
+ # The name has been changed and some aliases have been removed.
+# (cvvis added by werner)
+ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
+ 	OTbs, am, bce, km, mir, msgr, xenl,
+ 	cols#80, it#8, lines#24, ncv@,
+@@ -3191,7 +3203,7 @@ xterm-xf86-v32|xterm terminal emulator (
+ 	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,
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+ 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
+@@ -3631,8 +3643,26 @@ xterm-noapp|xterm with cursor keys in no
+ xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
+ 	lines#24, use=xterm-old,
+ 
+# For SuSE Linux: Werner Fink <werner@suse.de>
+# Note that the modern xterm does not use escape sequences
+# for the numbers on the numpad keys in case of switched
+# into application mode and with numlock enabled.
+# To test this, use `tput smkx' and `Ctrl-V + key stroke'
+xterm-suse|xterm terminal emulator (X11R6.8.2 Window System with SuSE LINUX), 
+	kbs=\177, kdch1=\E[3~,
+	kDIV=\EOo, kMUL=\EOj, kMIN=\EOm, kPLS=\EOk,
+	kfnd=\E[1~, kslt=\E[4~,
+	use=xterm-new,
+
+ # This is xterm for ncurses.
+ xterm|xterm terminal emulator (X Window System),
+	use=xterm-suse,
+
+# xterm-debian is identical to xterm-new with the addition of a small
+# VT220-ism regarding the backspace and delete keys; this is mandated by
+# the keyboard configuration section of the Debian Policy Manual.
+xterm-debian|Debian xterm (backspace and delete changed), 
+	kbs=\177, kdch1=\E[3~,
+ 	use=xterm-new,
+ 
+ # This entry assumes that xterm's handling of VT100 SI/SO is disabled by
+@@ -3730,7 +3760,7 @@ xterm-color|nxterm|generic color xterm,
+ 	op=\E[m, use=xterm-r6, use=klone+color,
+ 
+ # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
+-gnome-rh62|Gnome terminal,
+gnome-rh62|Gnome terminal on Red Hat,
+ 	bce,
+ 	kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ 	use=xterm-color,
+@@ -3876,10 +3906,14 @@ mgt|Multi GNOME Terminal,
+ 
+ # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
+ # or not is debatable).
+-kvt|KDE terminal,
+kvt-rh|KDE terminal,
+ 	bce, km@,
+ 	kdch1=\177, kend=\E[F, khome=\E[H, use=xterm-color,
+ 
+# This is kvt for SuSE because we do not support BrokenByDesign[tm].
+kvt|KDE terminal, 
+	kbs=\177, kdch1=\E[3~, use=kvt-rh, 
+
+ # Konsole 1.0.1
+ # (formerly known as kvt)
+ #
+@@ -3994,14 +4028,14 @@ konsole-256color|KDE console window with
+ mlterm|multi lingual terminal emulator,
+ 	am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
+ 	colors#8, cols#80, it#8, lines#24, pairs#64,
+-	acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\E[H\E[2J, cnorm=\E[?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,
+-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
+ 	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, indn=\E[%p1%dS,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
+@@ -4055,6 +4089,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+ # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
+ # Since rxvt is not really compatible with xterm, it should be configured as
+ # "rxvt" or "rxvt-color".
+# (cvvis added by werner)
+ #
+ # removed dch/dch1 because they are inconsistent with bce/ech -TD
+ # remove km as per tack test -TD
+@@ -4066,13 +4101,14 @@ rxvt-basic|rxvt terminal base (X Window
+ 	clear=\E[H\E[2J, cnorm=\E[?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,
+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h,
+ 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
+ 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+ 	ind=^J, 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,
+-	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=\177, kcbt=\E[Z,
+	kmous=\E[M, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+	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,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+@@ -4081,7 +4117,7 @@ rxvt-basic|rxvt terminal base (X Window
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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=vt220+keypad, use=rxvt+pcfkeys,
+ # Key Codes from rxvt reference:
+ #
+ # Note: Shift + F1-F10 generates F11-F20
+@@ -4164,8 +4200,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,
+-	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^,
+	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\EOD, kcud1=\EOB,
+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^,
+ 	kend=\E[8~, 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~,
+@@ -4203,6 +4239,39 @@ rxvt-cygwin-native|rxvt terminal emulato
+ 	acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
+ 	use=rxvt-cygwin,
+ 
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
+#
+rxvt-unicode|rxvt-unicode terminal (X Window System), 
+	bw, ccc, hs, mc5i, npc, btns#5, colors#88, lm#0, ncv#0, pairs#256, 
+	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	dsl=\E]2;\007, ech=\E[%p1%dX, enacs=, flash=\E[?5h$<20/>\E[?5l, 
+	fsl=^G, indn=\E[%p1%dS, 
+	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, 
+	is1=\E[!p, 
+	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, 
+	kIC=\E2$, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, 
+	rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, 
+	rmcup=\E[r\E[?1049l, rmkx=\E[?1l\E>, rs1=\Ec, 
+	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, 
+	s2ds=\E*B, s3ds=\E+B, 
+	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm, 
+	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%;, 
+	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%;, 
+	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, 
+	sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, 
+	smcup=\E[?1049h, smkx=\E[?1h\E=, 
+	tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
+	use=rxvt-basic, 
+
+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
+	colors#256, 
+	pairs#32767, 
+	use=rxvt-unicode, 
+
+
+ # This variant is supposed to work with rxvt 2.7.7 when compiled with
+ # NO_BRIGHTCOLOR defined.  rxvt needs more work...
+ rxvt-16color|xterm with 16 colors like aixterm,
+@@ -4230,7 +4299,7 @@ mrxvt-256color|multitabbed rxvt with 256
+ # Eterm 0.9.3
+ #
+ # removed kf0 which conflicts with kf10 -TD
+-# remove cvvis which conflicts with cnorm -TD
+# remove cvvis which conflicts with cnorm -TD (and re-added by werner)
+ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
+ # but does otherwise follow the rxvt+pcfkeys model -TD
+ # remove nonworking flash -TD
+@@ -4244,13 +4313,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+ 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+ 	cud=\E[%p1%dB, cud1=\E[B, 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,
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+ 	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[?47l\E>\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
+-	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
+	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=\177,
+ 	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=,
+@@ -4622,7 +4691,7 @@ pty|4bsd pseudo teletype,
+ 	smso=\Ea$, smul=\Ea!, use=cbunix,
+ 
+ # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
+-eterm|gnu emacs term.el terminal emulation,
+eterm-19|gnu emacs term.el terminal emulation,
+ 	am, mir, xenl,
+ 	cols#80, lines#24,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
+@@ -4635,6 +4704,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,
+eterm|emacs|gnu emacs term.el terminal emulation, 
+	colors#8, pairs#64, 
+	invis=\E[8m, kcub1=\EOD, kcud1=\EOB, 
+	kcuf1=\EOC, kcuu1=\EOA, kend=\E[4~, 
+	khome=\E[1~, knp=\E[6~, kpp=\E[5~, 
+	setab=\E[%p1%{40}%+%dm, setaf=\E[%p1%{30}%+%dm, 
+	use=eterm-19, 
+ 
+ # 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,
+@@ -4683,7 +4759,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+ 	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, 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, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z,
+	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, 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,
+@@ -4862,7 +4938,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,
+-	il1=\E[L, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
+	il1=\E[L, ind=^J, kbs=\177, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
+ 	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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
+@@ -6581,7 +6657,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,
+-hp70092|hp70092a|hp70092A|HP 700/92,
+hp70092|hp70092a|hp70092A|70092|HP 700/92,
+ 	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,
+@@ -9712,6 +9788,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)
+# (cvvis added by werner)
+ 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,
+@@ -9721,7 +9798,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=^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,
+	cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+ 	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+ 	flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
+ 	fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
+@@ -13996,7 +14073,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=^J, kcub1=\ED, kcud1=\EB,
+ 	kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
+-ibm3151|IBM 3151 display,
+ibm3151|i3151|IBM 3151 display,
+ 	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%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
+ 	sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
+@@ -14224,7 +14301,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g,
+-ibm5081|hft|IBM Megapel Color display,
+ibm5081|ibmmpel|hft|IBM Megapel Color display,
+ 	acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
+ 	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	2011-02-28 13:39:30.571925904 +0000
+@@ -205,7 +205,7 @@ $(DESTDIR)$(libdir) :
+ ../lib : ; mkdir $@
+ 
+ ./fallback.c : $(tinfo)/MKfallback.sh
+-	sh -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+	sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+ 
+ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
+ 	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
+--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h	2006-05-18 14:07:15.000000000 +0000
+@@ -1875,6 +1875,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
+ extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int);
+ extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
+ extern NCURSES_EXPORT(int) _nc_access (const char *, int);
+extern NCURSES_EXPORT(void) _nc_fsid(void);
+extern NCURSES_EXPORT(void) _nc_fseid(void);
+ extern NCURSES_EXPORT(int) _nc_baudrate (int);
+ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
+ extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
+--- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh	2006-05-18 14:07:15.000000000 +0000
+@@ -0,0 +1,11 @@
+#!/bin/sh
+
+PATH=$PWD/../progs:$PATH
+if test -n "$LD_LIBRARY_PATH"; then
+    LD_LIBRARY_PATH="$PWD/../lib:$LD_LIBRARY_PATH"
+else
+    LD_LIBRARY_PATH="$PWD/../lib"
+fi
+export PATH LD_LIBRARY_PATH
+
+exec ${1+"$@"}
+--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh	2006-05-18 14:07:15.000000000 +0000
+@@ -68,6 +68,12 @@ else
+ 	tmp_info=
+ fi
+ 
+if test -n "$TERMINFO" -a -d "$TERMINFO" ; then
+	infocmp="infocmp -v1 -A $TERMINFO"
+else
+	infocmp="infocmp -v1"
+fi
+
+ cat <<EOF
+ /*
+  * DO NOT EDIT THIS FILE BY HAND!  It is generated by MKfallback.sh.
+@@ -87,7 +93,7 @@ EOF
+ 	for x in $*
+ 	do
+ 		echo "/* $x */"
+-		infocmp -E $x
+		$infocmp -E $x
+ 	done
+ 
+ 	cat <<EOF
+@@ -98,7 +104,7 @@ EOF
+ 	for x in $*
+ 	do
+ 		echo "$comma /* $x */"
+-		infocmp -e $x
+		$infocmp -e $x
+ 		comma=","
+ 	done
+ 
+--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c	2010-10-11 13:57:42.000000000 +0000
+@@ -36,6 +36,9 @@
+ #include <sys/stat.h>
+ 
+ #include <tic.h>
+#ifdef linux
+# include <sys/fsuid.h>
+#endif
+ 
+ MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")
+ 
+@@ -105,6 +108,30 @@ _nc_basename(char *path)
+     return path + _nc_pathlast(path);
+ }
+ 
+NCURSES_EXPORT(void)
+_nc_fsid()
+{
+#ifdef linux
+	int _old_errno = errno;
+	setfsuid(getuid());
+	setfsgid(getgid());
+	errno = _old_errno;
+#endif
+	return;
+}
+
+NCURSES_EXPORT(void)
+_nc_fseid()
+{
+#ifdef linux
+	int _old_errno = errno;
+	setfsuid(geteuid());
+	setfsgid(getegid());
+	errno = _old_errno;
+#endif
+	return;
+}
+
+ NCURSES_EXPORT(int)
+ _nc_access(const char *path, int mode)
+ {
+--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c	2011-02-28 13:40:41.847925526 +0000
+@@ -556,6 +556,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
+     } else if ((value = tigetnum("U8")) >= 0) {
+ 	result = value;		/* use extension feature */
+     } else if ((env = getenv("TERM")) != 0) {
+	char *yast = getenv("YAST_DOES_ACS");
+	if (yast != 0)
+	    return 0;		/* YaST uses always correct font mappings */
+ 	if (strstr(env, "linux")) {
+ 	    result = 1;		/* always broken */
+ 	} else if (strstr(env, "screen") != 0
+--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c	2011-02-28 13:41:44.063927030 +0000
+@@ -369,6 +369,7 @@ _nc_read_file_entry(const char *const fi
+     int limit;
+     char buffer[MAX_ENTRY_SIZE + 1];
+ 
+    _nc_fsid();
+     if (_nc_access(filename, R_OK) < 0
+ 	|| (fp = fopen(filename, "rb")) == 0) {
+ 	T(("cannot open terminfo %s (errno=%d)", filename, errno));
+@@ -386,6 +387,7 @@ _nc_read_file_entry(const char *const fi
+ 	}
+ 	fclose(fp);
+     }
+    _nc_fseid();
+ 
+     return (code);
+ }
+--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c	2006-05-18 14:07:15.000000000 +0000
+@@ -323,14 +323,18 @@ _nc_getent(
+ 	     */
+ 	    if (fd >= 0) {
+ 		(void) lseek(fd, (off_t) 0, SEEK_SET);
+-	    } else if ((_nc_access(db_array[current], R_OK) < 0)
+-		       || (fd = open(db_array[current], O_RDONLY, 0)) < 0) {
+-		/* No error on unfound file. */
+-		if (errno == ENOENT)
+-		    continue;
+-		free(record);
+-		return (TC_SYS_ERR);
+ 	    } else {
+		_nc_fsid();
+		if ((_nc_access(db_array[current], R_OK) < 0) ||
+		    (fd = open(db_array[current], O_RDONLY, 0)) < 0) {
+		    _nc_fseid();
+		    /* No error on unfound file. */
+		    if (errno == ENOENT)
+			continue;
+		    free(record);
+		    return (TC_SYS_ERR);
+	        }
+		_nc_fseid();
+ 		myfd = TRUE;
+ 	    }
+ 	    lineno = 0;
+@@ -1101,8 +1105,10 @@ _nc_read_termcap_entry(const char *const
+ 	for (i = 0; i < filecount; i++) {
+ 
+ 	    T(("Looking for %s in %s", tn, termpaths[i]));
+	    _nc_fsid();
+ 	    if (_nc_access(termpaths[i], R_OK) == 0
+ 		&& (fp = fopen(termpaths[i], "r")) != (FILE *) 0) {
+		_nc_fseid();
+ 		_nc_set_source(termpaths[i]);
+ 
+ 		/*
+@@ -1114,6 +1120,7 @@ _nc_read_termcap_entry(const char *const
+ 
+ 		(void) fclose(fp);
+ 	    }
+	    _nc_fseid();
+ 	}
+     }
+     if (copied != 0)
+--- test/test.priv.h
+++ test/test.priv.h	2006-05-18 14:07:19.000000000 +0000
+@@ -622,12 +622,12 @@ extern char *strnames[], *strcodes[], *s
+ #endif
+ 
+ /* out-of-band values for representing absent capabilities */
+-#define ABSENT_BOOLEAN		((signed char)-1)	/* 255 */
+#define ABSENT_BOOLEAN		(char)-1)		/* 255 */
+ #define ABSENT_NUMERIC		(-1)
+ #define ABSENT_STRING		(char *)0
+ 
+ /* out-of-band values for representing cancels */
+-#define CANCELLED_BOOLEAN	((signed char)-2)	/* 254 */
+#define CANCELLED_BOOLEAN	(-2)			/* 254 */
+ #define CANCELLED_NUMERIC	(-2)
+ #define CANCELLED_STRING	(char *)(-1)
+ 
--- a/ncurses-5.8.tar.bz2
+++ b/ncurses-5.8.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1be06220869b279a822d7d52f0ccc3d5ade6a88bc0fd46118c09e18cbdb7a155
+size 2043172
--- a/ncurses.spec
+++ b/ncurses.spec
@ -36,12 +36,12 @@ AutoReqProv:    on
 Obsoletes:      ncurses-64bit
 %endif
 #
-Version:        5.7
-Release:        11
+Version:        5.8
+Release:        1
 Summary:        New curses Libraries
 Url:            http://invisible-island.net/ncurses/ncurses.html
 Source0:        ncurses-%{version}.tar.bz2
-Source1:        ncurses-%{version}-20101009-patch.tar.bz2
+Source1:        ncurses-%{version}-20110226-patch.tar.bz2
 Source2:        handle.linux
 Source3:        README.devel
 Source4:        ncurses-rpmlintrc
@ -50,11 +50,10 @@ Source6:        edit.sed
 Source7:        baselibs.conf
 Patch0:         ncurses-%{version}.dif
 Patch1:         ncurses-5.7-printw.dif
-Patch3:         ncurses-5.7-overwrite.dif
+Patch3:         ncurses-5.8-overwrite.dif
 Patch4:         ncurses-5.7-tack.dif
 Patch5:         ncurses-5.7-gpm.dif
 Patch6:         ncurses-5.6-fallback.dif
-Patch7:         ncurses-5.7-pthread.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@ -277,7 +276,6 @@ mv tack-* tack
 %patch -P 4 -p0 -b .hs
 %patch -P 5 -p0 -b .gpm
 %patch -P 6 -p0 -b .fb
-%patch -P 7 -p0 -b .pthread
 %patch -P 0 -p0 -b .p0
 rm -vf include/ncurses_dll.h
 rm -vf mkdirs.sh