[openwrt/openwrt] ncurses: update to 6.3

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 19 11:26:46 PDT 2022 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3bf10bac1117eeb9e27c69f4bc5dbfe604c97733

commit 3bf10bac1117eeb9e27c69f4bc5dbfe604c97733
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Mon Nov 15 22:03:45 2021 +0800

    ncurses: update to 6.3
    
    release notes: https://invisible-island.net/ncurses/announce-6.3.html
    
    Signed-off-by: Huangbin Zhan <zhanhb88 at gmail.com>
---
 package/libs/ncurses/Makefile                      |  6 ++--
 .../patches/100-ncurses-5.6-20080112-urxvt.patch   |  2 +-
 .../patches/101-ncurses-5.6-20080628-kbs.patch     | 28 +++++++++----------
 .../ncurses/patches/102-ncurses-5.9-gcc-5.patch    |  4 +--
 .../patches/103-ncurses-ar-determinism.patch       | 32 +++++++++++-----------
 package/libs/ncurses/patches/900-terminfo.patch    |  2 +-
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index a6bc135b2d..b21dd2b0ab 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=6.2
-PKG_RELEASE:=3
+PKG_VERSION:=6.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
+PKG_HASH:=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=README
diff --git a/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch b/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
index d654eb28f0..2fdbb7b0be 100644
--- a/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
+++ b/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
@@ -1,6 +1,6 @@
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -6145,6 +6145,172 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -6616,6 +6616,172 @@ rxvt-cygwin-native|rxvt terminal emulato
  rxvt-16color|rxvt with 16 colors like aixterm,
  	ncv#32, use=ibm+16color, use=rxvt,
  
diff --git a/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch b/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
index 835c0c53d6..2d299197b0 100644
--- a/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
+++ b/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
@@ -1,22 +1,22 @@
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -4513,6 +4513,7 @@ xterm-xfree86|xterm terminal emulator (X
+@@ -4815,6 +4815,7 @@ xterm+nofkeys|building block for xterm f
  # This version reflects the current xterm features.
  xterm-new|modern xterm terminal emulator,
  	npc,
 +	kbs=\177,
- 	kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep,
- 	use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
- 	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
-@@ -5943,6 +5944,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+ 	kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index,
+ 	use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys,
+ 	use=xterm+nofkeys,
+@@ -6416,6 +6417,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
  rxvt-basic|rxvt terminal base (X Window System),
  	OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
  	cols#80, it#8, lines#24,
 +	kbs=\177,
  	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
- 	clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
-@@ -5953,7 +5955,7 @@ rxvt-basic|rxvt terminal base (X Window
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+ 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+@@ -6425,7 +6427,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,
  	ind=\n, is1=\E[?47l\E=\E[?1l,
@@ -25,7 +25,7 @@
  	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,
-@@ -7454,6 +7456,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
+@@ -8060,6 +8062,7 @@ dumb-emacs-ansi|Emacs dumb terminal with
  screen|VT 100/ANSI X3.64 virtual terminal,
  	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
  	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
@@ -33,16 +33,16 @@
  	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
  	     yzz{{||}}~~,
  	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
-@@ -7465,7 +7468,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -8071,7 +8074,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,
-@@ -7594,6 +7597,7 @@ screen.xterm-r6|screen customized for X1
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~,
+@@ -8199,6 +8202,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/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
index 972b64977d..a6398acf8e 100644
--- a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
+++ b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch
@@ -15,7 +15,7 @@ Subject: [PATCH] ncurses 5.9 - patch 20141206
 
 --- a/ncurses/base/MKlib_gen.sh
 +++ b/ncurses/base/MKlib_gen.sh
-@@ -502,11 +502,22 @@ sed -n -f $ED1 \
+@@ -511,11 +511,22 @@ sed -n -f $ED1 \
  	-e 's/gen_$//' \
  	-e 's/  / /g' >>$TMP
  
@@ -39,6 +39,6 @@ Subject: [PATCH] ncurses 5.9 - patch 20141206
 -	-e 's/^ //' \
 -	-e 's/_Bool/NCURSES_BOOL/g' \
 +| sed -f $ED1 \
- | $AWK -f $AW2 \
+ | "$AWK" -f $AW2 \
  | sed -f $ED3 \
  | sed \
diff --git a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
index 1bfa93e3aa..5ef8ab7ab0 100644
--- a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
+++ b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
@@ -1,22 +1,22 @@
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -454,7 +454,7 @@ AC_REQUIRE([CF_PROG_AR])
+@@ -505,7 +505,7 @@ AC_CACHE_CHECK(for options to update arc
+ 		;;
+ 	(*)
+ 		cf_cv_ar_flags=unknown
+-		for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
++		for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
+ 		do
  
- AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
+ 			# check if $ARFLAGS already contains this choice
 --- a/configure
 +++ b/configure
-@@ -4751,7 +4751,7 @@ if test "${cf_cv_ar_flags+set}" = set; t
- else
- 
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
- 	do
+@@ -5072,7 +5072,7 @@ else
+ 		;;
+ 	(*)
+ 		cf_cv_ar_flags=unknown
+-		for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
++		for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
+ 		do
  
- 		# check if $ARFLAGS already contains this choice
+ 			# check if $ARFLAGS already contains this choice
diff --git a/package/libs/ncurses/patches/900-terminfo.patch b/package/libs/ncurses/patches/900-terminfo.patch
index 3c37183f28..96d78cde34 100644
--- a/package/libs/ncurses/patches/900-terminfo.patch
+++ b/package/libs/ncurses/patches/900-terminfo.patch
@@ -1,6 +1,6 @@
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -5802,12 +5802,11 @@ konsole-xf3x|KDE console window with key
+@@ -6240,12 +6240,11 @@ konsole-xf3x|KDE console window with key
  # The value for kbs (see konsole-vt100) reflects local customization rather
  # than the settings used for XFree86 xterm.
  konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,

More information about the lede-commits mailing list