From c136b777dfd8cff836a6483d9b7b6131c746acd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:46:37 +0200 Subject: [PATCH] package/less: bump version to 633 Removed patch which is included in this version. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...-on-invalid-embedded-escape-sequence.patch | 27 ------------------- package/less/less.hash | 4 +-- package/less/less.mk | 5 +--- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5e1fec9e97..29d816956a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -685,7 +685,6 @@ package/lcdproc/0001-LCDd.conf.patch Upstream package/lcdproc/0002-Add-missing-ioctl-header.patch Upstream package/lcdproc/0003-Fixcompilation-with-GCC-10-x.patch Upstream package/leafnode2/0001-cross_makefile.patch Upstream -package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch Upstream package/let-me-create/0001-fix-build-with-musl-C-library.patch Upstream package/leveldb/0001-Fix-compilation-with-g-4.8.2.patch Upstream package/leveldb/0002-CMake-install-libmemenv.a.patch Upstream diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch deleted file mode 100644 index 233f949e24..0000000000 --- a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 -From: Mark Nudelman -Date: Fri, 7 Oct 2022 19:25:46 -0700 -Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. - -[Retrieved from: -https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] -Signed-off-by: Fabrice Fontaine ---- - 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/package/less/less.hash b/package/less/less.hash index 19be26cae0..8018c9fab1 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# https://www.greenwoodsoftware.com/less/less-608.sig -sha256 a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209 less-608.tar.gz +# https://www.greenwoodsoftware.com/less/less-633.sig +sha256 2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f less-633.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index dfbd411863..91ce08f4f0 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,16 +4,13 @@ # ################################################################################ -LESS_VERSION = 608 +LESS_VERSION = 633 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses -# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch -LESS_IGNORE_CVES += CVE-2022-46663 - define LESS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less endef