summaryrefslogtreecommitdiff
path: root/sys-apps/less
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-12-31 05:49:48 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-12-31 05:49:48 +0000
commit8507777b4ede346b47aafc436295a51890b9cea3 (patch)
tree46a68cda616dee4775957fd9ef618c124b9b1b75 /sys-apps/less
parentbb262580ec0b56a32797f121e627928d103e6bb1 (diff)
gentoo auto-resync : 31:12:2023 - 05:49:48
Diffstat (limited to 'sys-apps/less')
-rw-r--r--sys-apps/less/Manifest2
-rw-r--r--sys-apps/less/files/less-633-tinfow.patch52
-rw-r--r--sys-apps/less/files/lesspipe-r2.sh291
3 files changed, 0 insertions, 345 deletions
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index d865400c1157..d531f03f0e92 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,10 +1,8 @@
AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc
AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668
-AUX less-633-tinfow.patch 1804 BLAKE2B fe590b454289e93278c70e479ced66bae59e83e2bb857a0eedb7011cd8133df327b7a4ff1deb7cdc3a32c2d02e9b091a37b0cbbb4d1ec4661cbce901ef95fae9 SHA512 3841d4568b290eebf9a3b1d6b8d6439b7b53c21efd7adf2c795b79c450b5e823436f9d6ddbe37b75a6fba64b72d5497adf9a006a9cb06fd8e44e5c86c8e0f946
AUX less-643-lesstest-pkg-config.patch 1483 BLAKE2B 2c0fb65721c2b1c5af74a4fd516d9255059e9aeba7eb91de8aff9d6b35fe708fe275bdde9df6047b6bf4c79534c8410cb946be436a35fe21ce254c87235c6908 SHA512 b6d9911efb20da00f28ceebd922c7f97f7957f964ccb2c50187a52019b35dffaa1e2a7a76cf846ca9f76100af5b2fa38468fb5d49bab9a6b6b02747da2c8f76b
AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
-AUX lesspipe-r2.sh 8293 BLAKE2B 2c572cbb554ab229830090040a5cd523739b7ffbd41ff910170dc0865d573a946a9548a03a5dc661a272c4297c1501f4bca1d7642e0d5c2e499f9248e174d65d SHA512 d16850172c05c2d75a4c069af3b0d4556dd3da52ce008a7ebe37e421ac089a3174e0f16955ca6edfaa110925cd1bee7f61f11374c802ef5de8ed0a23a2c2b96b
AUX lesspipe-r3.sh 9154 BLAKE2B d75a0045fdb33a6e5f0eff3c1b3ad85c928dbb65755a8da89464550f65cb9e7390807d332718262f85527766a797d71cc322e3fc9727024d48f6eb4a7fc5d3ef SHA512 fa82613441a0a30a5872be9f3a6387fcad84cd6622621b90641323f571a5aa78f1e369d5798bcad5992131dc79b2b1cc38288e84203108a495982d125d4da99c
DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b111717ee5e1cf11001fc7ec3d78910db9bb7c51a76816086f599808b1b60f514011ec40e37650d6bc4f8b3d5c SHA512 a29aaf72abca07fb29d12f218bbd422a39e3898b3d53e8dbd5265ae47ecf68b88c3381aa3a9bf7caa8db1e2d8e2c138b333f0d69fddd4cf014e39118c53f7fb1
diff --git a/sys-apps/less/files/less-633-tinfow.patch b/sys-apps/less/files/less-633-tinfow.patch
deleted file mode 100644
index 82ea458cd008..000000000000
--- a/sys-apps/less/files/less-633-tinfow.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://github.com/gwsw/less/pull/403
-
-From 23000c286773af153a5743bc923465707b87613b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Jul 2023 22:58:27 +0100
-Subject: [PATCH] configure.ac: Check for tinfow before tinfo
-
-We currently check for ncursesw > ncurses and then tinfo > tinfow. This means
-we can get a mismatch of ncursesw + tinfo, instead of the correct ncursesw + tinfow.
-
-Swap the order so we check for ncursesw first (before other ncurses variants)
-and then tinfow first (before other tinfo variants).
-
-This is needed anyway for correctness, but also needed for certain terminfos
-to work correctly with recent ncurses.
-
-A better fix would be to use pkg-config first which handles this correctly
-and would include the appropriate -ltinfo* in the libraries list for -lncurses*,
-but not doing that for now.
-
-Bug: https://bugs.gentoo.org/910430
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,10 +63,10 @@ fi
-
- if test $curses_broken = 0; then
-
--# -- Try tinfo.
-+# -- Try tinfow.
- if test "x$TERMLIBS" = x; then
-- if test $have_tinfo = yes; then
-- TERMLIBS="-ltinfo"
-+ if test $have_tinfow = yes; then
-+ TERMLIBS="-ltinfow"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
-@@ -75,10 +75,10 @@ if test "x$TERMLIBS" = x; then
- fi
- fi
-
--# -- Try tinfow.
-+# -- Try tinfo.
- if test "x$TERMLIBS" = x; then
-- if test $have_tinfow = yes; then
-- TERMLIBS="-ltinfow"
-+ if test $have_tinfo = yes; then
-+ TERMLIBS="-ltinfo"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
-
diff --git a/sys-apps/less/files/lesspipe-r2.sh b/sys-apps/less/files/lesspipe-r2.sh
deleted file mode 100644
index fc54d5b21306..000000000000
--- a/sys-apps/less/files/lesspipe-r2.sh
+++ /dev/null
@@ -1,291 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Preprocessor for 'less'. Used when this environment variable is set:
-# LESSOPEN="|lesspipe %s"
-
-# TODO: handle compressed files better
-
-[[ -n ${LESSDEBUG+set} ]] && set -x
-
-trap 'exit 0' PIPE
-
-guesscompress() {
- case "$1" in
- *.gz|*.z) echo "gunzip -c" ;;
- *.bz2|*.bz) echo "bunzip2 -c" ;;
- *.lz) echo "lzip -dc" ;;
- *.lzma) echo "unlzma -c" ;;
- *.lzo) echo "lzop -dc" ;;
- *.xz) echo "xzdec" ;;
- *.zst) echo "zstdcat" ;;
- *) echo "cat" ;;
- esac
-}
-
-lesspipe_file() {
- local out=$(file -L -- "$1")
- local suffix
- case ${out} in
- *" 7-zip archive"*) suffix="7z";;
- *" ar archive"*) suffix="a";;
- *" CAB-Installer"*) suffix="cab";;
- *" cpio archive"*) suffix="cpio";;
- *" ELF "*) suffix="elf";;
- *" LHa"*archive*) suffix="lha";;
- *" troff "*) suffix="man";;
- *" script text"*) suffix="sh";;
- *" shared object"*) suffix="so";;
- *" tar archive"*) suffix="tar";;
- *" Zip archive"*) suffix="zip";;
- *": data") hexdump -C -- "$1"; return 0;;
- *) return 1;;
- esac
- lesspipe "$1" ".${suffix}"
- return 0
-}
-
-lesspipe() {
- local match=$2
- [[ -z ${match} ]] && match=$1
-
- local DECOMPRESSOR=$(guesscompress "${match}")
-
- # User filters
- if [[ -x ~/.lessfilter ]] ; then
- ~/.lessfilter "$1" && exit 0
- fi
-
- local ignore
- for ignore in ${LESSIGNORE} ; do
- [[ ${match} == *.${ignore} ]] && exit 0
- done
-
- # Handle non-regular file types.
- if [[ -d $1 ]] ; then
- ls -alF -- "$1"
- return
- elif [[ ! -f $1 ]] ; then
- # Only return if the stat passes. This is needed to handle pseudo
- # arguments like URIs.
- stat -- "$1" && return
- fi
-
- case "${match}" in
-
- ### Doc files ###
- *.[0-9n]|*.man|\
- *.[0-9n].bz2|*.man.bz2|\
- *.[0-9n].gz|*.man.gz|\
- *.[0-9n].lzma|*.man.lzma|\
- *.[0-9n].xz|*.man.xz|\
- *.[0-9n].zst|*.man.zst|\
- *.[0-9][a-z].gz|*.[0-9][a-z].gz)
- local out=$(${DECOMPRESSOR} -- "$1" | file -)
- case ${out} in
- *troff*)
- # Need to make sure we pass path to man or it will try
- # to locate "$1" in the man search paths
- if [[ $1 == /* ]] ; then
- man -- "$1"
- else
- man -- "./$1"
- fi
- ;;
- *text*)
- ${DECOMPRESSOR} -- "$1"
- ;;
- *)
- # We could have matched a library (libc.so.6), so let
- # `file` figure out what the hell this thing is
- lesspipe_file "$1"
- ;;
- esac
- ;;
- *.dvi) dvi2tty "$1" ;;
- *.ps) ps2ascii "$1" || pstotext "$1" ;;
- *.pdf) pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
- *.doc) antiword "$1" || catdoc "$1" ;;
- *.rtf) unrtf --nopict --text "$1" ;;
- *.conf|*.txt|*.log) ;; # force less to work on these directly #150256
- *.json) python -mjson.tool "$1" ;;
-
- ### URLs ###
- ftp://*|http://*|https://|*.htm|*.html)
- for b in elinks links2 links lynx ; do
- ${b} -dump "$1" && exit 0
- done
- html2text -style pretty "$1"
- ;;
-
- ### Tar files ###
- *.tar|\
- *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\
- *.tar.lz|*.tar.tlz|\
- *.tar.lzma|*.tar.xz)
- ${DECOMPRESSOR} -- "$1" | tar tvvf -;;
- *.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
- lesspipe "$1" "$1.tar.${1##*.t}" ;;
-
- ### Misc archives ###
- *.bz2|\
- *.gz|*.z|\
- *.zst|\
- *.lz|\
- *.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;;
- *.rpm) rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
- *.cpi|*.cpio) cpio -itv < "$1" ;;
- *.ace) unace l "$1" ;;
- *.arc) arc v "$1" ;;
- *.arj) arj l -- "$1" || unarj l "$1" ;;
- *.cab) cabextract -l -- "$1" ;;
- *.lha|*.lzh) lha v "$1" ;;
- *.zoo) zoo -list "$1" || unzoo -l "$1" ;;
- *.7z|*.exe) 7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;;
- *.a) ar tv "$1" ;;
- *.elf) readelf -a -W -- "$1" ;;
- *.so) readelf -h -d -s -W -- "$1" ;;
- *.mo|*.gmo) msgunfmt -- "$1" ;;
-
- *.rar|.r[0-9][0-9]) unrar l -- "$1" ;;
-
- *.jar|*.war|*.ear|*.xpi|*.zip)
- unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1"
- ;;
-
- *.deb|*.udeb)
- if type -P dpkg > /dev/null ; then
- dpkg --info "$1"
- dpkg --contents "$1"
- else
- ar tv "$1"
- ar p "$1" data.tar.gz | tar tzvvf -
- fi
- ;;
-
- ### Filesystems ###
- *.squashfs) unsquashfs -s "$1" && unsquashfs -ll "$1" ;;
-
- ### Media ###
- *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
- identify -verbose -- "$1" || file -L -- "$1"
- ;;
- *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
- midentify "$1" || file -L -- "$1"
- ;;
- *.mp3) mp3info "$1" || id3info "$1" ;;
- *.ogg) ogginfo "$1" ;;
- *.flac) metaflac --list "$1" ;;
- *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;;
- *.bin|*.cue|*.raw)
- # not all .bin/.raw files are cd images #285507
- # fall back to lesspipe_file if .cue doesn't exist, or if
- # cd-info failed to parse things sanely
- [[ -e ${1%.*}.cue ]] \
- && cd-info --no-header --no-device-info "$1" \
- || lesspipe_file "$1"
- ;;
- *.iso)
- iso_info=$(isoinfo -d -i "$1")
- echo "${iso_info}"
- # Joliet output overrides Rock Ridge, so prefer the better Rock
- case ${iso_info} in
- *$'\n'"Rock Ridge"*) iso_opts="-R";;
- *$'\n'"Joliet"*) iso_opts="-J";;
- *) iso_opts="";;
- esac
- isoinfo -l ${iso_opts} -i "$1"
- ;;
-
- ### Encryption stuff ###
- *.crl) openssl crl -hash -text -noout -in "$1" ;;
- *.csr) openssl req -text -noout -in "$1" ;;
- *.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;;
-
-# May not be such a good idea :)
-# ### Device nodes ###
-# /dev/[hs]d[a-z]*)
-# fdisk -l "${1:0:8}"
-# [[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
-# ;;
-
- ### Everything else ###
- *)
- case $(( recur++ )) in
- # Maybe we didn't match due to case issues ...
- 0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
-
- # Maybe we didn't match because the file is named weird ...
- 1) lesspipe_file "$1" ;;
- esac
-
- # So no matches from above ... finally fall back to an external
- # coloring package. No matching here so we don't have to worry
- # about keeping in sync with random packages. Any coloring tool
- # you use should not output errors about unsupported files to
- # stdout. If it does, it's your problem.
-
- # Allow people to flip color off if they dont want it
- case ${LESSCOLOR} in
- always) LESSCOLOR=2;;
- [yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;;
- [nN][oO]|[nN]|0|false) LESSCOLOR=0;;
- *) LESSCOLOR=1;;
- esac
- if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=pygmentize} ]] ; then
- # 2: Only colorize if user forces it ...
- # 1: ... or we know less will handle raw codes -- this will
- # not detect -seiRM, so set LESSCOLORIZER yourself
- if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
- LESSQUIET=true ${LESSCOLORIZER} "$1"
- fi
- fi
-
- # Nothing left to do but let less deal
- exit 0
- ;;
- esac
-}
-
-if [[ $# -eq 0 ]] ; then
- echo "Usage: lesspipe <file>"
-elif [[ $1 == "-V" || $1 == "--version" ]] ; then
- cat <<-EOF
- lesspipe (git)
- Copyright 1999-2019 Gentoo Authors
- Mike Frysinger <vapier@gentoo.org>
- (with plenty of ideas stolen from other projects/distros)
-
- EOF
- less -V
-elif [[ $1 == "-h" || $1 == "--help" ]] ; then
- cat <<-EOF
- lesspipe: preprocess files before sending them to less
-
- Usage: lesspipe <file>
-
- lesspipe specific settings:
- LESSCOLOR env - toggle colorizing of output (no/yes/always; default: no)
- LESSCOLORIZER env - program used to colorize output (default: pygmentize)
- LESSIGNORE - list of extensions to ignore (don't do anything fancy)
-
- You can create per-user filters as well by creating the executable file:
- ~/.lessfilter
- One argument is passed to it: the file to display. The script should exit 0
- to indicate it handled the file, or non-zero to tell lesspipe to handle it.
-
- To use lesspipe, simply add to your environment:
- export LESSOPEN="|lesspipe %s"
-
- For colorization, install dev-python/pygments for the pygmentize program. Note,
- if using alternative code2color from sys app-text/lesspipe you may run out of
- memory due to #188835.
-
- Run 'less --help' or 'man less' for more info.
- EOF
-else
- recur=0
- [[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null
- lesspipe "$1"
-fi