gentoo auto-resync : 12:02:2023 - 09:56:54

5 files changed, 175 insertions, 4 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index aef67474ee9c..d76d52fd8c09 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,13 @@
+AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc
 AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
+DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667
 EBUILD less-608-r1.ebuild 1631 BLAKE2B 3c0bcfb98082e497b3ff75bf44c5bc39882d34f9852aacf410e0802aa8eb65bde5242bf70055a7a1726678ba6971dc01508e9c86ff74597cf2160fbafd2844bd SHA512 c82f4ea7446b40acc3aeb9b33796dc4a55db2e90b3b83e18f7dadc0c4c8a9a88f473ef6cfad524ac0921cd5dce7c4f202bafc06a0f8a269762e0ae046cca7b35
+EBUILD less-608-r2.ebuild 1686 BLAKE2B 03b098d312610f94e992ed9557d2f6f874e8ca19e0d3d8665884dda8d4564340d604a4d5e9a8472dea46071af61674b818016d2c1000864df5322836f2a6aae9 SHA512 1828b5c308aa53e87dd261fc49ee08c4c7f5e3ac8eab3f2f001331be51cbbbecaa3599e2b36798e7e6b7e0b3287fd735e87dc28c03ce3a5eed1207847a66fbbd
 EBUILD less-618_beta.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2
-EBUILD less-9999.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2
+EBUILD less-623_beta.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
+EBUILD less-9999.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/files/less-608-CVE-2022-46663.patch b/sys-apps/less/files/less-608-CVE-2022-46663.patch
new file mode 100644
index 000000000000..a358dd6f1a77
--- /dev/null
+++ b/sys-apps/less/files/less-608-CVE-2022-46663.patch
@@ -0,0 +1,22 @@
+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/less-608-r2.ebuild b/sys-apps/less/less-608-r2.ebuild
new file mode 100644
index 000000000000..29f94fcfdae4
--- /dev/null
+++ b/sys-apps/less/less-608-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+inherit autotools
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+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="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre2 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	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.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
+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
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/less/less-623_beta.ebuild b/sys-apps/less/less-623_beta.ebuild
new file mode 100644
index 000000000000..84957e8eccd9
--- /dev/null
+++ b/sys-apps/less/less-623_beta.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gwsw/less"
+	inherit git-r3
+fi
+
+inherit autotools
+
+# Releases are usually first a beta then promoted to stable if no
+# issues were found. Upstream explicitly ask "to not generally distribute"
+# the beta versions. It's okay to keyword beta versions if they fix
+# a serious bug, but otherwise try to avoid it.
+
+MY_PV=${PV/_beta/-beta}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P/?beta}
+
+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="pcre"
+# As of 623_beta, lesstest is not included in dist tarballs
+RESTRICT="test"
+
+DEPEND="
+	>=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:=
+	pcre? ( dev-libs/libpcre2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# Per upstream README to prepare live build
+	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
+	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index afce93c3d215..84957e8eccd9 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -29,10 +29,14 @@ 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="pcre"
+# As of 623_beta, lesstest is not included in dist tarballs
+RESTRICT="test"
 
-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}"
 
 src_prepare() {
@@ -52,6 +56,10 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	emake check VERBOSE=1
+}
+
 src_install() {
 	default