From patchwork Sun Mar 18 22:16:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 887487 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B6PjABDR"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bU0yqQ9Y"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 404D8B4hgtz9sTm for ; Mon, 19 Mar 2018 09:17:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=v+WAx7nd6R8+ssNzajbLzsMI5VPZwrUzEmO2jWi9Ito=; b=B6PjABDREb/j4g O5vZFbrIFXwOla3U1gmg1XHFWR8D3DGVz7swHVYds/nlfD923yvBi2LtKqQbFjx3dEJOkxcyf9hI7 /bZgkL39LtOXhuxCmky7Omfy/9OXVkVlpE/IaUE5N7p4ALQMixkXxT/uLHeo7zIVtAunQzsXKT0In ASA11Ovk0sEr2GJX2uZZ2Ja+hnOw4uFdMtwknzt1+cFKgdzHpgxWXKJCVw65YcbdMKmmu7Hcq0S0X AXgNxXGnjMxPRlkB1Gl2BZXd1Lp3ZumkhFOZ27LH20zdAudfSU260Vavq6VlRdwoaMMKNSZ/9dc6v +tM2Ssi+eXHVL3K4Vc7g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1exgbi-00059m-Qv; Sun, 18 Mar 2018 22:16:50 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1exgbe-00058S-Pl for lede-dev@lists.infradead.org; Sun, 18 Mar 2018 22:16:48 +0000 Received: by mail-pg0-x241.google.com with SMTP id s13so6154349pgn.12 for ; Sun, 18 Mar 2018 15:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CQGlzBjz/LFtTGiFf5i39CdVdPncIrTivIzsHqQ6IRA=; b=bU0yqQ9YVQ9TzgMHBeqjp/EnK8o4G7B2sEVp71q6kD07RPr2juihdsGjuB2tSwK1HE u00sR6EXCDt3F1ioD5IcAkgc4PGL7UaUi4O8+Mkp5vrjt5rdS49sX3HqCLkF9NI0wrQD H5Zji8fZGi8XECHyYfI5BfKalTFcr75Tkxtnb3VobF/o8hFqGlK8ydMqIqsPKZN3lbwQ OGwh9VX4bthC0KvlMYULUrQRh+VVzXOHCiKIA4ghrFi11l/ysivV+VcyFPXRP2rgv9X2 CtPHrKMobXtxKN3OckC5nOfnOfNvZhsO5vY1GWK4H3zyDktdmui6SmXqlNV7Pqg9tf3D Yggw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CQGlzBjz/LFtTGiFf5i39CdVdPncIrTivIzsHqQ6IRA=; b=gW1xdC3HVEDI9uovZ4Ph6bXTz6NuHUJyI1+plCJZkiEDYO4VcPsuHOUlQZFccZzlN4 B3ee10JjQbfmJt01MxqI7OxI3bSAlr2J34nfd8RJR0XGjmJcElSol+p9DqOrFxesIo5L UVQp+ttuQFg5nWc3cHNu5Mqs+tklyuF5use9abeimt0rHbKSb3zLP5FChXa/M6Wb4pKM SHxZuQfKB6TufrVefKUKHQGPE/f+2adPZMD/3qzbCC5DD968Vg+S9Si1h7NmV26C24aw zN6rh7FYzMl75JCaU4m+kpPPf2bJHe6eTFRjb6ixDYuoqnqcBhdO9EaydmayWGZex9Aq prCA== X-Gm-Message-State: AElRT7GvHmYCyz9XTNeochJ6h2ePdNAzyFYoUyu4A986RdJNqzBD0b8L RxNim77W31uqEvBNtkBbmeDjaPEp X-Google-Smtp-Source: AG47ELur0G2vAtzBlh5J0JjYhBTR03o52wOsm7G+KRzYY6oyTFosebtIA4rF9cSuomWQfvofl2NezA== X-Received: by 10.98.59.4 with SMTP id i4mr8322543pfa.26.1521411395273; Sun, 18 Mar 2018 15:16:35 -0700 (PDT) Received: from desktop.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id a9sm11689650pfe.147.2018.03.18.15.16.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 15:16:34 -0700 (PDT) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Sun, 18 Mar 2018 15:16:25 -0700 Message-Id: <20180318221625.17686-1-rosenp@gmail.com> X-Mailer: git-send-email 2.16.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180318_151646_880375_7820A1F7 X-CRM114-Status: GOOD ( 11.06 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] ncurses: Update to 6.1. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Compile tested on ar71xx. Signed-off-by: Rosen Penev --- package/libs/ncurses/Makefile | 6 +-- .../patches/100-ncurses-5.6-20080112-urxvt.patch | 2 +- .../patches/101-ncurses-5.6-20080628-kbs.patch | 46 +++++++++++----------- .../ncurses/patches/102-ncurses-5.9-gcc-5.patch | 2 +- package/libs/ncurses/patches/500-cross.patch | 11 ------ package/libs/ncurses/patches/900-terminfo.patch | 18 ++++----- 6 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 package/libs/ncurses/patches/500-cross.patch diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 26fabeef77..95f05fa711 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses -PKG_VERSION:=6.0 +PKG_VERSION:=6.1 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/ncurses -PKG_HASH:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 +PKG_SOURCE_URL:=@GNU/$(PKG_NAME) +PKG_HASH:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 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 49537b94ee..ed7b2ee448 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 -@@ -5214,6 +5214,172 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5875,6 +5875,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 394b6f9fde..cb7d5a1582 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,52 +1,52 @@ --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -3955,6 +3955,7 @@ xterm-xfree86|xterm terminal emulator (X +@@ -4327,6 +4328,7 @@ xterm-xfree86|xterm terminal emulator (X # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, npc, + kbs=\177, indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM, - rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux, - use=xterm-basic, -@@ -5048,6 +5049,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 + rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout, + use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, +@@ -5703,6 +5704,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=^M, -@@ -5058,7 +5060,7 @@ rxvt-basic|rxvt terminal base (X Window - 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, + clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, +@@ -5713,7 +5713,7 @@ rxvt-basic|rxvt terminal base (X Window System), + 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, -@@ -6118,6 +6120,7 @@ eterm-color|Emacs term.el terminal emula +@@ -6883,6 +6885,7 @@ eterm-color|Emacs term.el terminal emula 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, + kbs=\177, - acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy + yzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M, -@@ -6128,7 +6131,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6894,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, 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, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, -+ kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, + 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, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, -@@ -6252,6 +6255,7 @@ screen.xterm-r6|screen customized for X1 +@@ -7023,6 +7026,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, - use=screen+fkeys, use=screen, - # Other terminals + 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, 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 0424b23781..b84fcb965c 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 -@@ -491,11 +491,22 @@ sed -n -f $ED1 \ +@@ -505,11 +505,22 @@ sed -n -f $ED1 \ -e 's/gen_$//' \ -e 's/ / /g' >>$TMP diff --git a/package/libs/ncurses/patches/500-cross.patch b/package/libs/ncurses/patches/500-cross.patch deleted file mode 100644 index 590bddf68c..0000000000 --- a/package/libs/ncurses/patches/500-cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -5720,7 +5720,7 @@ CF_EOF - EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" - fi - CF_SHARED_SONAME -- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' -+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]' - ;; - (mingw*) - cf_cv_shlib_version=mingw diff --git a/package/libs/ncurses/patches/900-terminfo.patch b/package/libs/ncurses/patches/900-terminfo.patch index ab623b1973..e9fe039d55 100644 --- a/package/libs/ncurses/patches/900-terminfo.patch +++ b/package/libs/ncurses/patches/900-terminfo.patch @@ -1,20 +1,20 @@ --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -4919,12 +4919,11 @@ konsole-xf3x|KDE console window with key - # The value for kbs reflects local customization rather than the settings used - # for XFree86 xterm. +@@ -5563,12 +5563,11 @@ konsole-xf3x|KDE console window with key + # The value for kbs (see konsole-vt100) reflects local customization + # than the settings used for XFree86 xterm. konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, - kend=\EOF, khome=\EOH, use=konsole+pcfkeys, - use=konsole-vt100, --# Konsole does not implement shifted cursor-keys. +- -konsole+pcfkeys|konsole subset of xterm+pcfkeys, -- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, -- use=xterm+pcf0, +- kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0, +- use=xterm+pce2, + kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, + kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, + kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, + kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, + khome=\EOH, use=konsole-vt100, - # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but - # it is still useful for deriving the other entries. - konsole-vt100|KDE console window with vt100 (sic) keyboard, + + # Obsolete: vt100.keymap + # KDE's "vt100" keyboard has no relationship to any terminal that DEC m