Accepting request 1319277 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1319277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/less?expand=0&rev=81

less-429-more.patch

@@ -1,8 +1,12 @@
-Index: less-643/option.c
+---
+ option.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: less-676/option.c
 ===================================================================
---- less-643.orig/option.c
-+++ less-643/option.c
-@@ -165,6 +165,10 @@ public void scan_option(char *s)
+--- less-676.orig/option.c	2025-04-16 21:56:56.000000000 +0200
++++ less-676/option.c	2025-04-25 13:37:40.675778807 +0200
+@@ -169,6 +169,10 @@
  			s--;
  			optc = 'z';
  			break;

less-429-shell.patch

@@ -1,8 +1,14 @@
-Index: less-656/filename.c
+---
+ filename.c |    2 +-
+ less.hlp   |    2 +-
+ lsystem.c  |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: less-676/filename.c
 ===================================================================
---- less-656.orig/filename.c
-+++ less-656/filename.c
-@@ -553,7 +553,7 @@ static FILE * shellcmd(constant char *cm
+--- less-676.orig/filename.c	2025-04-16 21:56:56.000000000 +0200
++++ less-676/filename.c	2025-04-25 13:37:10.333952009 +0200
+@@ -553,7 +553,7 @@
  #if HAVE_SHELL
  	constant char *shell;
  
@@ -11,11 +17,11 @@ Index: less-656/filename.c
  	if (!isnullenv(shell))
  	{
  		char *scmd;
-Index: less-656/less.hlp
+Index: less-676/less.hlp
 ===================================================================
---- less-656.orig/less.hlp
-+++ less-656/less.hlp
-@@ -109,7 +109,7 @@
+--- less-676.orig/less.hlp	2025-04-16 21:56:56.000000000 +0200
++++ less-676/less.hlp	2025-04-25 13:37:10.334552439 +0200
+@@ -113,7 +113,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.
  
@@ -24,33 +30,11 @@ Index: less-656/less.hlp
    #_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.
-Index: less-656/less.nro
+Index: less-676/lsystem.c
 ===================================================================
---- less-656.orig/less.nro
-+++ less-656/less.nro
-@@ -468,7 +468,7 @@ A pound sign (#) is replaced by the name
- "!" with no shell command simply invokes a shell.
- If a \(haP (CONTROL-P) is entered immediately after the !,
- no "done" message is printed after the shell command is executed.
--On Unix systems, the shell is taken from the environment variable SHELL,
-+On Unix systems, the shell is taken from the environment variable LESSSHELL,
- or defaults to "sh".
- On MS-DOS, Windows, and OS/2 systems, the shell is the normal command processor.
- .IP "# shell-command"
-@@ -2493,7 +2493,7 @@ automatically when running in
- .IP PATH
- User's search path (used to find a lesskey file
- on MS-DOS, Windows, and OS/2 systems).
--.IP SHELL
-+.IP LESSSHELL
- The shell used to execute the !\& command, as well as to expand filenames.
- .IP TERM
- The type of terminal on which
-Index: less-656/lsystem.c
-===================================================================
---- less-656.orig/lsystem.c
-+++ less-656/lsystem.c
-@@ -120,13 +120,13 @@ public void lsystem(constant char *cmd,
+--- less-676.orig/lsystem.c	2025-04-16 21:56:56.000000000 +0200
++++ less-676/lsystem.c	2025-04-25 13:37:10.334851222 +0200
+@@ -120,13 +120,13 @@
  
  	/*
  	 * Pass the command to the system to be executed.

less-661.tar.gz

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

less-685.tar.gz

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

less.changes

@@ -1,3 +1,114 @@
+-------------------------------------------------------------------
+Sat Nov 22 16:17:23 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- update to 685:
+  * Add LESS_TERMCAP_SUSPEND and LESS_TERMCAP_RESUME (github
+    #654).
+  * Change --incsearch so that after typing each character of the
+    pattern, the search begins at the position where the search
+    command was invoked, not the current position (github #640).
+  * Allow mixing of option arguments and filename arguments on
+    the command line unless POSIXLY_CORRECT is set (github #653).
+  * Don't output U+00AD and U+200D, and fix some bugs handling
+    emoji modifier characters (github #637).
+  * Fix hang if a search using ^S modifier matches empty string
+  * Fix bug using -g and -J (github #636).
+  * Fix bug when pasting a search pattern while --incsearch is
+    active (github #635).
+  * Fix bug in Windows build when autorepeating a search pattern
+  * Fix lesskey bug using #stop directive.
+  * Fix lesskey bug using "invalid" action (github #643).
+  * Fix bug causing file to appear to end prematurely if an input
+    command was received during a file read (github #649).
+  * Fix performance issue in & filtering (github #638).
+  * Fix some problems reported by valgrind (github #659, github
+    #660, github #661).
+  * Fix bad parsing of lesskey file an env var is a prefix of
+    another env var (github #626).
+  * Fix unexpected exit using -K if a key press is received while
+    reading the input file (github #628).
+
+-------------------------------------------------------------------
+Sun May 25 06:23:18 UTC 2025 - munix9@googlemail.com
+
+- Extend detection and preview for "Java archive data" (eg. .jar),
+  "Android package" (eg. .apk) and "ASCII cpio archive"
+  (eg. .obscpio) in lessopen.sh
+- Fix rpm preprocessing: Remove escaped quotes from $TMPF_pre in
+  lessopen.sh
+
+-------------------------------------------------------------------
+Fri Apr 25 11:32:43 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 676
+  * Treat -r in LESS environment variable as -R.
+  * Add ESC-j and ESC-k commands (github #560).
+  * Add --no-paste option (github #523).
+  * Add --no-edit-warn option (github #513).
+  * Add --form-feed option (github #496).
+  * Add ESC-b command (github #615).
+  * Make TAB complete option name in -- command (github #531).
+  * Update the file size on an attempt to go past end of file.
+  * Make -R able to pass through any OSC escape sequences, not
+    just OSC 8 (github #504).
+  * Setting LESS_IS_MORE=0 now disables "more" compatibility even
+    if invoked via a file link named "more" (github #500).
+  * Pass through escape sequences in prompts even if -R is not
+    set.
+  * Add LESS_SHELL_LINES to support shell prompts which use more
+    than one line (github #514).
+  * Add LESSANSIOSCALLOW to define OSC types which may be passed
+    through.
+  * Add LESSANSIOSCCHARS to define non-standard OSC intro chars.
+  * Add LESS_SIGUSR1 to define user signal handler (github #582).
+  * Add mouse and mouse6 commands to lesskey (github #569).
+  * Improve behavior of ^O^N and ^O^P commands.
+  * Fix unexpected behavior when entering a partial command
+    followed by a valid command (github #543).
+  * Fix bug when coloring prompt string with SGR sequences
+    (github #516).
+  * Fix bug when searching for text near an invalid UTF-8
+    sequence (github #542).
+  * Fix display bug when file contains ESC followed by NUL
+    (github #550).
+  * Fix bug when using +:n +:p +:x or +:d on the command line
+    (github #552).
+  * Fix bug with --no-number-headers when header is not at start
+    of file (github #566).
+  * Fix bug where lesstest fails if window is resized (github
+    #570).
+  * Fix bug using "configure --with-secure=no" (github #584).
+  * Fix bug using multibyte command chars (github #595).
+  * Fix auto_wrap setting on Windows (github #497).
+  * Fix two bugs using ^S search modifier (github #605).
+  * Fix bug searching for UTF-8 strings with the PCRE2 library
+    (github #610).
+  * Fix bug highlighting OSC 8 links when opening a new file.
+- Remove upstreamed reproducible.patch
+
+-------------------------------------------------------------------
+Sun Dec 15 06:16:41 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Update to 668
+  * Fix crash when using --header on command line
+  * Fix possible crash when scrolling left/right or toggling -S
+  * Fix bug when using #stop in a lesskey file
+  * Fix bug when using --shift or --match-shift on command line with a parameter starting with '.'
+  * Fix bug in R command when file size changes
+  * Fix bug using --header when file does not fill screen
+  * Fix ^X bug when output is not a terminal
+  * Fix bug where ^Z is not handled immediately
+  * Fix bug where first byte from a LESSOPEN filter is deleted if it is greater than 0x7F
+  * Fix uninitialized variable in edit_ifile
+  * Fix incorrect handling of UTF-8 chars in prompts
+- Add reproducible.patch to override build date (boo#1047218)
+
+-------------------------------------------------------------------
+Mon Oct 21 14:48:40 UTC 2024 - Antonio Feijoo <antonio.feijoo@suse.com>
+
+- Change preprocessor dependencies from Requires to Recommends. It's disabled by
+  default and they are not necessary for less.
+
 -------------------------------------------------------------------
 Fri Jul 12 19:50:55 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 
@@ -48,7 +159,7 @@ Mon May 27 14:43:39 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
   * Fix display bug when using -w with an empty line with a CR/LF line ending (github #474).
   * When substituting '#' or '%' with a filename, quote the filename if it contains a space (github #480).
   * Fix wrong sleep time when system has usleep but not nanosleep (github #489).
-  * Fix bug when file name contains a newline.
+  * Fix bug when file name contains a newline (CVE-2024-32487, bsc#1222849).
   * Fix bug when file name contains nonprintable characters (github #503).
   * Fix DJGPP build (github #497).
   * Update Unicode tables.

less.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package less
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,7 +23,7 @@
 %define use_usretc 1
 %endif
 Name:           less
-Version:        661
+Version:        685
 Release:        0
 Summary:        Text File Browser and Pager Similar to more
 License:        BSD-2-Clause OR GPL-3.0-or-later
@@ -34,16 +34,17 @@ Source1:        README.SUSE
 Source2:        lessopen.sh
 Source3:        lessclose.sh
 Source4:        lesskey.src
-Source5:        https://www.greenwoodsoftware.com/less/less-%{version}.sig
+# 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
 BuildRequires:  automake
+BuildRequires:  groff
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
-Requires:       file
-# lessopen.sh uses which
-Requires:       /usr/bin/which
+# weak dependencies required only by preprocessor, which is disabled by default
+Recommends:     file
+Recommends:     /usr/bin/which
 
 %description
 less is a text file browser and pager similar to more. It allows
@@ -67,7 +68,8 @@ export LDFLAGS="-pie"
 %configure
 #
 # regenerate help.c because less.hlp was patched
-./mkhelp.pl <less.hlp >help.c
+perl mkhelp.pl < less.hlp > help.c
+grep -h "^public [^;]*$" *.c *.h | sed "s/$/;/" >funcs.h
 #
 # build less
 %make_build

lessopen.sh

@@ -52,7 +52,9 @@ case ${type#"$SRC": } in
 	*"compress'd data"*|\
 	*"packed data"*)
 		CMD="gzip -dc" ;;
-	*"Zip archive data"*)
+	*"Zip archive data"*|\
+	*"Java archive data"*|\
+	*"Android package"*)
 		CMD="unzip -v" ;;
 	*"bzip"*" compressed data"*)
 		CMD="bzip2 -dc" ;;
@@ -61,6 +63,8 @@ case ${type#"$SRC": } in
 		CMD="xz -dc" ;;
 	*"Zstandard compressed data"*)
 		CMD="zstd -dc" ;;
+	*"ASCII cpio archive"*)
+		CMD="cpio -ictvF" ;;
 	*)
 		rm -f "$TMPF_pre"
 		TMPF_pre="$SRC" ;;
@@ -83,11 +87,11 @@ test -n "$CMD" && $CMD "$SRC" >"$TMPF_pre" 2>/dev/null
 		*RPM*)
 			if [ -x "`/usr/bin/which rpm 2>/dev/null`" ]; then
 			(echo -e "=============================== Information ====================================\n";
-			rpm -qip "\"$TMPF_pre\"";
+			rpm -qip "$TMPF_pre";
 			echo -e "\n\n================================= Changelog (head) =============================\n";
-			rpm -qp --changelog "\"$TMPF_pre\"" | head -n 16
+			rpm -qp --changelog "$TMPF_pre" | head -n 16
 			echo -e "\n\n================================= Content ======================================\n";
-			rpm -qlp "\"$TMPF_pre\""
+			rpm -qlp "$TMPF_pre"
                         ) >"$TMPF" 2>/dev/null
 			else echo "rpm is not available for preprocessing" 1>&2; rm -f "$TMPF"; TMPF="$TMPF_pre"; fi
 			;;