packages/less
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 633

Browse Source
This commit is contained in:
hongjinghao 2024-01-30 10:49:06 +08:00
parent eee22a20fd
commit 21931ebe22
5 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch
View File

@ -1,27 +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 236c49a..cba7bdd 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;
}
--
2.27.0

34
less-475-fsync.patch
View File

@ -1,7 +1,15 @@
diff -ur less-418.orig/configure.ac less-418/configure.ac From 5396b6b77d0248678f716038dc747d6898acb0b3 Mon Sep 17 00:00:00 2001
--- less-418.orig/configure.ac 2008-12-22 07:10:44.000000000 -0500 From: Stephen Gallagher <sgallagh@redhat.com>
+++ less-418/configure.ac 2008-12-22 07:28:58.000000000 -0500 Date: Fri, 22 Jan 2021 09:49:13 -0500
@@ -203,6 +203,8 @@ 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.]) [Define HAVE_TIME_T if your system supports the "time_t" type.])
AH_TEMPLATE([HAVE_STRERROR], AH_TEMPLATE([HAVE_STRERROR],
[Define HAVE_STRERROR if you have the strerror() function.]) [Define HAVE_STRERROR if you have the strerror() function.])
@ -10,18 +18,18 @@ diff -ur less-418.orig/configure.ac less-418/configure.ac
AH_TEMPLATE([HAVE_FILENO], AH_TEMPLATE([HAVE_FILENO],
[Define HAVE_FILENO if you have the fileno() macro.]) [Define HAVE_FILENO if you have the fileno() macro.])
AH_TEMPLATE([HAVE_ERRNO], AH_TEMPLATE([HAVE_ERRNO],
@@ -251,7 +253,7 @@ @@ -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. # Checks for library functions.
AC_TYPE_SIGNAL -AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat strsignal system ttyname usleep])
-AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system ttyname usleep]) +AC_CHECK_FUNCS([fchmod nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat strsignal system ttyname usleep])
+AC_CHECK_FUNCS([popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod realpath])
# AC_CHECK_FUNCS may not work for inline functions, so test these separately. # AC_CHECK_FUNCS may not work for inline functions, so test these separately.
AC_MSG_CHECKING(for memcpy) AC_MSG_CHECKING(for memcpy)
@@ -298,6 +300,16 @@ @@ -321,6 +323,16 @@
#endif], [static char *x; x = strerror(0);], #include <errno.h>
[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) #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_MSG_CHECKING(for fsync)
+AC_TRY_RUN([ +AC_TRY_RUN([
@ -34,5 +42,5 @@ diff -ur less-418.orig/configure.ac less-418/configure.ac
+}], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FSYNC)], [AC_MSG_RESULT(no)]) +}], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FSYNC)], [AC_MSG_RESULT(no)])
+ +
AC_MSG_CHECKING(for sys_errlist) AC_MSG_CHECKING(for sys_errlist)
AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = 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)])
[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)])

BIN
less-608.tar.gz
View File

Binary file not shown.

BIN
less-633.tar.gz Normal file
View File

Binary file not shown.

8
less.spec
View File

@ -1,13 +1,12 @@
Name: less Name: less
Version: 608 Version: 633
Release: 4 Release: 1
Summary: Less is a pager that displays text files. Summary: Less is a pager that displays text files.
License: GPLv3+ or BSD License: GPLv3+ or BSD
URL: http://www.greenwoodsoftware.com/less URL: http://www.greenwoodsoftware.com/less
Source0: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source0: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
Patch0: less-394-time.patch Patch0: less-394-time.patch
Patch1: less-475-fsync.patch Patch1: less-475-fsync.patch
Patch6000: backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch
BuildRequires: gcc make ncurses-devel autoconf automake libtool BuildRequires: gcc make ncurses-devel autoconf automake libtool
@ -46,6 +45,9 @@ autoreconf -ivf
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Tue Jan 30 2024 hongjinghao <hongjinghao@huawei.com> - 633-1
- Update to 633
* Thu Mar 16 2023 EibzChan <chenbingzhao@huawei.com> - 608-4 * Thu Mar 16 2023 EibzChan <chenbingzhao@huawei.com> - 608-4
- remove unstable test patches and test compilation option - remove unstable test patches and test compilation option