diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-05-09 19:23:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-22 10:53:47 +0100 |
commit | 12ed0bd79135d543ef065970671776ce719b81d9 (patch) | |
tree | c2da5a53706dd7968d1fc4af05444b80b052823a /meta/recipes-extended/less | |
parent | d1c2e5a9297e8e62e7b6b6bbdc6893c55629277a (diff) | |
download | poky-12ed0bd79135d543ef065970671776ce719b81d9.tar.gz |
less: update 608 -> 633
Drop backport.
License-update: copyright years.
(From OE-Core rev: 1df20ffdf96f048e54197c838e5544a88e879855)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/less')
-rw-r--r-- | meta/recipes-extended/less/files/CVE-2022-46663.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/less/less_633.bb (renamed from meta/recipes-extended/less/less_608.bb) | 8 |
2 files changed, 3 insertions, 33 deletions
diff --git a/meta/recipes-extended/less/files/CVE-2022-46663.patch b/meta/recipes-extended/less/files/CVE-2022-46663.patch deleted file mode 100644 index 20f9d89ed8..0000000000 --- a/meta/recipes-extended/less/files/CVE-2022-46663.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | CVE: CVE-2022-46663 | ||
2 | Upstream-Status: Backport | ||
3 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
4 | |||
5 | From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 | ||
6 | From: Mark Nudelman <markn@greenwoodsoftware.com> | ||
7 | Date: Fri, 7 Oct 2022 19:25:46 -0700 | ||
8 | Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. | ||
9 | |||
10 | --- | ||
11 | line.c | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/line.c b/line.c | ||
15 | index 236c49ae..cba7bdd1 100644 | ||
16 | --- a/line.c | ||
17 | +++ b/line.c | ||
18 | @@ -633,8 +633,8 @@ ansi_step(pansi, ch) | ||
19 | /* Hyperlink ends with \7 or ESC-backslash. */ | ||
20 | if (ch == '\7') | ||
21 | return ANSI_END; | ||
22 | - if (pansi->prev_esc && ch == '\\') | ||
23 | - return ANSI_END; | ||
24 | + if (pansi->prev_esc) | ||
25 | + return (ch == '\\') ? ANSI_END : ANSI_ERR; | ||
26 | pansi->prev_esc = (ch == ESC); | ||
27 | return ANSI_MID; | ||
28 | } | ||
diff --git a/meta/recipes-extended/less/less_608.bb b/meta/recipes-extended/less/less_633.bb index f907a8159c..2defb5ccb7 100644 --- a/meta/recipes-extended/less/less_608.bb +++ b/meta/recipes-extended/less/less_633.bb | |||
@@ -21,15 +21,13 @@ SECTION = "console/utils" | |||
21 | 21 | ||
22 | LICENSE = "GPL-3.0-or-later | BSD-2-Clause" | 22 | LICENSE = "GPL-3.0-or-later | BSD-2-Clause" |
23 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ | 23 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ |
24 | file://LICENSE;md5=38fc26d78ca8d284a2a5a4bbc263d29b \ | 24 | file://LICENSE;md5=1b2446f5c8632bf63a97d7a49750e1c6 \ |
25 | " | 25 | " |
26 | DEPENDS = "ncurses" | 26 | DEPENDS = "ncurses" |
27 | 27 | ||
28 | SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ | 28 | SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz" |
29 | file://CVE-2022-46663.patch \ | ||
30 | " | ||
31 | 29 | ||
32 | SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" | 30 | SRC_URI[sha256sum] = "2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f" |
33 | 31 | ||
34 | UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" | 32 | UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" |
35 | 33 | ||