sys-apps/less: Version bump

Signed-off-by: Martin Väth <martin@mvath.de>

5 files changed, 11 insertions, 82 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index ba3e4c27..ca156c0d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -95,7 +95,7 @@ net-print/foo2zjs 20200221: Support for printing to ZjStream-based printers
 sci-geosciences/googleearth 7.1.8.3036-r3 7.3.0.3832-r3 7.3.4-r1: A 3D interface to the planet
 sci-mathematics/reduce 20141130-r3 20190413: A general-purpose computer algebra system
 sys-apps/cpi 3.2: A wrapper for cp -i -a, making use of diff
-sys-apps/less 608-r2: Excellent text file viewer, optionally with additional selection feature
+sys-apps/less 633: Excellent text file viewer, optionally with additional selection feature
 sys-apps/man 1.6g-r4: Standard commands to read man pages
 sys-apps/openrc-wrapper 2.4: Use openrc init scripts with systemd or other init systems
 sys-apps/paxopen 1.2: A wrapper script to set PAX kernel variables to an insecure/safe state
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 102538b8..5205b4ad 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,2 +1,2 @@
-DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
-DIST less-select-2.14.tar.gz 31864 BLAKE2B 43441084c1385a5b1096ae8ad3a9070a1a3b9ebca2b876363d103f09ec6486212837c7ca70d3aa326c1ccf0b793983795d1d76cda08b482bd24739b17c67b73c SHA512 8683c5974324fd1a3a53f6ca3e2bb60fda9413538fd6ee0e21b0b342dca240326236f34c4b7fc0bf33ce21375229aa657ded23cc9040bb0742ba95a2ef38a895
+DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b111717ee5e1cf11001fc7ec3d78910db9bb7c51a76816086f599808b1b60f514011ec40e37650d6bc4f8b3d5c SHA512 a29aaf72abca07fb29d12f218bbd422a39e3898b3d53e8dbd5265ae47ecf68b88c3381aa3a9bf7caa8db1e2d8e2c138b333f0d69fddd4cf014e39118c53f7fb1
+DIST less-select-2.15.tar.gz 32374 BLAKE2B f135d80cdae38f84309754863ae3736f574e5476414b7b835a8d2f9c3ff6c8baf92ece154763e61e9f0a2133928bc8f7462b209e9508ac2dad2ca454eb32aecf SHA512 1284d11b9098cbdc5243886ffdc29cf998853fd998ef6a6e1ef8af9cdcf89175bc7573b836afaab8dc06a51e9018cdd07bc9011c994bc7fd63965d3bff46defd
diff --git a/sys-apps/less/files/less-608-CVE-2022-46663.patch b/sys-apps/less/files/less-608-CVE-2022-46663.patch
deleted file mode 100644
index a358dd6f..00000000
--- a/sys-apps/less/files/less-608-CVE-2022-46663.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/893530
-https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c
-
-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.
-
---- 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;
- 	}
-
diff --git a/sys-apps/less/files/less-608-procfs.patch b/sys-apps/less/files/less-608-procfs.patch
deleted file mode 100644
index 4f66322b..00000000
--- a/sys-apps/less/files/less-608-procfs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03f011f219a6d6068c4ccd07dbd8dcd50641ff10 Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Tue, 20 Sep 2022 12:32:30 -0700
-Subject: [PATCH] Fix reading procfs files on Linux: bad detection of
- HAVE_PROCFS.
-
-diff --git a/ch.c b/ch.c
-index bfad09c7..fcf136b9 100644
---- a/ch.c
-+++ b/ch.c
-@@ -28,6 +28,9 @@ extern ino_t curr_ino;
- 
- #if HAVE_PROCFS
- #include <sys/statfs.h>
-+#if HAVE_LINUX_MAGIC_H
-+#include <linux/magic.h>
-+#endif
- #endif
- 
- typedef POSITION BLOCKNUM;
-diff --git a/configure.ac b/configure.ac
-index f7c64814..b10adce9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ AC_SEARCH_LIBS([regcmp], [gen intl PW])
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h])
-+AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h linux/magic.h sys/ioctl.h sys/stream.h wctype.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STAT
-@@ -271,7 +271,10 @@ AC_TRY_COMPILE([#include <sys/types.h>
-   [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])
- AC_MSG_CHECKING(for procfs)
--AC_TRY_COMPILE([#include <sys/statfs.h>],
-+AC_TRY_COMPILE([#include <sys/statfs.h>
-+#if HAVE_LINUX_MAGIC_H
-+#include <linux/magic.h>
-+#endif],
-   [struct statfs s; s.f_type = PROC_SUPER_MAGIC; (void) fstatfs(0,&s); ],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PROCFS)], [AC_MSG_RESULT(no)])
- 
diff --git a/sys-apps/less/less-608-r2.ebuild b/sys-apps/less/less-633.ebuild
index 6fb89abc..96999db1 100644
--- a/sys-apps/less/less-608-r2.ebuild
+++ b/sys-apps/less/less-633.ebuild
@@ -9,8 +9,8 @@ inherit autotools
 
 DESCRIPTION="Excellent text file viewer, optionally with additional selection feature"
 PATCHN="less-select"
-PATCHV="2.14"
-PATCHVER="608"
+PATCHV="2.15"
+PATCHVER="633"
 PATCHRUMP="${PATCHN}-${PATCHV}"
 PATCHBALL="${PATCHRUMP}.tar.gz"
 SELECTDIR="${WORKDIR}/${PATCHRUMP}"
@@ -22,11 +22,13 @@ RESTRICT="mirror"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+lesspipe +less-select pcre original-gentoo source unicode"
+IUSE="+lesspipe +less-select pcre original-gentoo source"
 
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
+DEPEND="
+	>=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:=
+	pcre? ( dev-libs/libpcre2 )
+"
 RDEPEND="${DEPEND}
 	less-select? ( dev-lang/perl )"
 #		|| ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 )
@@ -45,10 +47,6 @@ src_prepare() {
 		sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX}"'/etc/less/select-key.bin|g' \
 			"${SELECTDIR}/bin/less-select" || die
 	fi
-	local PATCHES=(
-		"${FILESDIR}/less-608-procfs.patch"
-		"${FILESDIR}/less-608-CVE-2022-46663.patch"
-	)
 
 	default
 	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
@@ -57,8 +55,6 @@ src_prepare() {
 }
 
 src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	local myeconfargs=(
 		--with-regex=$(usex pcre pcre2 posix)
 		--with-editor="${EPREFIX}"/usr/libexec/editor