diff options
author | CoprDistGit <infra@openeuler.org> | 2023-07-27 02:23:24 +0000 |
---|---|---|
committer | CoprDistGit <infra@openeuler.org> | 2023-07-27 02:23:24 +0000 |
commit | e068af4db0309f2856d97a873cf546af87eaeb51 (patch) | |
tree | ddad1c8d6e28488f99228e06671b93192e21a20a | |
parent | 2f84ea8f55a4db1ae491f99f415c4f321defab23 (diff) |
automatic import of lessopeneuler20.03
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch | 27 | ||||
-rw-r--r-- | less-394-time.patch | 11 | ||||
-rw-r--r-- | less-475-fsync.patch | 38 | ||||
-rw-r--r-- | less.spec | 146 | ||||
-rw-r--r-- | sources | 1 |
6 files changed, 224 insertions, 0 deletions
@@ -0,0 +1 @@ +/less-608.tar.gz diff --git a/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch b/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch new file mode 100644 index 0000000..629138f --- /dev/null +++ b/backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch @@ -0,0 +1,27 @@ +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 + diff --git a/less-394-time.patch b/less-394-time.patch new file mode 100644 index 0000000..85f52b3 --- /dev/null +++ b/less-394-time.patch @@ -0,0 +1,11 @@ +--- less-394/Makefile.in.time 2005-09-14 04:21:38.000000000 +0200 ++++ less-394/Makefile.in 2007-02-07 13:21:24.000000000 +0100 +@@ -6,7 +6,7 @@ + VPATH = @srcdir@ + + CC = @CC@ +-INSTALL = @INSTALL@ ++INSTALL = @INSTALL@ -p + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + diff --git a/less-475-fsync.patch b/less-475-fsync.patch new file mode 100644 index 0000000..4371461 --- /dev/null +++ b/less-475-fsync.patch @@ -0,0 +1,38 @@ +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([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 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)]) diff --git a/less.spec b/less.spec new file mode 100644 index 0000000..5e9c5a3 --- /dev/null +++ b/less.spec @@ -0,0 +1,146 @@ +Name: less +Version: 608 +Release: 4 +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 + +%description +Less is a pager. A pager is a program that displays text files. +Other pagers commonly in use are more and pg. Pagers are often +used in command-line environments like the Unix shell and the MS-DOS +command prompt to display files. + +Less is not an editor. You can't change the contents of the file +you're viewing. Less is not a windowing system. It doesn't have +fancy scroll bars or other GUI (graphical user interface) elements. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +rm -f ./configure +autoreconf -ivf +%configure +%make_build CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + +%install +%make_install + + +%files +%defattr(-,root,root) +%license LICENSE COPYING +%{_bindir}/less* + +%files help +%doc README NEWS INSTALL +%{_mandir}/man1/* + +%changelog +* Thu Mar 16 2023 EibzChan <chenbingzhao@huawei.com> - 608-4 +- remove unstable test patches and test compilation option + +* Fri Feb 17 2023 hongjinghao <hongjinghao@huawei.com> - 608-3 +- fix CVE-2022-46663 + +* Thu Dec 15 2022 EibzChan <chenbingzhao@huawei.com> - 608-2 +- Type:test enhancement +- ID:NA +- SUG:NA +- DESC:backport patches from upstream to enable make check. + backport-makecheck-0000-add-lesstest.patch + backport-makecheck-0001-Work-on-lesstest-remove-rstat-add-LESS_DUMP_CHAR.patch + backport-makecheck-0002-lesstest-correctly-handle-less-exit-during-run_inter.patch + backport-makecheck-0003-Some-runtest-tweaks.patch + backport-makecheck-0004-Rearrange-signal-handling-a-little.patch + backport-makecheck-0005-Don-t-setup_term-in-test-mode.patch + backport-makecheck-0006-Compile-fixes.patch + backport-makecheck-0007-Pass-less-specific-env-variables-to-lesstest-get-rid.patch + backport-makecheck-0008-Move-terminal-init-deinit-to-run_interactive-since.patch + backport-makecheck-0009-Fix-bug-in-setting-env-vars-from-lt-file-in-test-mod.patch + backport-makecheck-0010-Make-runtest-work.patch + backport-makecheck-0011-lesstest-in-interactive-mode-call-setup_term-before-.patch + backport-makecheck-0012-lesstest-log-LESS_TERMCAP_-vars-so-termcap-keys-etc.patch + backport-makecheck-0013-lesstest-accommodate-stupid-termcap-design-where-the.patch + backport-makecheck-0014-lesstest-maketest-should-not-overwrite-existing-lt-f.patch + backport-makecheck-0015-lesstest-add-O-option-to-maketest-if-textfile-is-not.patch + backport-makecheck-0016-lesstest-add-O-option-to-lesstest.patch + backport-makecheck-0017-lesstest-handle-colored-text-with-less-R.patch + backport-makecheck-0018-lesstest-add-e-option.patch + backport-makecheck-0019-lesstest-split-display_screen-into-display_screen_de.patch + backport-makecheck-0020-Add-E-option.patch + backport-makecheck-0021-Consistent-style.patch + backport-makecheck-0022-Obsolete-file.patch + backport-makecheck-0023-Tuesday-style.patch + backport-makecheck-0024-Tuesday-style.patch + backport-makecheck-0025-lesstest-add-support-for-combining-and-composing-cha.patch + backport-makecheck-0026-Minor-runtest-output-tweaks.patch + backport-makecheck-0027-lesstest-lt_screen-should-clear-param-stack-after-pr.patch + backport-makecheck-0028-Handle-fg-and-bg-colors.patch + backport-makecheck-0029-Have-lt_screen-use-ANSI-sequences-for-bold-underline.patch + backport-makecheck-0030-ESC-m-should-clear-attributes-as-well-as-colors.patch + backport-makecheck-0031-lesskey-make-lt_screen-treat-ESC-0m-like-ESC-m.patch + backport-makecheck-0032-Store-2-char-hex-values-in-log-file-rather-than-bina.patch + backport-makecheck-0033-lesstest-Make-display_screen_debug-write-to-stderr-n.patch + backport-makecheck-0034-lesstest-Clear-screen-at-end-of-maketest-in-case-ter.patch + backport-makecheck-0035-lesstest-Verify-that-the-less-binary-is-built-with-D.patch + backport-makecheck-0036-Add-check-target-to-Makefile-to-run-lesstest.patch + backport-makecheck-0037-Don-t-set-LESS_TERMCAP_xx-environment-vars-from-term.patch + backport-makecheck-0038-lesstest-Remove-unnecessary-exit_all_modes-field-fro.patch + backport-makecheck-0039-lesstest-Add-some-initial-lt-files.patch + backport-makecheck-0040-lesstest-Remove-empty-lt-file.patch + backport-makecheck-0041-lesstest-Add-a-couple-more-lt-files.patch + backport-makecheck-0042-Make-make-check-work-regardless-of-directory-where-l.patch + +* Fri Nov 18 2022 dillon chen <dillon.chen@gmail.com> - 608-1 +- update to 608 + +* Thu Oct 13 2022 fuanan <fuanan3@h-partners.com> - 590-2 +- DESC:fix the changelog exception macro + +* Fri Sep 24 2021 fuanan <fuanan3@huawei.com> - 590-1 +- update version to 590 + +* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 563-3 +- DESC: delete -S git from autosetup, and delete BuildRequires git + +* Fri May 28 2021 fuanan <fuanan3@huawei.com> - 563-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:[add] backport patches from upstream + Create only one ifile when a file is opened under different names. + Remove extraneous frees, associated with removed call to lrealpath. + Fix crash when call set_ifilename with a pointer to the name that is + Remove unnecessary call to pshift in pappend. + Reset horizontal shift when opening a new file. + Protect from buffer overrun. + Make histpattern return negative value to indicate error. + Lesskey: don't translate ctrl-K in an EXTRA string. + Ignore SIGTSTP in secure mode. + Fix "Tag not found" error while looking for a tag's location + Fix minor memory leak with input preprocessor. + +* Thu Jan 21 2021 wangchen <wangchen137@huawei.com> - 563-1 +- Update to 563 + +* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 551-3 +- Delete unneeded files + +* Fri Sep 27 2019 yefei <yefei25@huawei.com> - 551-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: delete irrelevant comment + +* Tue Sep 10 2019 openEuler Buildteam <buildteam@openeuler.org> - 551-1 +- Package Init @@ -0,0 +1 @@ +1cdec714569d830a68f4cff11203cdba less-608.tar.gz |