.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,11 @@
-SOURCES/less-530.tar.gz
+/less-530.tar.gz
+/less-550.tar.gz
+/less-551.tar.gz
+/less-568.tar.gz
+/less-575.tar.gz
+/less-581.2.tar.gz
+/less-590.tar.gz
+/less-608.tar.gz
+/less-633.tar.gz
+/less-643.tar.gz
+/less-661.tar.gz

.less.metadata

@@ -1 +0,0 @@
-d8ba1f43e88b706ef701f978cd3262b5b44dffd6 SOURCES/less-530.tar.gz

SOURCES/less-418-fsync.patch

@@ -1,38 +0,0 @@
-diff -ur less-418.orig/configure.ac less-418/configure.ac
---- less-418.orig/configure.ac	2008-12-22 07:10:44.000000000 -0500
-+++ less-418/configure.ac	2008-12-22 07:28:58.000000000 -0500
-@@ -203,6 +203,8 @@
- 	[Define HAVE_TIME_T if your system supports the "time_t" type.])
- AH_TEMPLATE([HAVE_STRERROR],
- 	[Define HAVE_STRERROR if you have the strerror() function.])
-+AH_TEMPLATE([HAVE_FSYNC],
-+	[Define HAVE_FSYNC if fsync() on a tty works.])
- AH_TEMPLATE([HAVE_FILENO],
- 	[Define HAVE_FILENO if you have the fileno() macro.])
- AH_TEMPLATE([HAVE_ERRNO],
-@@ -251,7 +253,7 @@
- 
- # Checks for library functions.
- AC_TYPE_SIGNAL
--AC_CHECK_FUNCS([fsync popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod])
-+AC_CHECK_FUNCS([popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod])
- 
- # AC_CHECK_FUNCS may not work for inline functions, so test these separately.
- AC_MSG_CHECKING(for memcpy)
-@@ -298,6 +300,16 @@
- #endif], [static char *x; x = strerror(0);],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)])
- 
-+AC_MSG_CHECKING(for fsync)
-+AC_TRY_RUN([
-+#include <fcntl.h>
-+#include <unistd.h>
-+int main(void)
-+{
-+        int fd = open("/dev/tty", O_RDWR);
-+        return fsync(fd);
-+}], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FSYNC)], [AC_MSG_RESULT(no)])
-+
- AC_MSG_CHECKING(for sys_errlist)
- AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], 
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)])

SOURCES/less-436-help.patch

@@ -1,50 +0,0 @@
-diff --git a/help.c b/help.c
-index 531aa16..0de6f0f 100644
---- a/help.c
-+++ b/help.c
-@@ -119,7 +119,7 @@ constant char helpdata[] = {
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','N','u','m','b','e','r',' ','o','f',' ','b','u','f','f','e','r','s','.','\n',
- ' ',' ','-','B',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','a','u','t','o','-','b','u','f','f','e','r','s','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','a','u','t','o','m','a','t','i','c','a','l','l','y',' ','a','l','l','o','c','a','t','e',' ','b','u','f','f','e','r','s',' ','f','o','r',' ','p','i','p','e','s','.','\n',
--' ',' ','-','c',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n','\n',
-+' ',' ','-','c',' ',' ','-','C',' ',' ','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n',' ','-','-','C','L','E','A','R','-','S','C','R','E','E','N','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','p','a','i','n','t',' ','b','y',' ','c','l','e','a','r','i','n','g',' ','r','a','t','h','e','r',' ','t','h','a','n',' ','s','c','r','o','l','l','i','n','g','.','\n',
- ' ',' ','-','d',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','d','u','m','b','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','u','m','b',' ','t','e','r','m','i','n','a','l','.','\n',
-@@ -151,8 +151,10 @@ constant char helpdata[] = {
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','I','g','n','o','r','e',' ','t','h','e',' ','L','E','S','S','O','P','E','N',' ','e','n','v','i','r','o','n','m','e','n','t',' ','v','a','r','i','a','b','l','e','.','\n',
- ' ',' ','-','m',' ',' ','-','M',' ',' ','.','.','.','.',' ',' ','-','-','l','o','n','g','-','p','r','o','m','p','t',' ',' ','-','-','L','O','N','G','-','P','R','O','M','P','T','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','e','t',' ','p','r','o','m','p','t',' ','s','t','y','l','e','.','\n',
--' ',' ','-','n',' ',' ','-','N',' ',' ','.','.','.','.',' ',' ','-','-','l','i','n','e','-','n','u','m','b','e','r','s',' ',' ','-','-','L','I','N','E','-','N','U','M','B','E','R','S','\n',
-+' ',' ','-','n',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','l','i','n','e','-','n','u','m','b','e','r','s','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','u','s','e',' ','l','i','n','e',' ','n','u','m','b','e','r','s','.','\n',
-+' ',' ','-','N',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','L','I','N','E','-','N','U','M','B','E','R','S','\n',
-+' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','U','s','e',' ','l','i','n','e',' ','n','u','m','b','e','r','s','.','\n',
- ' ',' ','-','o',' ','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']',' ',' ','.',' ',' ','-','-','l','o','g','-','f','i','l','e','=','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']','\n',
- ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','C','o','p','y',' ','t','o',' ','l','o','g',' ','f','i','l','e',' ','(','s','t','a','n','d','a','r','d',' ','i','n','p','u','t',' ','o','n','l','y',')','.','\n',
- ' ',' ','-','O',' ','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']',' ',' ','.',' ',' ','-','-','L','O','G','-','F','I','L','E','=','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']','\n',
-diff --git a/less.hlp b/less.hlp
-index 15ece5a..186e409 100644
---- a/less.hlp
-+++ b/less.hlp
-@@ -116,7 +116,7 @@
-                   Number of buffers.
-   -B  ........  --auto-buffers
-                   Don't automatically allocate buffers for pipes.
--  -c  ........  --clear-screen
-+  -c  -C  ....  --clear-screen --CLEAR-SCREEN
-                   Repaint by clearing rather than scrolling.
-   -d  ........  --dumb
-                   Dumb terminal.
-@@ -148,8 +148,10 @@
-                   Ignore the LESSOPEN environment variable.
-   -m  -M  ....  --long-prompt  --LONG-PROMPT
-                   Set prompt style.
--  -n  -N  ....  --line-numbers  --LINE-NUMBERS
-+  -n  ........  --line-numbers
-                   Don't use line numbers.
-+  -N  ........  --LINE-NUMBERS
-+                  Use line numbers.
-   -o [_f_i_l_e]  .  --log-file=[_f_i_l_e]
-                   Copy to log file (standard input only).
-   -O [_f_i_l_e]  .  --LOG-FILE=[_f_i_l_e]

SOURCES/less-530-CVE-2022-48624.patch

@@ -1,41 +0,0 @@
-From c6ac6de49698be84d264a0c4c0c40bb870b10144 Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Sat, 25 Jun 2022 11:54:43 -0700
-Subject: [PATCH] Shell-quote filenames when invoking LESSCLOSE.
-
----
- filename.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/filename.c b/filename.c
-index 5824e38..dff20c0 100644
---- a/filename.c
-+++ b/filename.c
-@@ -972,6 +972,8 @@ close_altfile(altfilename, filename)
- {
- #if HAVE_POPEN
- 	char *lessclose;
-+	char *qfilename;
-+	char *qaltfilename;
- 	FILE *fd;
- 	char *cmd;
- 	int len;
-@@ -986,9 +988,13 @@ close_altfile(altfilename, filename)
- 		error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG);
- 		return;
- 	}
--	len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2);
-+	qfilename = shell_quote(filename);
-+	qaltfilename = shell_quote(altfilename);
-+	len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2);
- 	cmd = (char *) ecalloc(len, sizeof(char));
--	SNPRINTF2(cmd, len, lessclose, filename, altfilename);
-+	SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename);
-+	free(qaltfilename);
-+	free(qfilename);
- 	fd = shellcmd(cmd);
- 	free(cmd);
- 	if (fd != NULL)
--- 
-2.41.0
-

SOURCES/less-530-CVE-2024-32487.patch

@@ -1,65 +0,0 @@
-Patch backported from:
-
-commit 007521ac3c95bc76e3d59c6dbfe75d06c8075c33
-Author: Mark Nudelman <markn@greenwoodsoftware.com>
-Date:   Thu Apr 11 17:49:48 2024 -0700
-
-    Fix bug when viewing a file whose name contains a newline.
-
-diff -up less-643/filename.c.cve-2024-32487 less-643/filename.c
---- less-643/filename.c.cve-2024-32487	2023-07-21 00:43:14.000000000 +0200
-+++ less-643/filename.c	2024-04-23 10:24:17.347269703 +0200
-@@ -128,6 +128,15 @@ static char * metachars(void)
- }
- 
- /*
-+ * Must use quotes rather than escape char for this metachar?
-+ */
-+static int must_quote(char c)
-+{
-+	/* {{ Maybe the set of must_quote chars should be configurable? }} */
-+	return (c == '\n'); 
-+}
-+
-+/*
-  * Insert a backslash before each metacharacter in a string.
-  */
-	public char *
-@@ -164,6 +173,9 @@ public char * shell_quote(char *s)
- 				 * doesn't support escape chars.  Use quotes.
- 				 */
- 				use_quotes = 1;
-+			} else if (must_quote(*p))
-+			{
-+				len += 3; /* open quote + char + close quote */
- 			} else
- 			{
- 				/*
-@@ -193,15 +205,22 @@ public char * shell_quote(char *s)
- 	{
- 		while (*s != '\0')
- 		{
--			if (metachar(*s))
-+			if (!metachar(*s))
- 			{
--				/*
--				 * Add the escape char.
--				 */
-+				*p++ = *s++;
-+			} else if (must_quote(*s))
-+			{
-+				/* Surround the char with quotes. */
-+				*p++ = openquote;
-+				*p++ = *s++;
-+				*p++ = closequote;
-+			} else
-+			{
-+				/* Insert an escape char before the char. */
- 				strcpy(p, esc);
- 				p += esclen;
-+				*p++ = *s++;
- 			}
--			*p++ = *s++;
- 		}
- 		*p = '\0';
- 	}

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+        - rhel-10
+decision_context: osci_compose_gate
+rules:
+        - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

less-436-help.patch

@@ -0,0 +1,24 @@
+diff -up less-661/help.c.help less-661/help.c
+--- less-661/help.c.help	2024-08-05 21:40:34.531327397 +0200
++++ less-661/help.c	2024-08-05 21:40:34.533327418 +0200
+@@ -137,7 +137,7 @@ constant char helpdata[] = {
+ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','N','u','m','b','e','r',' ','o','f',' ','b','u','f','f','e','r','s','.','\n',
+ ' ',' ','-','B',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','a','u','t','o','-','b','u','f','f','e','r','s','\n',
+ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','a','u','t','o','m','a','t','i','c','a','l','l','y',' ','a','l','l','o','c','a','t','e',' ','b','u','f','f','e','r','s',' ','f','o','r',' ','p','i','p','e','s','.','\n',
+-' ',' ','-','c',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n','\n',
++' ',' ','-','c',' ',' ','-','C',' ',' ','.','.','.','.',' ',' ','-','-','c','l','e','a','r','-','s','c','r','e','e','n',' ','-','-','C','L','E','A','R','-','S','C','R','E','E','N','\n',
+ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','R','e','p','a','i','n','t',' ','b','y',' ','c','l','e','a','r','i','n','g',' ','r','a','t','h','e','r',' ','t','h','a','n',' ','s','c','r','o','l','l','i','n','g','.','\n',
+ ' ',' ','-','d',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','d','u','m','b','\n',
+ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','u','m','b',' ','t','e','r','m','i','n','a','l','.','\n',
+diff -up less-661/less.hlp.help less-661/less.hlp
+--- less-661/less.hlp.help	2024-08-05 21:40:34.532327408 +0200
++++ less-661/less.hlp	2024-08-05 21:40:34.533327418 +0200
+@@ -134,7 +134,7 @@
+                   Number of buffers.
+   -B  ........  --auto-buffers
+                   Don't automatically allocate buffers for pipes.
+-  -c  ........  --clear-screen
++  -c  -C  ....  --clear-screen --CLEAR-SCREEN
+                   Repaint by clearing rather than scrolling.
+   -d  ........  --dumb
+                   Dumb terminal.

less-458-less-filters-man.patch

@@ -1,22 +1,24 @@
 diff -up less-466/less.nro.filters-man less-466/less.nro
 --- less-466/less.nro.filters-man	2014-09-18 14:32:32.124111631 +0200
 +++ less-466/less.nro	2014-09-18 14:32:39.548177152 +0200
-@@ -1234,6 +1234,18 @@ Similarly, if the first two characters o
+@@ -1323,7 +1323,19 @@ Similarly, if the first two characters of LESSOPEN are vertical bar and dash
  the input pipe is used on standard input as well as other files.
  Again, in this case the dash is not considered to be part of
  the input pipe command.
+-.
 +.PP
 +There are used following files to set up default preprocessor:
 +.br
-+	/etc/profile.d/less.sh
++       /etc/profile.d/less.sh
 +.br
-+	/etc/profile.d/less.csh
++       /etc/profile.d/less.csh
 +.br
 +These files set up /usr/bin/lesspipe.sh as a default filter. An user defined
 +filter can be specified in ~/.lessfilter. This file should have an execute bit
 +set and accept only one parameter, which represents a filename. If
 +the user defined filter process the file, zero should be returned. Otherwise
 +~/.lessfilter tries to handle the file.
- 
++
  .SH "NATIONAL CHARACTER SETS"
  There are three types of characters in the input file:
+ .IP "normal characters"

less-458-lessecho-usage.patch

@@ -2,7 +2,7 @@ diff -upr less-458_orig/lessecho.c less-458_work/lessecho.c
 --- less-458_orig/lessecho.c	2013-05-07 14:03:52.091104655 +0200
 +++ less-458_work/lessecho.c	2013-05-07 11:21:10.883991862 +0200
 @@ -41,7 +41,27 @@ static int num_metachars = 0;
- pr_usage()
+ static void pr_usage(void)
  {
  	fprintf(stderr,
 -		"usage: lessecho [-ox] [-cx] [-pn] [-dn] [-mx] [-nn] [-ex] [-fn] [-a] file ...\n");
@@ -29,5 +29,5 @@ diff -upr less-458_orig/lessecho.c less-458_work/lessecho.c
 +		"  -?\t- prints this help\n");
  }
  
- 	static void
+ static void pr_version(void)
 

less-458-lesskey-usage.patch

@@ -2,8 +2,8 @@ diff -upr less-458_orig/lesskey.c less-458_work/lesskey.c
 --- less-458_orig/lesskey.c	2013-05-07 14:03:52.062104533 +0200
 +++ less-458_work/lesskey.c	2013-05-07 11:21:10.881991855 +0200
 @@ -217,7 +217,15 @@ extern char version[];
- 	void
+ 
- usage()
+ static void usage(void)
  {
 -	fprintf(stderr, "usage: lesskey [-o output] [input]\n");
 +	fprintf(stderr, "usage: lesskey [-o output] [input]\n\n");

less-475-fsync.patch

@@ -0,0 +1,46 @@
+From 5396b6b77d0248678f716038dc747d6898acb0b3 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Fri, 22 Jan 2021 09:49:13 -0500
+Subject: [PATCH] Test for fsync on tty
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+
+Modified for less 581.2 Filip Januš <fjanus@redhat.com>
+diff -ur less-581.2/configure.ac less_fsync/configure.ac
+--- less-581.2/configure.ac	2021-04-28 17:00:08.000000000 +0200
++++ less_fsync/configure.ac	2021-05-06 10:59:07.560062397 +0200
+@@ -221,6 +221,8 @@
+ 	[Define HAVE_TIME_T if your system supports the "time_t" type.])
+ AH_TEMPLATE([HAVE_STRERROR],
+ 	[Define HAVE_STRERROR if you have the strerror() function.])
++AH_TEMPLATE([HAVE_FSYNC],
++	[Define HAVE_FSYNC if fsync() on a tty works.])
+ AH_TEMPLATE([HAVE_FILENO],
+ 	[Define HAVE_FILENO if you have the fileno() macro.])
+ AH_TEMPLATE([HAVE_ERRNO],
+@@ -274,7 +276,7 @@
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int f(int a) { return a; }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ANSI_PROTOS)],[AC_MSG_RESULT(no)])
+ 
+ # Checks for library functions.
+-AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat strsignal system ttyname usleep])
++AC_CHECK_FUNCS([fchmod nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat strsignal system ttyname usleep])
+ 
+ # AC_CHECK_FUNCS may not work for inline functions, so test these separately.
+ AC_MSG_CHECKING(for memcpy)
+@@ -321,6 +323,16 @@
+ #include <errno.h>
+ #endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)])
+ 
++AC_MSG_CHECKING(for fsync)
++AC_TRY_RUN([
++#include <fcntl.h>
++#include <unistd.h>
++int main(void)
++{
++        int fd = open("/dev/tty", O_RDWR);
++        return fsync(fd);
++}], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FSYNC)], [AC_MSG_RESULT(no)])
++
+ AC_MSG_CHECKING(for sys_errlist)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)])
+ 

less-661-fix_sast.patch

@@ -0,0 +1,12 @@
+diff -up less-661/input.c.fix_sast less-661/input.c
+--- less-661/input.c.fix_sast	2024-08-05 21:48:33.202257453 +0200
++++ less-661/input.c	2024-08-05 21:49:36.717911621 +0200
+@@ -345,7 +345,7 @@ public POSITION back_line(POSITION curr_
+ {
+ 	POSITION base_pos;
+ 	POSITION new_pos;
+-	POSITION edisp_pos;
++	POSITION edisp_pos = NULL_POSITION;
+ 	POSITION begin_new_pos;
+ 	int c;
+ 	lbool endline;

less-661-pipefix.patch

@@ -0,0 +1,20 @@
+diff -up less-661/os.c.pipefix less-661/os.c
+--- less-661/os.c.pipefix	2024-06-29 19:16:08.000000000 +0200
++++ less-661/os.c	2024-08-10 08:06:14.762224766 +0200
+@@ -80,6 +80,7 @@ extern int exit_F_on_close;
+ extern int follow_mode;
+ extern int scanning_eof;
+ extern char intr_char;
++extern int is_tty;
+ #if !MSDOS_COMPILER
+ extern int tty;
+ #endif
+@@ -237,7 +238,7 @@ start:
+ 	}
+ #endif
+ #if USE_POLL
+-	if (fd != tty && use_poll)
++	if (is_tty && fd != tty && use_poll)
+ 	{
+ 		int ret = check_poll(fd, tty);
+ 		if (ret != 0)

less.spec

@@ -1,26 +1,28 @@
 Summary: A text file browser similar to more, but better
 Name: less
-Version: 530
+Version: 661
 Release: 3%{?dist}
-License: GPLv3+ or BSD
+License: GPL-3.0-only AND BSD-2-Clause
-Group: Applications/Text
+Source0: https://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
-Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
 Source2: less.sh
 Source3: less.csh
 Patch4: less-394-time.patch
-Patch5: less-418-fsync.patch
+Patch5: less-475-fsync.patch
 Patch6: less-436-manpage-add-old-bot-option.patch
-Patch7: less-436-help.patch
 Patch8: less-458-lessecho-usage.patch
 Patch9: less-458-less-filters-man.patch
 Patch10: less-458-lesskey-usage.patch
 Patch11: less-458-old-bot-in-help.patch
-Patch12: less-530-CVE-2022-48624.patch
+Patch12: less-436-help.patch
-Patch13: less-530-CVE-2024-32487.patch
+Patch13: less-661-fix_sast.patch
-URL: http://www.greenwoodsoftware.com/less/
+# from upstream, for <=661, fixes regression in file-types sanity chack post v590
+# https://github.com/gwsw/less/commit/ed454a217da417dc052723ea70da8efde0f2e66c 
+Patch14: less-661-pipefix.patch
+URL: https://www.greenwoodsoftware.com/less/
 BuildRequires: ncurses-devel
 BuildRequires: autoconf automake libtool
+BuildRequires: make
 
 %description
 The less utility is a text file browser that resembles more, but has
@@ -34,28 +36,28 @@ files, and you'll use it frequently.
 
 %prep
 %setup -q
-%patch4 -p1 -b .time
+%patch -P 4 -p1 -b .time
-%patch5 -p1 -b .fsync
+%patch -P 5 -p1 -b .fsync
-%patch6 -p1 -b .manpage-add-old-bot-option
+%patch -P 6 -p1 -b .manpage-add-old-bot-option
-%patch7 -p1 -b .help
+%patch -P 8 -p1 -b .lessecho-usage
-%patch8 -p1 -b .lessecho-usage
+%patch -P 9 -p1 -b .less-filters-man
-%patch9 -p1 -b .less-filters-man
+%patch -P 10 -p1 -b .lesskey-usage
-%patch10 -p1 -b .lesskey-usage
+%patch -P 11 -p1 -b .old-bot
-%patch11 -p1 -b .old-bot
+%patch -P 12 -p1 -b .help
-%patch12 -p1 -b .CVE-2022-48624
+%patch -P 13 -p1 -b .fix_sast
-%patch13 -p1 -b .CVE-2024-32487
+%patch -P 14 -p1 -b .pipefix
 
 
 %build
 rm -f ./configure
 autoreconf -fiv
 %configure
-make %{?_smp_mflags} CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+%make_build CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
 %make_install
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -p        %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
+install -p        %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 
@@ -67,13 +69,117 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 %{_mandir}/man1/*
 
 %changelog
-* Tue Apr 23 2024 Matej Mužila <mmuzila@redhat.com> - 530-3
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 661-3
-- Fix CVE-2024-32487
+- Bump release for October 2024 mass rebuild:
-- Resolves: RHEL-32738
+  Resolves: RHEL-64018
 
-* Wed Feb 21 2024 Matej Mužila <mmuzila@redhat.com> - 530-2
+* Sat Aug 10 2024 Michal Hlavinka <mhlavink@redhat.com> - 661-2
-- Fix CVE-2022-48624
+- fix post-v590 regression in file-types check
-- Resolves: RHEL-26124
+
+* Fri Jul 26 2024 Michal Hlavinka <mhlavink@redhat.com> - 661-1
+- fix static analysis findigs (RHEL-40257)
+- updated to 661
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 643-8
+- Bump release for June 2024 mass rebuild
+
+* Wed Jun 12 2024 Matej Mužila <mmuzila@redhat.com> - 643-7
+- Bump release
+- Related: RHEL-32740
+
+* Tue Jun 04 2024 Matej Mužila <mmuzila@redhat.com> - 643-6
+- Fix License field
+- Related: RHEL-32740
+
+* Tue Apr 23 2024 Matej Mužila <mmuzila@redhat.com> - 643-5
+- Fix CVE-2024-32487
+- Add gating.yaml
+- Resolves: RHEL-32740
+
+* Tue Feb 06 2024 Matej Mužila <mmuzila@redhat.com> - 643-4
+- migrated to SPDX license
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 643-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 643-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Sep 05 2023 Matej Mužila <mmuzila@redhat.com> - 643-1
+- Update to new upstream release
+- Resolves: #2231663
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 633-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri May 05 2023 Matej Mužila <mmuzila@redhat.com> - 633-1
+- Update to new upstream release
+- Resolves: CVE-2022-46663
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 608-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Nov 24 2022 Matej Mužila <mmuzila@redhat.com> - 608-1
+- Update to new upstream release
+
+* Mon Jul 25 2022 Daan De Meyer <daan.j.demeyer@gmail.com> - 590-5
+- Backport patch from upstream to fix memory leak
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 590-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 590-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Oct 02 2021 FeRD (Frank Dana) <ferdnyc@gmail.com> - 590-2
+- Backport patch from upstream to fix hyperlinked text bug
+
+* Tue Aug 10 2021 Matej Mužila <mmuzila@redhat.com> - 590-1
+- Update to new upstream release
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 581.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 6 2021 Filip Januš <fjanus@redhat.com> - 581.2-1
+- Rebase to 581.2-1
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 575-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Stephen Gallagher <sgallagh@redhat.com> - 575-1
+- Update to latest version (#1919119)
+
+* Mon Nov 30 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 568-1
+- Update to latest version (#1818534)
+
+* Thu Aug 20 2020 Andrew Schorr <ajschorr@fedoraproject.org> - 551-5
+- Add zstd and brotli support to lesspipe.sh
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 551-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 551-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 551-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 17 2019 Matej Mužila <mmuzila@redhat.com> - 551-1
+- Update to new upstream release
+- Resolves: #1719419
+
+* Tue Jun 04 2019 Matej Mužila <mmuzila@redhat.com> - 550-1
+- Update to new upstream release
+- Resolves: #1674080
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 530-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 09 2019 Pavel Raiskup <praiskup@redhat.com> - 530-3
+- add lzip compression support into lesspipe.sh (rhbz#1664383)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 530-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Sat Feb 17 2018 Pavel Raiskup <praiskup@redhat.com> - 530-1
 - new release, per upstream release notes:

lesspipe.sh

@@ -51,25 +51,38 @@ manfilter ()
 export MAN_KEEP_FORMATTING=1
 
 case "$1" in
-*.[1-9n].bz2|*.[1-9]x.bz2|*.man.bz2|*.[1-9n].[gx]z|*.[1-9]x.[gx]z|*.man.[gx]z|*.[1-9n].lzma|*.[1-9]x.lzma|*.man.lzma)
+*.[1-9n].bz2|*.[1-9]x.bz2|*.man.bz2|*.[1-9n].[glx]z|*.[1-9]x.[glx]z|*.man.[glx]z|*.[1-9n].lzma|*.[1-9]x.lzma|*.man.lzma|*.[1-9n].zst|*.[1-9]x.zst|*.man.zst|*.[1-9n].br|*.[1-9]x.br|*.man.br)
 	case "$1" in
 	*.gz)		DECOMPRESSOR="gzip -dc" ;;
 	*.bz2)		DECOMPRESSOR="bzip2 -dc" ;;
+	*.lz)		DECOMPRESSOR="lzip -dc" ;;
+	*.zst)		DECOMPRESSOR="zstd -dcq" ;;
+	*.br)		DECOMPRESSOR="brotli -dc" ;;
 	*.xz|*.lzma)	DECOMPRESSOR="xz -dc" ;;
 	esac
 	if [ -n "$DECOMPRESSOR" ] && $DECOMPRESSOR -- "$1" | file - | grep -q troff; then
 		$DECOMPRESSOR -- "$1" | manfilter -
 		exit $?
-	fi ;;&
+	fi
+esac
+case "$1" in
 *.[1-9n]|*.[1-9]x|*.man)
 	if file "$1" | grep -q troff; then
 		manfilter "$1"
 		exit $?
-	fi ;;&
+	fi
+esac
+case "$1" in
 *.tar) tar tvvf "$1"; exit $? ;;
 *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1"; exit $? ;;
 *.tar.xz) tar Jtvvf "$1"; exit $? ;;
 *.xz|*.lzma) xz -dc -- "$1"; exit $? ;;
+*.tar.lz) tar --lzip -tvvf "$1"; exit $? ;;
+*.lz) lzip -dc -- "$1"; exit $? ;;
+*.tar.zst) tar --zstd -tvvf "$1"; exit $? ;;
+*.zst) zstd -dcq -- "$1"; exit $? ;;
+*.tar.br) brotli -dc -- "$1" | tar tvvf -; exit $? ;;
+*.br) brotli -dc -- "$1"; exit $? ;;
 *.tar.bz2|*.tbz2) bzip2 -dc -- "$1" | tar tvvf -; exit $? ;;
 *.[zZ]|*.gz) gzip -dc -- "$1"; exit $? ;;
 *.bz2) bzip2 -dc -- "$1"; exit $? ;;

plans/internal.fmf

@@ -0,0 +1,11 @@
+summary: Private (RHEL) beakerlib tests
+enabled: false
+adjust:
+  - when: distro == rhel
+    enabled: true
+    because: private tests are accesible only within rhel pipline
+discover:
+    how: fmf
+    url: https://pkgs.devel.redhat.com/git/tests/less
+execute:
+    how: tmt

sources

@@ -0,0 +1 @@
+SHA512 (less-661.tar.gz) = 49d81ff9e79d43ce0271490e3bffd590b4aed5fcb387bc8eb3128de99e5b5a5ede2e2818b546f6e3a140fa6261f1de3dfba1231f7ff7ef18502bb7030eaea1b5