gentoo resync : 12.05.2022

6 files changed, 87 insertions, 247 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index c2e6721bb574..11ac7bebd42c 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,12 +1,8 @@
+AUX CVE-2022-1437.patch 2434 BLAKE2B 8671f028406cea47719c393f6a96d3f32a569bf5dd9e97a215326c19fb273c569119a6f79d63e2a9b93ea7def7c09c0110cb28e0c2ce60a345ed297f1a7168c0 SHA512 c32141bd9a282c0b6ba38468a7a77c2df26ad1153f5ada6b6bc0cb9d647fc462a54262272a4113fb7dc1adedb88c3b97e25798553b9b3f2c99d961f8e2a6ea37
 AUX radare2-5.5.0-vector35.patch 785 BLAKE2B 7e53aa1258290682827a1ab22a1bfeec12222c7e7c7acdde40a0845f47729918c41de9c59bcc1e79cbd1d318944245994c348e6d76f56852803ffda27206216f SHA512 3d5d7c682482973a00d78736c3d92d29711e729d01a220da5b89f66f27fae2c71cf40173d9ca9616709d4a2cc55a0450ae003e3d97998e0dfff5dcb64eba7675
-DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9abbe1f9ca2c7caef98a85b38a5b5e37a31063be289c55fda041e10b8403895f863dd602091ab5307213605260d SHA512 34c96c7c863fb8a59f1d03539375d5b8f31f6021dc84ce943daa163d8a0227bf3156963cc187c366790abec4381da6aa987248e76570a498cfcdeb982cb2ffc0
-DIST radare2-5.5.4-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
-DIST radare2-5.5.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.5.4.tar.gz 9610424 BLAKE2B 4e113d854a55597270663f9c18f1d71da21fa8e539a997773f30178e93de54d397f56103813ec2c60cfabdf2d811151ad7285fc479e1ee681687831030e18da2 SHA512 b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da
+DIST radare2-5.6.8-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
+DIST radare2-5.6.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.6.8.tar.gz 9627480 BLAKE2B 4de904ee779b72f0a0e305170cdf62b3a4c3fdad768bb2c9a96a90b429c94c2bae1523439d5b869d2fefed89849fde1d996dd1de400fe47ea657bee3dd258fe1 SHA512 e29a3ff235f37bcde4ec6c1c97d1b9c521b57e93512ca40d71be9e88ac1c002f41af905865fdf4685ee94287425cff32500b5a111eec5594bdd7f32f05631910
 DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6
-EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
-EBUILD radare2-5.3.1.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
-EBUILD radare2-5.5.4.ebuild 2760 BLAKE2B 3726d1b139af09977ffeec4380c77e7d4124c0a2c999f6e5b774030d996d78136a54dd46b791591cd5b613b78f7dbdc430032c80ee7ca98ebe1fded566df4105 SHA512 b2ed6d4db225ce28b2610492563ed84dd5814c8d6de731fc27c7cccab9ec0600afe6edd7660aae14e781f3cdf4aacf582f2ce117e7acf018514a4e6af4f7e36d
-EBUILD radare2-9999.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
+EBUILD radare2-5.6.8-r1.ebuild 2952 BLAKE2B 801856cabca946d58c7861c344b8641263339e55825c75ed075d08473fe31e38726780d53cc4061e503688a81ffb31b2ca5a9b13af0f2e583b0e05bc5e09c4a5 SHA512 15fe3c80c5ce99428b66a10213e2ce5e08a33fa657a89d8c5cad85dd4fe0a556c943bdb2bd69bfb21cf8257b902f43a7b8568c645b90d0d4491ce24f370d55b4
 MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch
new file mode 100644
index 000000000000..16e67c5d3193
--- /dev/null
+++ b/dev-util/radare2/files/CVE-2022-1437.patch
@@ -0,0 +1,72 @@
+--- a/libr/bin/format/mach0/coresymbolication.c
++++ b/libr/bin/format/mach0/coresymbolication.c
+@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
+ 		for (i = 0; i < hdr->n_sections && cursor < end; i++) {
+ 			ut8 *sect_start = cursor;
+ 			RCoreSymCacheElementSection *sect = &result->sections[i];
++			if (cursor + (word_size * 4) > end) {
++				goto beach;
++			}
+ 			sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits);
+ 			if (sect->vaddr < page_zero_size) {
+ 				sect->vaddr += page_zero_size;
+@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
+ 				continue;
+ 			}
+ 			string_origin = relative_to_strings? b + start_of_strings : cursor;
++			if (!string_origin) {
++				cursor += R_CS_EL_SIZE_LSYM;
++				continue;
++			}
+ 			lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end);
+ 			if (!lsym->flc.file) {
+ 				cursor += R_CS_EL_SIZE_LSYM;
+--- a/libr/bin/p/bin_symbols.c
++++ b/libr/bin/p/bin_symbols.c
+@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) {
+ }
+ 
+ static RList *symbols(RBinFile *bf) {
+-	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
+-	r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res);
++	r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL);
+ 	RCoreSymCacheElement *element = bf->o->bin_obj;
+ 	size_t i;
+ 	HtUU *hash = ht_uu_new0 ();
+ 	if (!hash) {
+-		return res;
++		return NULL;
+ 	}
++	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
+ 	bool found = false;
+-	for (i = 0; i < element->hdr->n_lined_symbols; i++) {
+-		RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
+-		if (!sym) {
+-			break;
+-		}
+-		ht_uu_find (hash, sym->paddr, &found);
+-		if (found) {
+-			continue;
+-		}
+-		RBinSymbol *s = bin_symbol_from_symbol (element, sym);
+-		if (s) {
+-			r_list_append (res, s);
+-			ht_uu_insert (hash, sym->paddr, 1);
++	if (element->lined_symbols) {
++		for (i = 0; i < element->hdr->n_lined_symbols; i++) {
++			RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
++			if (!sym) {
++				break;
++			}
++			ht_uu_find (hash, sym->paddr, &found);
++			if (found) {
++				continue;
++			}
++			RBinSymbol *s = bin_symbol_from_symbol (element, sym);
++			if (s) {
++				r_list_append (res, s);
++				ht_uu_insert (hash, sym->paddr, 1);
++			}
+ 		}
+ 	}
+ 	if (element->symbols) {
diff --git a/dev-util/radare2/radare2-4.5.1-r1.ebuild b/dev-util/radare2/radare2-4.5.1-r1.ebuild
deleted file mode 100644
index a5b8b7c3cfd6..000000000000
--- a/dev-util/radare2/radare2-4.5.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
-	dev-libs/libzip
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-	default
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}
diff --git a/dev-util/radare2/radare2-5.3.1.ebuild b/dev-util/radare2/radare2-5.3.1.ebuild
deleted file mode 100644
index 470b4d0d33f8..000000000000
--- a/dev-util/radare2/radare2-5.3.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
-	dev-libs/libzip
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-	default
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}
diff --git a/dev-util/radare2/radare2-5.5.4.ebuild b/dev-util/radare2/radare2-5.6.8-r1.ebuild
index 3a2f15599169..ca2dc386f02c 100644
--- a/dev-util/radare2/radare2-5.5.4.ebuild
+++ b/dev-util/radare2/radare2-5.6.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
+HOMEPAGE="https://www.radare.org"
 
 ARM64_COMMIT=3c5eaba46dab72ecb7d5f5b865a13fdeee95b464
 ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
@@ -16,9 +16,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/radareorg/radare2"
 else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
 		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
 	"
 
@@ -30,14 +30,14 @@ SLOT="0"
 IUSE="ssl test"
 
 # Need to audit licenses of the binaries used for testing
-RESTRICT="test"
+RESTRICT="fetch test"
 
 RDEPEND="
 	dev-libs/libzip:=
 	dev-libs/xxhash
 	sys-apps/file
 	sys-libs/zlib
-	dev-libs/capstone:0=
+	<dev-libs/capstone-5:0=
 	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
@@ -46,7 +46,7 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-5.5.0-vector35.patch" )
+PATCHES=( "${FILESDIR}/CVE-2022-1437.patch" "${FILESDIR}/${PN}-5.5.0-vector35.patch" )
 
 src_prepare() {
 	default
@@ -99,6 +99,9 @@ src_install() {
 	# These are not really docs. radare assumes
 	# uncompressed files: bug #761250
 	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+
+	# Create plugins directory although it's currently unsupported by radare2
+	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
 }
 
 src_test() {
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
deleted file mode 100644
index 470b4d0d33f8..000000000000
--- a/dev-util/radare2/radare2-9999.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND="
-	dev-libs/libzip
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-	default
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-}