pool/less
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1084014 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1084014
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/less?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2023-05-03 10:56:26 +00:00 committed by Git OBS Bridge
commit ff1769f1a3
9 changed files with 99 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cve-2022-46663.patch
View File

@ -1,24 +0,0 @@
From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001
From: Mark Nudelman <markn@greenwoodsoftware.com>
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;
}

8
less-429-more.patch
View File

@ -1,8 +1,8 @@
Index: less-608/option.c
Index: less-632/option.c
===================================================================
--- less-608.orig/option.c 2022-07-22 19:26:24.000000000 +0000
+++ less-608/option.c 2023-02-07 15:08:06.567552684 +0000
@@ -171,6 +171,10 @@ scan_option(s)
--- less-632.orig/option.c
+++ less-632/option.c
@@ -165,6 +165,10 @@ public void scan_option(char *s)
s--;
optc = 'z';
break;

38
less-429-shell.patch
View File

@ -1,8 +1,8 @@
Index: less-608/filename.c
Index: less-632/filename.c
===================================================================
--- less-608.orig/filename.c 2022-07-22 19:26:24.000000000 +0000
+++ less-608/filename.c 2023-02-07 15:07:55.521151736 +0000
@@ -572,7 +572,7 @@ shellcmd(cmd)
--- less-632.orig/filename.c
+++ less-632/filename.c
@@ -550,7 +550,7 @@ static FILE * shellcmd(char *cmd)
#if HAVE_SHELL
char *shell;
@ -11,24 +11,24 @@ Index: less-608/filename.c
if (!isnullenv(shell))
{
char *scmd;
Index: less-608/less.hlp
Index: less-632/less.hlp
===================================================================
--- less-608.orig/less.hlp 2022-07-22 19:26:24.000000000 +0000
+++ less-608/less.hlp 2023-02-07 15:07:55.522151863 +0000
@@ -103,7 +103,7 @@
--- less-632.orig/less.hlp
+++ less-632/less.hlp
@@ -104,7 +104,7 @@
___<_n_a_m_e_> Display the setting of an option, by name.
+_c_m_d Execute the less cmd each time a new file is examined.
- !_c_o_m_m_a_n_d Execute the shell command with $SHELL.
+ !_c_o_m_m_a_n_d Execute the shell command with $LESSSHELL.
#_c_o_m_m_a_n_d Execute the shell command, expanded like a prompt.
|XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command.
s _f_i_l_e Save input to a file.
v Edit the current file with $VISUAL or $EDITOR.
Index: less-608/less.nro
Index: less-632/less.nro
===================================================================
--- less-608.orig/less.nro 2022-07-22 19:26:24.000000000 +0000
+++ less-608/less.nro 2023-02-07 15:07:55.522151863 +0000
@@ -443,7 +443,7 @@ current file.
--- less-632.orig/less.nro
+++ less-632/less.nro
@@ -457,7 +457,7 @@ current file.
A pound sign (#) is replaced by the name of the previously examined file.
"!!" repeats the last shell command.
"!" with no shell command simply invokes a shell.
@ -36,8 +36,8 @@ Index: less-608/less.nro
+On Unix systems, the shell is taken from the environment variable LESSSHELL,
or defaults to "sh".
On MS-DOS and OS/2 systems, the shell is the normal command processor.
.IP "| <m> shell-command"
@@ -2044,7 +2044,7 @@ compatible mode.
.IP "# shell-command"
@@ -2274,7 +2274,7 @@ automatically when running in
.IP PATH
User's search path (used to find a lesskey file
on MS-DOS and OS/2 systems).
@ -46,11 +46,11 @@ Index: less-608/less.nro
The shell used to execute the !\& command, as well as to expand filenames.
.IP TERM
The type of terminal on which
Index: less-608/lsystem.c
Index: less-632/lsystem.c
===================================================================
--- less-608.orig/lsystem.c 2022-07-22 19:26:24.000000000 +0000
+++ less-608/lsystem.c 2023-02-07 15:07:55.523151990 +0000
@@ -124,13 +124,13 @@ lsystem(cmd, donemsg)
--- less-632.orig/lsystem.c
+++ less-632/lsystem.c
@@ -121,13 +121,13 @@ public void lsystem(char *cmd, char *don
/*
* Pass the command to the system to be executed.

BIN
less-608.sig
View File

Binary file not shown.

3
less-608.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
size 362346

BIN
less-632.sig Normal file
View File

Binary file not shown.

3
less-632.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f71b2a9178ddad8a238259032f3c9d21929846ce453af2a77fc906ccc31d4d9
size 375440

72
less.changes
View File

@ -1,3 +1,75 @@
-------------------------------------------------------------------
Tue May 2 08:25:11 UTC 2023 - Kristyna Streitova <kstreitova@suse.com>
- Update to 632
* Add LESSUTFCHARDEF environment variable (github #275).
* Add # command (github #330).
* Add ^S search modifier (github #196).
* Add --wordwrap option (github #113).
* Add --no-vbell option (github #304).
* Add --no-search-headers option (github #44).
* Add --modelines option (github #89).
* Add --intr option (github #224).
* Add --proc-backspace, --proc-tab and --proc-return options (github #335).
* Add --show-preproc-errors option (github #258).
* Add LESS_LINES and LESS_COLUMNS environment variables (github #84).
* Add LESS_DATA_DELAY environment variable (github #337).
* Allow empty "lines" field in --header option.
* Update Unicode tables.
* Improve ability of ^X to interrupt F command (github #49).
* Status column (-J) shows off-screen matches.
* Parenthesized sub-patterns in searches are colored with unique colors, if supported by the regular expression library (github #196).
* Don't allow opening a tty as file input unless -f is set (github #309).
* Don't require newline input after +&... option (github #339).
* Fix incorrect handling of some Private Use Unicode characters.
* Fix ANSI color bug when overstriking with colored chars (github #276).
* Fix compiler const warning (github #279).
* Fix signal race in iread (github #280).
* Fix reading procfs files on Linux (github #282).
* Fix --ignore-case with ctrl-R (no regex) search (github #300).
* Fix bug doing repeat search after setting & filter (github #299).
* Fix bug doing repeat search before non-repeat search.
* Fix crash with -R and certain line lengths (github #338).
* Fix input of Windows dead keys (github #352).
* Don't retain search options from a cancelled search (github #302).
* Don't call realpath on fake filenames like "-" (github #289).
* Implement lesstest test suite.
* Convert function parameter definitions from K&R to C89 (github #316).
- Version 629 news
* Add LESSUTFCHARDEF environment variable (github #275).
* Add # command (github #330).
* Add ^S search modifier (github #196).
* Add --wordwrap option (github #113).
* Add --no-vbell option (github #304).
* Add --no-search-headers option (github #44).
* Add --modelines option (github #89).
* Add --intr option (github #224).
* Add --proc-backspace, --proc-tab and --proc-return options (github #335).
* Add --show-preproc-errors option (github #258).
* Add LESS_LINES and LESS_COLUMNS environment variables (github #84).
* Allow empty "lines" field in --header option.
* Update Unicode tables.
* Improve ability of ^X to interrupt F command (github #49).
* Status column (-J) shows off-screen matches.
* Parenthesized sub-patterns in searches are colored with unique colors, if supported by the regular expression library (github #196).
* Don't allow opening a tty as file input unless -f is set (github #309).
* Don't require newline input after +&... option (github #339).
* Fix incorrect handling of some Private Use Unicode characters.
* Fix ANSI color bug when overstriking with colored chars (github #276).
* Fix compiler const warning (github #279).
* Fix signal race in iread (github #280).
* Fix reading procfs files on Linux (github #282).
* Fix --ignore-case with ctrl-R (no regex) search (github #300).
* Fix bug doing repeat search after setting & filter (github #299).
* Fix bug doing repeat search before non-repeat search.
* Fix crash with -R and certain line lengths (github #338).
* Don't retain search options from a cancelled search (github #302).
* Don't call realpath on fake filenames like "-" (github #289).
* Implement lesstest test suite.
* Convert function parameter definitions from K&R to C89 (github #316).
- Remove cve-2022-46663.patch that was applied upstream
- Refresh less-429-more.patch and less-429-shell.patch
-------------------------------------------------------------------
Tue Feb 7 15:02:12 UTC 2023 - Peter Simons <psimons@suse.com>

3
less.spec
View File

@ -22,7 +22,7 @@
%define use_usretc 1
%endif
Name: less
Version: 608
Version: 632
Release: 0
Summary: Text File Browser and Pager Similar to more
License: BSD-2-Clause OR GPL-3.0-or-later
@ -37,7 +37,6 @@ Source5: https://www.greenwoodsoftware.com/less/less-%{version}.sig
Source6: https://www.greenwoodsoftware.com/less/pubkey.asc#/%{name}.keyring
Patch0: less-429-shell.patch
Patch2: less-429-more.patch
Patch3: https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch#/cve-2022-46663.patch
BuildRequires: automake
BuildRequires: ncurses-devel
BuildRequires: pkgconfig