From 1e9cc3cf4516cb7fb1467b9c8b22e4747797f3a504916ccb31274d4d2ede9e38 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 2 Nov 2015 13:04:26 +0000 Subject: [PATCH] Accepting request 341939 from home:AndreasStieger:branches:Base:System less 481 OBS-URL: https://build.opensuse.org/request/show/341939 OBS-URL: https://build.opensuse.org/package/show/Base:System/less?expand=0&rev=54 --- less-429-shell.patch | 28 +++++++++++------------ less-458-out_of_bounds_read.patch | 13 ----------- less-458.tar.gz | 3 --- less-481.tar.gz | 3 +++ less-481.tar.gz.sig | Bin 0 -> 72 bytes less-fix_crash_in_hilite_line.patch | 12 ---------- less.changes | 33 ++++++++++++++++++++++++++++ less.keyring | 30 +++++++++++++++++++++++++ less.spec | 14 +++++------- 9 files changed, 85 insertions(+), 51 deletions(-) delete mode 100644 less-458-out_of_bounds_read.patch delete mode 100644 less-458.tar.gz create mode 100644 less-481.tar.gz create mode 100644 less-481.tar.gz.sig delete mode 100644 less-fix_crash_in_hilite_line.patch create mode 100644 less.keyring diff --git a/less-429-shell.patch b/less-429-shell.patch index 322fbbb..8b81bc4 100644 --- a/less-429-shell.patch +++ b/less-429-shell.patch @@ -1,8 +1,8 @@ Index: filename.c =================================================================== ---- filename.c.orig 2009-07-06 22:52:23.000000000 +0200 -+++ filename.c 2009-07-10 10:23:12.000000000 +0200 -@@ -577,7 +577,7 @@ shellcmd(cmd) +--- filename.c.orig ++++ filename.c +@@ -585,7 +585,7 @@ shellcmd(cmd) #if HAVE_SHELL char *shell; @@ -13,9 +13,9 @@ Index: filename.c char *scmd; Index: less.hlp =================================================================== ---- less.hlp.orig 2009-07-10 10:23:07.000000000 +0200 -+++ less.hlp 2009-07-10 10:23:12.000000000 +0200 -@@ -95,7 +95,7 @@ +--- less.hlp.orig ++++ less.hlp +@@ -97,7 +97,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. @@ -26,9 +26,9 @@ Index: less.hlp V Print version number of "less". Index: less.nro =================================================================== ---- less.nro.orig 2009-07-10 10:23:07.000000000 +0200 -+++ less.nro 2009-07-10 10:23:12.000000000 +0200 -@@ -395,7 +395,7 @@ current file. +--- less.nro.orig ++++ less.nro +@@ -407,7 +407,7 @@ current file. A pound sign (#) is replaced by the name of the previously examined file. "!!" repeats the last shell command. "!" with no shell command simply invokes a shell. @@ -37,9 +37,9 @@ Index: less.nro or defaults to "sh". On MS-DOS and OS/2 systems, the shell is the normal command processor. .IP "| shell-command" -@@ -1667,7 +1667,7 @@ LINES and COLUMNS environment variables. +@@ -1727,7 +1727,7 @@ compatible mode. .IP PATH - User's search path (used to find a lesskey file + User's search path (used to find a lesskey file on MS-DOS and OS/2 systems). -.IP SHELL +.IP LESSSHELL @@ -48,9 +48,9 @@ Index: less.nro The type of terminal on which Index: lsystem.c =================================================================== ---- lsystem.c.orig 2009-07-06 22:52:23.000000000 +0200 -+++ lsystem.c 2009-07-10 10:23:12.000000000 +0200 -@@ -129,7 +129,7 @@ lsystem(cmd, donemsg) +--- lsystem.c.orig ++++ lsystem.c +@@ -128,7 +128,7 @@ lsystem(cmd, donemsg) */ #if HAVE_SHELL p = NULL; diff --git a/less-458-out_of_bounds_read.patch b/less-458-out_of_bounds_read.patch deleted file mode 100644 index 7c47ae2..0000000 --- a/less-458-out_of_bounds_read.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: less-458/line.c -=================================================================== ---- less-458.orig/line.c -+++ less-458/line.c -@@ -828,7 +828,7 @@ pappend(c, pos) - mbc_buf[mbc_buf_index++] = c; - if (mbc_buf_index < mbc_buf_len) - return (0); -- if (is_utf8_well_formed(mbc_buf)) -+ if (is_utf8_well_formed(mbc_buf, mbc_buf_index)) - r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos); - else - /* Complete, but not shortest form, sequence. */ diff --git a/less-458.tar.gz b/less-458.tar.gz deleted file mode 100644 index f1ea423..0000000 --- a/less-458.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac -size 311224 diff --git a/less-481.tar.gz b/less-481.tar.gz new file mode 100644 index 0000000..be2fdb6 --- /dev/null +++ b/less-481.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 +size 316622 diff --git a/less-481.tar.gz.sig b/less-481.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3c10b14d16cf322315b420ccb08a6a8ec95c36549bc5cf0679f448ddcb85d17c GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0#)RHH2?|;5b;x|$TK5SS^I4Oof$EqRX|y14hQgn9KDH{ e8>zJ_{s5rsKTeW5#y~KCWGvEtb*_4knFzm0@f#rk literal 0 HcmV?d00001 diff --git a/less-fix_crash_in_hilite_line.patch b/less-fix_crash_in_hilite_line.patch deleted file mode 100644 index 89b9e6f..0000000 --- a/less-fix_crash_in_hilite_line.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: less-458/pattern.c -=================================================================== ---- less-458.orig/pattern.c 2013-04-04 18:55:06.000000000 +0200 -+++ less-458/pattern.c 2015-06-25 11:06:56.681087046 +0200 -@@ -277,6 +277,7 @@ match_pattern(pattern, tpattern, line, l - struct regexp *spattern = (struct regexp *) pattern; - #endif - -+ *sp = *ep = NULL; - #if NO_REGEX - search_type |= SRCH_NO_REGEX; - #endif diff --git a/less.changes b/less.changes index 73c7a49..656db2c 100644 --- a/less.changes +++ b/less.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sun Nov 1 17:38:36 UTC 2015 - astieger@suse.com + +- less 481: + * Don't overwrite history file; just append to it. This behaves + better when multiple sessions are running less simultaneously + and using the same history file. + * New command ESC-G goes to end of currently buffered data in a + pipe. + * Disable history feature when compiled with LESSHISTFILE set to + "-". + * In more-compatible mode, make the -p option apply to every file + opened, not just the first one. + * In more-compatible mode, change the -e option to work like -E, + not -EF. + * Treat multiple CRs before LF are like one CR (all the CRs are + hidden). + * Allow "extra" string in lesskey file to append to a multi-char + command (like a search pattern), without executing the command. + * Ignore -u/-U setting while viewing help file, so that underline + and bold chars are displayed correctly. + * Improve detection of "binary" files in UTF-8 mode. + * Fix bug with ++ commands. + * Fix bug where prompt was sometimes not displayed with +G. + * Fix possible memory corruption + * Fix bugs and improve performance in ampersand filtering. + * Allow %% escape sequence in LESSOPEN variable. + * Automate construction of Unicode tables from Unicode database. +- add keyring and verify source signature +- drop upstream patches: + * less-458-out_of_bounds_read.patch + * less-fix_crash_in_hilite_line.patch + ------------------------------------------------------------------- Thu Jun 25 09:17:17 UTC 2015 - vcizek@suse.com diff --git a/less.keyring b/less.keyring new file mode 100644 index 0000000..3548705 --- /dev/null +++ b/less.keyring @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.2 (MingW32) + +mQGiBEGxJ/oRBADqyDKgNZNZSBVjYa++6I53TEbRc/ySPE8O5xnl+tJdW9Vr8Lr/ +vUd+xLSW10Ej48ISY/Vnw1N1Z3CqypLSVy3EJn5Kt9FE+yED5doRl3xLQ4f2zpLV ++6r7+62D5CkuNIO1SHVfqjHYQdMIa+pIj8tfWHODUM63iDOHjy2QQalSWwCg/zN3 +A5hZoo+7FwmmyndtIZzNfu8EANGohWj4wjrGP+qz12eQGctD76jlX9m9GSUWSDfz +iflox9xSElOoa0kGlNe3iB4JbfgeWsDc8u1pKvWaOu7SVT1ob0X6ZSGDF+sZ178B +YDbQEZ8wNK7vh7PvYmNTAdx8TjdeZH7BP0CqFXAefUIcf7IjxsCyoJKc0N/bBW5/ +wcXXBACRzkz2plYFRHuQJuma+vv1TZEnqUdU3xsDstiQzSUMltzHDNbGtDhZ+9XA +ZfhkM3sSimyljUbdjnUf/F/ulFGJfFp+C0+CIDqtOeLwtq1oNRFzsPAXMJGTh0IY +vss6/cpAGVBWhCt4nIL/o40xwte1YhcT3vEZ//CHKhlVhD+ozrQrTWFyayBOdWRl +bG1hbiA8bWFya25AZ3JlZW53b29kc29mdHdhcmUuY29tPohgBBARAgAgAhkBBQJD +AkHCBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ8VOnyDMjUlmy0wCfXc0HXCRm +kcAmNIhzuk2luW0sx7gAoJHwtEAf/54QboxUlXfJ//IvsFhBuQINBEGxJ/oQCAD2 +Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33 +TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBh +znzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmsz +bDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1 +Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9 +iUsiGSa6q6Jew1XpMgs7AAICB/95h7/V29mwuVP/uP55I6NmEyYwI2gLUNdRPmNj +V+u/5gdh9DF9LQWj3Ko5vRmxVz3iAI3Nf2x7de+ULjEQruWsAvQgqjL1/NGQYupM +k5gPLdYrd8pjJfcLOjOM5ykArSHLtnPvg8OgiwBBb2YezLed3U0Li6fpV/sI4vD/ +rE55LNP3vijgXtLEdA2BTVJk7cJnjAOseWD8ZesJIbWPMfgD5CrM5jDFOnFqTBNX +YbrlEkI5faFL8y6HUTk5o9C1oHehgPtaDfYKmLVUWFQWVr1RzCILb8TiBjmlVvrH +q01dBUrsXOHiuAdYc4mSVAzGEjZdy2OrbgQyHMxSYFWCHRCkiEYEGBECAAYFAkGx +J/oACgkQ8VOnyDMjUlmPgACfZiXhixWbCD/W6D9dm7+isKy6D2oAn38AYHzvs+2L +Uz6yQ9xi5xz636J9 +=QjER +-----END PGP PUBLIC KEY BLOCK----- diff --git a/less.spec b/less.spec index 2c3c92e..06283c3 100644 --- a/less.spec +++ b/less.spec @@ -17,7 +17,7 @@ Name: less -Version: 458 +Version: 481 Release: 0 Summary: Text File Browser and Pager Similar to more License: GPL-3.0+ or BSD-2-Clause @@ -28,16 +28,14 @@ Source1: README.SUSE Source2: lessopen.sh Source3: lessclose.sh Source4: lesskey.src +Source5: http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz.sig +Source6: http://www.greenwoodsoftware.com/less/pubkey.asc#/%{name}.keyring Patch22: %{name}-429-strict_aliasing.patch Patch24: %{name}-429-terminate.patch Patch25: %{name}-429-widechars.patch Patch26: %{name}-429-shell.patch Patch27: %{name}-429-save_line_position.patch Patch28: %{name}-429-more.patch -# PATCH-FIX-UPSTREAM bnc#921719 kstreitova@suse.com -- security fix of an out of bound read access in the UTF-8 -Patch29: less-458-out_of_bounds_read.patch -# PATCH-FIX-UPSTREAM fix crash in nomatch search -Patch30: less-fix_crash_in_hilite_line.patch BuildRequires: automake BuildRequires: ncurses-devel Requires: file @@ -57,8 +55,6 @@ start an editor at any time from within less. %patch26 %patch27 %patch28 -%patch29 -p1 -%patch30 -p1 # # the ./configure script is not writable for the normal user # rather fix permissions for all files @@ -68,7 +64,7 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . %build autoreconf -fiv -export CFLAGS="$RPM_OPT_FLAGS -fPIE" +export CFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" %configure --with-pic # @@ -94,7 +90,7 @@ chmod -x LICENSE COPYING NEWS README.SUSE %files %defattr(-, root, root) %doc LICENSE COPYING NEWS README.SUSE -%doc %{_mandir}/*/* +%{_mandir}/*/* %config %{_sysconfdir}/* %{_bindir}/*