Drop backport. License-update: copyright years.
Signed-off-by: Alexander Kanavin <[email protected]> --- .../less/files/CVE-2022-46663.patch | 28 ------------------- .../less/{less_608.bb => less_633.bb} | 8 ++---- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-extended/less/files/CVE-2022-46663.patch rename meta/recipes-extended/less/{less_608.bb => less_633.bb} (84%) 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 20f9d89ed86..00000000000 --- a/meta/recipes-extended/less/files/CVE-2022-46663.patch +++ /dev/null @@ -1,28 +0,0 @@ -CVE: CVE-2022-46663 -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <[email protected]> -Date: Fri, 7 Oct 2022 19:25:46 -0700 -Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. - ---- - line.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/line.c b/line.c -index 236c49ae..cba7bdd1 100644 ---- a/line.c -+++ b/line.c -@@ -633,8 +633,8 @@ ansi_step(pansi, ch) - /* Hyperlink ends with \7 or ESC-backslash. */ - if (ch == '\7') - return ANSI_END; -- if (pansi->prev_esc && ch == '\\') -- return ANSI_END; -+ if (pansi->prev_esc) -+ return (ch == '\\') ? ANSI_END : ANSI_ERR; - pansi->prev_esc = (ch == ESC); - return ANSI_MID; - } diff --git a/meta/recipes-extended/less/less_608.bb b/meta/recipes-extended/less/less_633.bb similarity index 84% rename from meta/recipes-extended/less/less_608.bb rename to meta/recipes-extended/less/less_633.bb index f907a8159cc..2defb5ccb7a 100644 --- a/meta/recipes-extended/less/less_608.bb +++ b/meta/recipes-extended/less/less_633.bb @@ -21,15 +21,13 @@ SECTION = "console/utils" LICENSE = "GPL-3.0-or-later | BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://LICENSE;md5=38fc26d78ca8d284a2a5a4bbc263d29b \ + file://LICENSE;md5=1b2446f5c8632bf63a97d7a49750e1c6 \ " DEPENDS = "ncurses" -SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ - file://CVE-2022-46663.patch \ - " +SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"; -SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" +SRC_URI[sha256sum] = "2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"; -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181071): https://lists.openembedded.org/g/openembedded-core/message/181071 Mute This Topic: https://lists.openembedded.org/mt/98788930/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
