diff --git a/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch b/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch deleted file mode 100644 index 629138fbb789f15acbcf4d3b439b38f7d729cc93..0000000000000000000000000000000000000000 --- a/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.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. - ---- - 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 - diff --git a/less-475-fsync.patch b/less-475-fsync.patch index 4371461c899f68e196d5dfa5cdefbda27b57d69f..c964b310c2e74bd075ff292bf5c6306bfe49e38d 100644 --- a/less-475-fsync.patch +++ b/less-475-fsync.patch @@ -1,7 +1,15 @@ -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 @@ +From 5396b6b77d0248678f716038dc747d6898acb0b3 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Fri, 22 Jan 2021 09:49:13 -0500 +Subject: [PATCH] Test for fsync on tty + +Signed-off-by: Stephen Gallagher + +Modified for less 581.2 Filip Januš +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.]) @@ -10,18 +18,18 @@ diff -ur less-418.orig/configure.ac less-418/configure.ac AH_TEMPLATE([HAVE_FILENO], [Define HAVE_FILENO if you have the fileno() macro.]) 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. - AC_TYPE_SIGNAL --AC_CHECK_FUNCS([fchmod fsync nanosleep poll popen realpath _setjmp sigprocmask sigsetmask snprintf stat system ttyname usleep]) -+AC_CHECK_FUNCS([popen _setjmp sigprocmask sigsetmask snprintf stat system fchmod realpath]) +-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) -@@ -298,6 +300,16 @@ - #endif], [static char *x; x = strerror(0);], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) +@@ -321,6 +323,16 @@ + #include + #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([ @@ -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_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)]) + 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)]) + diff --git a/less-608.tar.gz b/less-608.tar.gz deleted file mode 100644 index e3cf9db6ecbb05f0591780837175c3e2eec31ed2..0000000000000000000000000000000000000000 Binary files a/less-608.tar.gz and /dev/null differ diff --git a/less-633.tar.gz b/less-633.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6f96facacee591b9d9c1a83fbed49f02a8ebb429 Binary files /dev/null and b/less-633.tar.gz differ diff --git a/less.spec b/less.spec index 5e9c5a32179beb6938f3d5c521c4930416894bc5..122b41556580aa556fdeadfa4a485a7f13e31956 100644 --- a/less.spec +++ b/less.spec @@ -1,13 +1,12 @@ Name: less -Version: 608 -Release: 4 +Version: 633 +Release: 1 Summary: Less is a pager that displays text files. License: GPLv3+ or BSD URL: http://www.greenwoodsoftware.com/less Source0: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Patch0: less-394-time.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 @@ -46,6 +45,9 @@ autoreconf -ivf %{_mandir}/man1/* %changelog +* Tue Jan 30 2024 hongjinghao - 633-1 +- Update to 633 + * Thu Mar 16 2023 EibzChan - 608-4 - remove unstable test patches and test compilation option