From 024e927fd130396ad7a16cc8da1a2e3f1f4e3f92 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 7 Aug 2019 11:01:37 +0200
Subject: [PATCH] update to 6.1-20190803

---
 .gitignore        |  2 +-
 ncurses-kbs.patch | 31 +++++++++++++++----------------
 ncurses.spec      |  2 +-
 sources           |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index a48fa8b..a063639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ncurses-6.1-20190720.tgz
+/ncurses-6.1-20190803.tgz
diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch
index 7f37f42..68f4440 100644
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@@ -1,7 +1,7 @@
-diff -up ncurses-6.1-20190720/misc/terminfo.src.kbs ncurses-6.1-20190720/misc/terminfo.src
---- ncurses-6.1-20190720/misc/terminfo.src.kbs	2019-07-24 17:10:37.328904207 +0200
-+++ ncurses-6.1-20190720/misc/terminfo.src	2019-07-24 17:13:47.910351105 +0200
-@@ -5931,7 +5931,7 @@ rxvt-basic|rxvt terminal base (X Window
+diff -up ncurses-6.1-20190803/misc/terminfo.src.kbs ncurses-6.1-20190803/misc/terminfo.src
+--- ncurses-6.1-20190803/misc/terminfo.src.kbs	2019-08-07 10:51:41.252500592 +0200
++++ ncurses-6.1-20190803/misc/terminfo.src	2019-08-07 10:54:14.021820872 +0200
+@@ -5937,7 +5937,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,
@@ -10,7 +10,7 @@ diff -up ncurses-6.1-20190720/misc/terminfo.src.kbs ncurses-6.1-20190720/misc/te
  	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,
-@@ -5943,7 +5943,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5949,7 +5949,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,
@@ -19,25 +19,24 @@ diff -up ncurses-6.1-20190720/misc/terminfo.src.kbs ncurses-6.1-20190720/misc/te
  # Key Codes from rxvt reference:
  #
  # Note: Shift + F1-F10 generates F11-F20
-@@ -7404,7 +7404,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7424,7 +7424,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, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
-+	ind=\n, 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, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-@@ -7417,7 +7417,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+-	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,
+@@ -7438,6 +7438,7 @@ screen|VT 100/ANSI X3.64 virtual termina
  	sgr0=\E[m\017, smacs=^N, 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+index, use=xterm+alt1049,
--	use=ecma+color,
-+	use=ecma+color, use=xterm+kbs,
+ 	E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, 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,
-@@ -7533,6 +7533,7 @@ screen.xterm-r6|screen customized for X1
+@@ -7553,6 +7554,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,
diff --git a/ncurses.spec b/ncurses.spec
index 3d1a1b9..74644d2 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,4 +1,4 @@
-%global revision 20190720
+%global revision 20190803
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 6.1
diff --git a/sources b/sources
index de62b93..b281bb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ncurses-6.1-20190720.tgz) = 8d6386d6d2dca22bfd8fa21d1af335f54b31a76e671a1905c34a0af9a1c0b55d790438523f4c89890326ebc54169790eba854d095d9c2baa6aaa58bb4a025476
+SHA512 (ncurses-6.1-20190803.tgz) = a7aff48283ecec2ef3bf4441a0c3bdf3e2a89efa38edba5a1447d0978db4b72ff8ec6bb61e02eb368930771035bb3a3730837d9a22312ad2b6c856300c604887