From 93dbb7e1ab5ff651de2bb38ae30a47b974b3fb74 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 11 2013 12:51:15 +0000 Subject: import less-458-4.el7.src.rpm --- diff --git a/.less.metadata b/.less.metadata new file mode 100644 index 0000000..07c7b43 --- /dev/null +++ b/.less.metadata @@ -0,0 +1 @@ +d5b07180d3dad327ccc8bc66818a31577e8710a2 SOURCES/less-458.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/less-394-search.patch b/SOURCES/less-394-search.patch new file mode 100644 index 0000000..909d1b4 --- /dev/null +++ b/SOURCES/less-394-search.patch @@ -0,0 +1,32 @@ +--- less-394/line.c.search 2005-12-03 21:20:32.000000000 +0100 ++++ less-394/line.c 2006-02-15 11:23:25.308694376 +0100 +@@ -1125,6 +1125,14 @@ + break; + } + } ++ if (c == '\0') ++ { ++ /* ++ * Pretend the line ended here ++ */ ++ new_pos = ch_tell(); ++ break; ++ } + linebuf[n++] = c; + c = ch_forw_get(); + } +@@ -1198,6 +1206,14 @@ + *to = *fm; + n = size_linebuf - old_size_linebuf; + } ++ if (c == '\0') ++ { ++ /* ++ * Pretend the line ended here ++ */ ++ new_pos = ch_tell() + 1; ++ break; ++ } + linebuf[--n] = c; + } + if (linep != NULL) diff --git a/SOURCES/less-394-time.patch b/SOURCES/less-394-time.patch new file mode 100644 index 0000000..85f52b3 --- /dev/null +++ b/SOURCES/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/SOURCES/less-418-fsync.patch b/SOURCES/less-418-fsync.patch new file mode 100644 index 0000000..5774bb2 --- /dev/null +++ b/SOURCES/less-418-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([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 ++#include ++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/SOURCES/less-436-help.patch b/SOURCES/less-436-help.patch new file mode 100644 index 0000000..09821c3 --- /dev/null +++ b/SOURCES/less-436-help.patch @@ -0,0 +1,50 @@ +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] diff --git a/SOURCES/less-436-manpage-add-old-bot-option.patch b/SOURCES/less-436-manpage-add-old-bot-option.patch new file mode 100644 index 0000000..a3c76d7 --- /dev/null +++ b/SOURCES/less-436-manpage-add-old-bot-option.patch @@ -0,0 +1,13 @@ +--- less-436/less.nro.old-bot 2010-01-05 15:20:00.690985900 +0100 ++++ less-436/less.nro 2010-01-05 15:16:30.500112556 +0100 +@@ -555,6 +555,10 @@ This can cause + to run somewhat faster than the default. + .IP "\-G or \-\-HILITE-SEARCH" + The \-G option suppresses all highlighting of strings found by search commands. ++.IP "\-\-old-bot" ++Reverts to the old bottom of screen behavior. This can be sometimes ++desirable if the long lines are not wrapped correctly ++when reaching the bottom of the terminal, while scrolling forward. + .IP "\-h\fIn\fP or \-\-max-back-scroll=\fIn\fP" + Specifies a maximum number of lines to scroll backward. + If it is necessary to scroll backward more than \fIn\fP lines, diff --git a/SOURCES/less-444-Foption.v2.patch b/SOURCES/less-444-Foption.v2.patch new file mode 100644 index 0000000..eb9140d --- /dev/null +++ b/SOURCES/less-444-Foption.v2.patch @@ -0,0 +1,139 @@ +From 21d56469fd4b4558d640ad82c78f2b9748341c11 Mon Sep 17 00:00:00 2001 +From: "Vojtech Vitek (V-Teq)" +Date: Mon, 14 May 2012 17:31:20 +0200 +Subject: [PATCH] Fix -F option behavior + +Original patch written by Jindrich Novy . + +Changes and improvements by Zdenek Prikryl , +Vojtech Vitek and Colin Guthrie . +--- + forwback.c | 20 ++++++++++++++++++++ + funcs.h | 1 + + main.c | 16 ++++++++++++++++ + screen.c | 9 +++++++-- + 4 files changed, 44 insertions(+), 2 deletions(-) + +diff --git a/forwback.c b/forwback.c +index ebe422d..687355f 100644 +--- a/forwback.c ++++ b/forwback.c +@@ -422,3 +422,23 @@ get_back_scroll() + return (sc_height - 2); + return (10000); /* infinity */ + } ++ ++/* ++ * Get line count of file up to the screen height + 1 char ++ */ ++ public int ++get_line_count() ++{ ++ int nlines = 0; ++ POSITION pos; ++ ++ pos = ch_zero(); ++ ++ while (pos != NULL_POSITION && nlines <= sc_height) ++ { ++ pos = forw_line(pos); ++ nlines++; ++ } ++ ++ return nlines; ++} +diff --git a/funcs.h b/funcs.h +index 6595232..8ca4656 100644 +--- a/funcs.h ++++ b/funcs.h +@@ -136,6 +136,7 @@ + public void forward (); + public void backward (); + public int get_back_scroll (); ++ public int get_line_count (); + public void del_ifile (); + public IFILE next_ifile (); + public IFILE prev_ifile (); +diff --git a/main.c b/main.c +index 0af1762..ef69440 100644 +--- a/main.c ++++ b/main.c +@@ -55,6 +55,7 @@ static char consoleTitle[256]; + #endif + + extern int less_is_more; ++public int line_count; + extern int missing_cap; + extern int know_dumb; + extern int quit_if_one_screen; +@@ -277,10 +278,25 @@ main(argc, argv) + { + if (edit_stdin()) /* Edit standard input */ + quit(QUIT_ERROR); ++ if (quit_if_one_screen) ++ line_count = get_line_count(); + } else + { + if (edit_first()) /* Edit first valid file in cmd line */ + quit(QUIT_ERROR); ++ /* ++ * In case that we have only one file and -F, have to get a line ++ * count fot init(). If the line count is less then a height of a term, ++ * the content of the file is printed out and then less quits. Otherwise ++ * -F can not be used ++ */ ++ if (quit_if_one_screen) ++ { ++ if (nifile() == 1) ++ line_count = get_line_count(); ++ else /* In case more than one file, -F can not be used */ ++ quit_if_one_screen = FALSE; ++ } + } + + init(); +diff --git a/screen.c b/screen.c +index b8bc666..1883e3e 100644 +--- a/screen.c ++++ b/screen.c +@@ -204,6 +204,7 @@ public int missing_cap = 0; /* Some capability is missing */ + + static int attrmode = AT_NORMAL; + extern int binattr; ++extern int line_count; + + #if !MSDOS_COMPILER + static char *cheaper(); +@@ -233,6 +234,7 @@ extern int wscroll; + extern int screen_trashed; + extern int tty; + extern int top_scroll; ++extern int quit_if_one_screen; + extern int oldbot; + #if HILITE_SEARCH + extern int hilite_search; +@@ -1534,7 +1536,9 @@ win32_deinit_term() + init() + { + #if !MSDOS_COMPILER +- if (!no_init) ++ if (quit_if_one_screen && line_count >= sc_height) ++ quit_if_one_screen = FALSE; ++ if (!no_init && !quit_if_one_screen) + tputs(sc_init, sc_height, putchr); + if (!no_keypad) + tputs(sc_s_keypad, sc_height, putchr); +@@ -1574,8 +1578,9 @@ deinit() + #if !MSDOS_COMPILER + if (!no_keypad) + tputs(sc_e_keypad, sc_height, putchr); +- if (!no_init) ++ if (!no_init && !quit_if_one_screen) + tputs(sc_deinit, sc_height, putchr); ++ + #else + /* Restore system colors. */ + SETCOLORS(sy_fg_color, sy_bg_color); +-- +1.7.7.6 + diff --git a/SOURCES/less-458-less-filters-man.patch b/SOURCES/less-458-less-filters-man.patch new file mode 100644 index 0000000..8e98bd7 --- /dev/null +++ b/SOURCES/less-458-less-filters-man.patch @@ -0,0 +1,22 @@ +diff -upr less-458_orig/less.nro less-458_work/less.nro +--- less-458_orig/less.nro 2013-05-07 14:20:52.237332235 +0200 ++++ less-458_work/less.nro 2013-05-07 14:22:23.142708098 +0200 +@@ -1228,6 +1228,18 @@ Similarly, if the first two characters o + 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 ++.br ++ /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: diff --git a/SOURCES/less-458-lessecho-usage.patch b/SOURCES/less-458-lessecho-usage.patch new file mode 100644 index 0000000..40a05b7 --- /dev/null +++ b/SOURCES/less-458-lessecho-usage.patch @@ -0,0 +1,33 @@ +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() + { + fprintf(stderr, +- "usage: lessecho [-ox] [-cx] [-pn] [-dn] [-mx] [-nn] [-ex] [-fn] [-a] file ...\n"); ++ "usage: lessecho [-ox] [-cx] [-pn] [-dn] [-mx] [-nn] [-ex] [-fn] [-a] file ...\n\n"); ++ fprintf(stderr, ++ " -ox\t- specifies \"x\" to be the open quote character\n"); ++ fprintf(stderr, ++ " -cx\t- specifies \"x\" to be the close quote character\n"); ++ fprintf(stderr, ++ " -pn\t- specifies \"n\" to be the open quote character, as an integer\n"); ++ fprintf(stderr, ++ " -dn\t- specifies \"n\" to be the close quote character, as an integer\n"); ++ fprintf(stderr, ++ " -mx\t- specifies \"x\" to be a metachar\n"); ++ fprintf(stderr, ++ " -nn\t- specifies \"n\" to be a metachar, as an integer\n"); ++ fprintf(stderr, ++ " -ex\t- specifies \"x\" to be the escape char for metachars\n"); ++ fprintf(stderr, ++ " -fn\t- specifies \"n\" to be the escape char for metachars, as an integer\n"); ++ fprintf(stderr, ++ " -a\t- specifies that all arguments are to be quoted\n"); ++ fprintf(stderr, ++ " -?\t- prints this help\n"); + } + + static void + diff --git a/SOURCES/less-458-lesskey-usage.patch b/SOURCES/less-458-lesskey-usage.patch new file mode 100644 index 0000000..c77a572 --- /dev/null +++ b/SOURCES/less-458-lesskey-usage.patch @@ -0,0 +1,37 @@ +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() + { +- fprintf(stderr, "usage: lesskey [-o output] [input]\n"); ++ fprintf(stderr, "usage: lesskey [-o output] [input]\n\n"); ++ fprintf(stderr, ++ " -o output\t- specify output file, otherwise $HOME/.less is used\n"); ++ fprintf(stderr, ++ " -i input\t- specify input file, otherwise standard input is used\n"); ++ fprintf(stderr, ++ " -V\t\t- print lesskey version\n"); ++ fprintf(stderr, ++ " -h\t\t- print this help\n"); + exit(1); + } + +@@ -307,6 +315,8 @@ parse_args(argc, argv) + break; + case 'o': + outfile = &argv[0][2]; ++ case 'h': ++ goto opt_h; + opt_o: + if (*outfile == '\0') + { +@@ -319,6 +329,7 @@ parse_args(argc, argv) + opt_V: + printf("lesskey version %s\n", version); + exit(0); ++ opt_h: + default: + usage(); + } diff --git a/SOURCES/less-458-old-bot-in-help.patch b/SOURCES/less-458-old-bot-in-help.patch new file mode 100644 index 0000000..15e54f7 --- /dev/null +++ b/SOURCES/less-458-old-bot-in-help.patch @@ -0,0 +1,12 @@ +diff -upr less-458_orig/less.hlp less-458_work/less.hlp +--- less-458_orig/less.hlp 2013-05-07 14:03:52.037104428 +0200 ++++ less-458_work/less.hlp 2013-05-07 11:24:43.475780365 +0200 +@@ -135,6 +135,8 @@ + Highlight only last match for searches. + -G ........ --HILITE-SEARCH + Don't highlight any matches for searches. ++ --old-bot ++ Revert to the old bottom of screen behavior. + -h [_N] .... --max-back-scroll=[_N] + Backward scroll limit. + -i ........ --ignore-case diff --git a/SOURCES/less.csh b/SOURCES/less.csh new file mode 100755 index 0000000..ba2b82b --- /dev/null +++ b/SOURCES/less.csh @@ -0,0 +1,4 @@ +# less initialization script (csh) +if ( -x /usr/bin/lesspipe.sh ) then + setenv LESSOPEN "||/usr/bin/lesspipe.sh %s" +endif diff --git a/SOURCES/less.sh b/SOURCES/less.sh new file mode 100755 index 0000000..14f6fde --- /dev/null +++ b/SOURCES/less.sh @@ -0,0 +1,2 @@ +# less initialization script (sh) +[ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="${LESSOPEN-||/usr/bin/lesspipe.sh %s}" diff --git a/SOURCES/lesspipe.sh b/SOURCES/lesspipe.sh new file mode 100755 index 0000000..ede84db --- /dev/null +++ b/SOURCES/lesspipe.sh @@ -0,0 +1,87 @@ +#!/bin/sh +# +# To use this filter with less, define LESSOPEN: +# export LESSOPEN="|/usr/bin/lesspipe.sh %s" +# +# The script should return zero if the output was valid and non-zero +# otherwise, so less could detect even a valid empty output +# (for example while uncompressing gzipped empty file). +# For backward-compatibility, this is not required by default. To turn +# this functionality there should be another vertical bar (|) straight +# after the first one in the LESSOPEN environment variable: +# export LESSOPEN="||/usr/bin/lesspipe.sh %s" + +if [ ! -e "$1" ] ; then + exit 1 +fi + +if [ -d "$1" ] ; then + ls -alF -- "$1" + exit $? +fi + +exec 2>/dev/null + +# Allow for user defined filters +if [ -x ~/.lessfilter ]; then + ~/.lessfilter "$1" + if [ $? -eq 0 ]; then + exit 0 + fi +fi + +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) + case "$1" in + *.gz) DECOMPRESSOR="gzip -dc" ;; + *.bz2) DECOMPRESSOR="bzip2 -dc" ;; + *.xz|*.lzma) DECOMPRESSOR="xz -dc" ;; + esac + if [ -n "$DECOMPRESSOR" ] && $DECOMPRESSOR -- "$1" | file - | grep -q troff; then + $DECOMPRESSOR -- "$1" | groff -Tascii -mandoc - + exit $? + fi ;;& +*.[1-9n]|*.[1-9]x|*.man) + if file "$1" | grep -q troff; then + man -l "$1" | cat -s + exit $? + fi ;;& +*.tar) tar tvvf "$1" ;; +*.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;; +*.tar.xz) tar Jtvvf "$1" ;; +*.xz|*.lzma) xz -dc -- "$1" ;; +*.tar.bz2|*.tbz2) bzip2 -dc -- "$1" | tar tvvf - ;; +*.[zZ]|*.gz) gzip -dc -- "$1" ;; +*.bz2) bzip2 -dc -- "$1" ;; +*.zip|*.jar|*.nbm) zipinfo -- "$1" ;; +*.rpm) rpm -qpivl --changelog -- "$1" ;; +*.cpi|*.cpio) cpio -itv < "$1" ;; +*.gpg) gpg -d "$1" ;; +*.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif) + if [ -x /usr/bin/identify ]; then + identify "$1" + elif [ -x /usr/bin/gm ]; then + gm identify "$1" + else + echo "No identify available" + echo "Install ImageMagick or GraphicsMagick to browse images" + exit 1 + fi ;; +*) + if [ -x /usr/bin/file ] && [ -x /usr/bin/iconv ] && [ -x /usr/bin/cut ]; then + case `file -b "$1"` in + *UTF-16*) conv='UTF-16' ;; + *UTF-32*) conv='UTF-32' ;; + esac + if [ -n "$conv" ]; then + env=`echo $LANG | cut -d. -f2` + if [ -n "$env" -a "$conv" != "$env" ]; then + iconv -f $conv -t $env "$1" + exit $? + fi + fi + fi + exit 1 +esac +exit $? + diff --git a/SPECS/less.spec b/SPECS/less.spec new file mode 100644 index 0000000..962cbd3 --- /dev/null +++ b/SPECS/less.spec @@ -0,0 +1,488 @@ +Summary: A text file browser similar to more, but better +Name: less +Version: 458 +Release: 4%{?dist} +License: GPLv3+ +Group: Applications/Text +Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz +Source1: lesspipe.sh +Source2: less.sh +Source3: less.csh +Patch1: less-444-Foption.v2.patch +Patch2: less-394-search.patch +Patch4: less-394-time.patch +Patch5: less-418-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 +URL: http://www.greenwoodsoftware.com/less/ +Requires: groff-base +BuildRequires: ncurses-devel +BuildRequires: autoconf automake libtool + +%description +The less utility is a text file browser that resembles more, but has +more capabilities. Less allows you to move backwards in the file as +well as forwards. Since less doesn't have to read the entire input file +before it starts, less starts up more quickly than text editors (for +example, vi). + +You should install less because it is a basic utility for viewing text +files, and you'll use it frequently. + +%prep +%setup -q +%patch1 -p1 -b .Foption +%patch2 -p1 -b .search +%patch4 -p1 -b .time +%patch5 -p1 -b .fsync +%patch6 -p1 -b .manpage-add-old-bot-option +%patch7 -p1 -b .help +%patch8 -p1 -b .lessecho-usage +%patch9 -p1 -b .less-filters-man +%patch10 -p1 -b .lesskey-usage +%patch11 -p1 -b .oldbothelp +autoreconf + +chmod -R a+w * +chmod 644 *.c *.h LICENSE README + +%build +%configure +make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/etc/profile.d +install -p -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir} +install -p -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d +install -p -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d +ls -la $RPM_BUILD_ROOT/etc/profile.d + +%files +%defattr(-,root,root,-) +%doc LICENSE +/etc/profile.d/* +%{_bindir}/* +%{_mandir}/man1/* + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Thu Jul 11 2013 Ondrej Vasik - 458-4 +- apply the --old-bot patch (#983167) + +* Tue May 07 2013 Fridolin Pokorny - 458-3 +- Expanded lessecho usage (#948597) +- Added lessfilter info to man (#948597) +- Expanded lesskey usage (#948597) +- Added --old-bot to help (#948597) + +* Thu Apr 11 2013 Fridolin Pokorny - 458-2 +- Added gpg support to lesspipe.sh (#885122) +- Added ~/.lessfilter support (#885122) + +* Thu Apr 11 2013 Fridolin Pokorny - 458-1 +- Update to 458 + +* Thu Feb 14 2013 Fedora Release Engineering - 451-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 25 2012 Martin Briza - 451-2 +- Changed unnecessary groff dependency to groff-base (#868376) + +* Tue Sep 11 2012 Martin Briza - 451-1 +- Rebase to 451 (#835802) +- Removed the empty-lessopen-pipe patch as the issue is now fixed upstream. + +* Mon May 14 2012 Vojtech Vitek (V-Teq) - 444-7 +- Fix less.sh not to override user-defined LESSOPEN variable (#802757) +- Use POSIX regcomp instead of PCRE - revert 406-11, commit 4b961c7 (#643233) +- Merge Foption changes by Colin Guthrie to Foption.v2.patch (#805735) + +* Fri Feb 10 2012 Petr Pisar - 444-6 +- Rebuild against PCRE 8.30 + +* Fri Jan 13 2012 Fedora Release Engineering - 444-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 08 2011 Vojtech Vitek (V-Teq) - 444-4 +- Avoid some unnecessary stat calls and commands in lesspipe.sh, + patch by Ville Skyttä (#741440) +- Use `groff' instead of `man -s' for rendering manpages to prevent + options incompatibility between man and man-db packages (#718498) +- Add groff to Requires + +* Mon Aug 23 2011 Vojtech Vitek (V-Teq) - 444-3 +- Substitute %%makeinstall macro with make DESTDIR* install (#732557) + +* Fri Aug 12 2011 Vojtech Vitek (V-Teq) - 444-2 +- Fix debuginfo source files permissions +- Remove strip after %%makeinstall to fix debuginfo package + +* Thu Jul 14 2011 Vojtech Vitek (V-Teq) - 444-1 +- Rebase to 444 (#713406) + +* Wed Apr 20 2011 Vojtech Vitek (V-Teq) - 443-1 +- Rebase to 443 +- Foption patch made applicable against 443 +- Manpage extra line patch removed; fixed upstream (#697451) + +* Wed Apr 13 2011 Vojtech Vitek (V-Teq) - 436-13 +- Don't convert files with UTF-16/UTF-32 string in filename (#638312) + +* Tue Feb 15 2011 Vojtech Vitek (V-Teq) - 436-12 +- Enable LESSOPEN exit statuses as default also in less.sh (#666084, #676057) + +* Tue Feb 15 2011 Vojtech Vitek (V-Teq) - 436-11 +- Clean lesspipe.sh script +- Split case for compressed and plain troff files +- Add support for *.xz and *.lzma man pages (#676057) +- Add support for reading UTF-16 and UTF-32 files (#638312) +- Don't require correct exit status from LESSOPEN scripts until + it gets accepted by upstream (preserve backward compatibility) (#666084, #676057) + +* Mon Feb 07 2011 Fedora Release Engineering - 436-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Vojtech Vitek (V-Teq) - 436-9 +- Fix regression in lesspipe.sh script (*.gz files etc.) (#615303 comment #9) + +* Wed Dec 22 2010 Vojtech Vitek (V-Teq) - 436-8 +- The new "--old-bot" option is not documented in the man page (#510724) +- Fix descriptions of some options in online help + (#578289, patch by Jeff Bastian [IT603793]) + +* Tue Dec 21 2010 Vojtech Vitek (V-Teq) - 436-7 +- Fix for valid empty LESSOPEN pipe output (#579251, #615303) + +* Wed Jan 20 2010 Nikola Pajkovsky - 436-6 +- RFE: lesspipe.sh could use a support for *.xz file + +* Mon Jan 4 2010 Nikola Pajkovsky - 436-5 +- patched wrong manpage. Resolves: #537746. + +* Mon Dec 12 2009 Nikola Pajkovsky - 436-4 +- #546613 - RFE: add *.jar *.nbm to lesspipe.sh + +* Wed Dec 9 2009 Nikola Pajkovsky - 436-3 +- Resolves: #537746 - Two different descriptions about the default value of LESSBINFMT + +* Fri Jul 24 2009 Fedora Release Engineering - 436-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 10 2009 Zdenek Prikryl - 436-1 +- Foption patch is more optimal now +- Update to 436 + +* Tue Apr 14 2009 Zdenek Prikryl - 429-1 +- Update to 429 + +* Tue Mar 31 2009 Zdenek Prikryl - 424-4 +- Added GraphicsMagick support (#492695) + +* Tue Mar 17 2009 Zdenek Prikryl - 424-3 +- Added lzma support +- Added test if fsync produces EIVAL on tty + +* Wed Feb 25 2009 Fedora Release Engineering - 424-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jun 25 2008 Zdenek Prikryl - 424-1 +- Update to 424 + +* Wed Jun 11 2008 Zdenek Prikryl - 423-1 +- Update to 423 + +* Wed Feb 20 2008 Fedora Release Engineering - 418-3 +- Autorebuild for GCC 4.3 + +* Fri Jan 18 2008 Zdenek Prikryl - 418-2 +- Fixed -F option +- Resolves: #427551 + +* Fri Jan 04 2008 Zdenek Prikryl - 418-1 +- Update to 418 + +* Fri Nov 23 2007 Zdenek Prikryl - 416-1 +- Update to 416 +- Fixed SIGABORT caused by UTF-8 related bug +- Resolves #395591 + +* Wed Nov 21 2007 Zdenek Prikryl - 415-1 +- Update to 415 + +* Tue Nov 13 2007 Ivana Varekova - 409-2 +- remove which usage (#312591) + +* Mon Oct 22 2007 Ivana Varekova - 409-1 +- upgrade to 409 +- remove useless/obsolete patches +- add autoconf buildrequires + +* Mon Oct 1 2007 Ivana Varekova - 406-12 +- change license tag +- fix 312591 - add which dependency + +* Thu Aug 9 2007 Ivana Varekova - 406-11 +- configure a regular expression library + +* Tue Jun 26 2007 Ivana Varekova - 406-10 +- update to 406 + +* Mon Jun 4 2007 Ivana Varekova - 394-10 +- Resolves: #242077 + remove "-" option from lesspipe.sh script + +* Tue Feb 20 2007 Ivana Varekova - 394-9 +- change /etc/profile.d script's permissions + +* Mon Feb 19 2007 Ivana Varekova - 394-8 +- change LICENSE permissions + +* Wed Feb 7 2007 Ivana Varekova - 394-7 +- incorporate the package review + +* Wed Nov 22 2006 Ivana Varekova - 394-6 +- fix permissions of debuginfo source code + +* Wed Oct 25 2006 Ivana Varekova - 394-5 +- fix command ">" (#120916) + +* Wed Jul 12 2006 Jesse Keating - 394-4.1 +- rebuild + +* Thu May 5 2006 Ivana Varekova - 394-4 +- fix problem with unassigned variable DECOMPRESSOR (#190619) + +* Wed Feb 15 2006 Ivana Varekova - 394-3 +- add patch for search problem (search did not find string which + occurs in a line after '\0') + +* Fri Feb 10 2006 Jesse Keating - 394-2.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 394-2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Jan 16 2006 Jindrich Novy 394-2 +- apply better fix for #120916 from Avi Kivity (#177819) + to avoid flickering when '>' is pressed multiple times + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Dec 6 2005 Jindrich Novy 394-1 +- update to less-394 + +* Mon Nov 7 2005 Jindrich Novy 393-1 +- update to less-393 +- groom Foption patch a bit +- remove obsolete ncursesw and utf8detect patches + +* Fri Oct 21 2005 Jindrich Novy 392-2 +- fix the -F option (#79650), thanks to Petr Raszyk + +* Wed Oct 19 2005 Jindrich Novy 392-1 +- update to less-392 - fixes #122847 and enhances UTF8 support + +* Fri Sep 2 2005 Jindrich Novy 382-8 +- fix displaying of bogus newline for growing files (#120916) + +* Fri Mar 4 2005 Jindrich Novy 382-7 +- rebuilt with gcc4 + +* Wed Feb 16 2005 Jindrich Novy 382-6 +- add patch for proper detection of UTF-8 locale, + patch from Peter Rockai + +* Tue Nov 16 2004 Karsten Hopp 382-5 +- minor fix in lesspipe.sh (#73215) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Mar 29 2004 Karsten Hopp 382-3 +- remove old stuff from /etc/profile.d/less.*, fixes #109011 + +* Tue Mar 02 2004 Karsten Hopp 382-1.1 +- build for FC1 + +* Sat Feb 14 2004 Karsten Hopp 382-1 +- new upstream version + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 15 2004 Karsten Hopp 381-2 +- drop iso247 patch, doesn't work + +* Wed Jun 11 2003 Karsten Hopp 381-1 +- new version with rewritten iso247 patch + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed May 28 2003 Florian La Roche +- fix korean #79977 +- add new less.sh from #89780, s/ko/korean/ and write .csh script +- add patch from #91661: /japanses/japanese-euc/ + +* Tue Feb 4 2003 Tim Waugh 378-7 +- Part of multibyte patch was missing; fixed. + +* Mon Feb 3 2003 Tim Waugh 378-6 +- Fix underlining multibyte characters (bug #83377). + +* Thu Jan 30 2003 Karsten Hopp 378-5 +- removed older, unused patches +- add patch from Yukihiro Nakai to fix display of japanese text + (#79977) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 18 2002 Karsten Hopp č +- removed default 'cat' from lesspipe.sh as it breaks 'v' and 'F' keys + (#79921) + +* Fri Dec 6 2002 Nalin Dahyabhai 378-2 +- add a default case to lesspipe so that it shows other kinds of files + +* Mon Nov 04 2002 Karsten Hopp +- less-378 +- added some debian patches +- show image info instead of binary garbage when viewing images + +* Fri Oct 05 2001 Karsten Hopp +- fix line numbering (less -N filename), caused by + a broken i18n patch + +* Tue Sep 04 2001 Karsten Hopp +- recompile with large file support (#52945) + +* Tue Jul 24 2001 Karsten Hopp +- fix #49506 (BuildRequires) + +* Mon Jun 25 2001 Nalin Dahyabhai +- fixup eline patch to initialize result correctly + +* Mon Jun 25 2001 Karsten Hopp +- update URLs +- Copyright -> License +- fix #43348 (crashes when searching for /<) +- fix #39849 ( + _ ignores LESSCHARDEF in displaying characters, + _ prefaces sequences of one or "high" characters with a capital "A") + +* Mon Feb 5 2001 Yukihiro Nakai +- Update less.sh, less.csh to set JLESSCHARSET=japanese + when LANG=ja?? + +* Mon Feb 5 2001 Matt Wilson +- changed the less-358+iso247-20001210.diff patch to use strcasecmp when + comparing locale names + +* Thu Feb 01 2001 Karsten Hopp +- fixed character translations (bugzilla #24463) + +* Wed Jan 31 2001 Karsten Hopp +- fixed lesspipe (bugzilla #17456 #25324) + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- rebuild with new ncurses + +* Mon Dec 11 2000 Yukihiro Nakai +- Add Japanese patch with ia64 support. + +* Mon Nov 27 2000 Karsten Hopp +- rebuild with new ncurses +- fix Bug #21288 + +* Mon Nov 13 2000 Karsten Hopp +- fixed handling of manpages of type *.1x.gz +- added support for cpio packages + +* Thu Sep 14 2000 Than Ngo +- added new lesspipe.sh (Bug #17456) + +* Wed Aug 23 2000 Bernhard Rosenkraenzer +- support files with spaces in their names (Bug #16777) + +* Tue Aug 8 2000 Bernhard Rosenkraenzer +- Support gzipped man pages in lesspipe.sh (Bug #15610) + +* Thu Aug 3 2000 Bernhard Rosenkraenzer +- Tweak init script (Bug #14622) + +* Thu Jul 27 2000 Bernhard Rosenkraenzer +- Oops, actually apply the patch for 9443. ;) + +* Wed Jul 26 2000 Bernhard Rosenkraenzer +- Fix up messed output if a user outputs anything in ~/.bashrc or the + likes (Bug #9443) +- handle RPM_OPT_FLAGS + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Thu Jul 13 2000 Bernhard Rosenkraenzer +- 358 + +* Mon Jun 26 2000 Matt Wilson +- defattr root + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify + +* Fri Apr 14 2000 Bernhard Rosenkraenzer +- 354 + +* Mon Mar 20 2000 Bernhard Rosenkraenzer +- Update to v352 + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Tue Jan 25 2000 Bernhard Rosenkraenzer +- Update to v346 +- Update download URL +- use the configure marcro +- strip binary +- fix up lesspipe stuff (Bug #8750 and a couple of non-reported bugs) + (Karsten, did I mention I'll kill you when you return from SAP? ;) ) + +* Sun Jan 07 2000 Karsten Hopp +- added lesspipe.sh to show listings of package + contents instead of binary output. + +* Fri Aug 27 1999 Preston Brown +- less finally gets maintenance, upgraded to 340 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 6) + +* Tue Mar 16 1999 Preston Brown +- removed ifarch axp stuff for /bin/more, more now works on alpha properly. + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Fri Dec 18 1998 Preston Brown +- bumped spec number for initial rh 6.0 build + +* Thu May 07 1998 Prospector System + +- translations modified for de, fr, tr + +* Wed Apr 08 1998 Cristian Gafton +- updated to 332 and built for Manhattan +- added buildroot + +* Mon Jun 02 1997 Erik Troan +- built against glibc