gentoo auto-resync : 25:03:2023 - 06:49:35

8 files changed, 141 insertions, 128 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 99b2f060ffb6..e8c98b51ce1c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 76dc8b7c3dff..1730eba3d2d5 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-x32-620.tar.gz 627693 BLAKE2B 2d5e3f8aa8971dccc35511d6b5523a8bd55c6382d59e14a4079fd8cc40d9af2b80ec26129a81ea89c36f9145f3753b5c0468938224708e99ea5ffbcc7d4cc9a8 SHA512 e84571752e92f940249e6db95fcfc9f686351546935d07388b85c74da8df862ecf4d935c68eee0f99c62430c37d855f63708ab874ab87ed7e68a77e81e14b30e
 DIST rarlinux-x32-621.tar.gz 627883 BLAKE2B 07957401eea5efad7295a4da31f56bdb5ea64935b193f594f8cd5755aca9b4ffded9a2df834216c604a65b1fb7c0ab99c59591afb7f54dc65c6d74ff0b37cc0a SHA512 3e83806ccc40edfdc0740ca416cac2480e475fad72be4e245d500272f817c35f4c1ed05f7a40918f463b182d52454a3c02bf469298d56b973977fbda2d261b60
-DIST rarlinux-x64-620.tar.gz 614188 BLAKE2B fa25e528afc51cbc7a6648d557e845af5818902a32f93859c16c65f180f3ec2e88f45854519f3847f22e4049b676cfd75871a075cb2c107e180563d76f7fd45e SHA512 f9cd780c77241bbe75711d82b7180178c2f647a062b31401e65dd5be7a98ab4ed48577b9b471e8636cb32c62b3c4cfab798e9687ba191819e1b674747ce59574
 DIST rarlinux-x64-621.tar.gz 614402 BLAKE2B 8ab72e52aee82942a5917f6742fdb135e6be9187609e3a857103b8758385f85cde1e95bc2c13e87e20d6b39b1e5bb77da7f917b2ff8a01e6baece9b462dd9135 SHA512 3f990213b2366e1c829ec24f9cdb957a29de45f2d12b9a35de54709443f977aab495d5bfd13ab2b46d77b83283635c827b614a7c33585925ca4fd4d9405e1c90
-DIST winrar-x64-620.exe 3582512 BLAKE2B bf9d835f1bcc0f368db0fb6b296d796a8ef49a86b4ffa879006c8790f6993aecbbba65c848a9c6dc959c722c9088ce497fc893faab94a1bc3cd43b68ef2dc213 SHA512 e53cbb99339784cda4e3ef1dd27128216264e90ffce4a5c96ad0b4c2065bcf3c5f55e2de502d91113bc20d1e96cd7a1bbf9386316fe0d0ca76a1596f86c9914a
 DIST winrar-x64-621.exe 3585248 BLAKE2B b65643c87d422db0094ac54f855c34345f4d07780e5b91a0ee203e87ffd3e10091ef2338a269a3f01c40cc4324b4b3f2254614e42535681d896b627db918b8e8 SHA512 42f4bcbff08f08dd45097b9ac07444bb3e157d6e9055c307de3f1cf86b62900e9cdf5931cee305e0bb0991a6f5ef060196cc42a29b8fc7d233032036a42b1494
-EBUILD rar-6.20.ebuild 2313 BLAKE2B 5fc6b263ca35415dc2e2b2bb969f1bbc48eea9d97e2cf78c09d202eded537b9e322891868187c8b7c5cb5c542f5eda7e744129ab242e4ff4fef68cbd9d96420c SHA512 eaa6ee4d1fd895994c5560544a15f416dde5fe4cc3a11a4da448e075eb99c199af43ba13b4981ba1d5015ca9447575797b679f7c10bd33b585923d1a5e255c95
-EBUILD rar-6.21.ebuild 2291 BLAKE2B 6894ac9518b0fd85197a2bab67a054b3a839216ab37d6b6bcbae43f3d7258378b16c00d33b9d6dc607df9a098a140c344c1ca0ea68265a82fe5927140bff46a8 SHA512 2062f218641661d914cd796fa53226e589c1f8e5bee1c139bea71f65b0d1984680f71202a021a61caaa4c03e6ff4f5bc1657e683d12d41b9190e20c8819d44a4
+EBUILD rar-6.21.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
 MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
diff --git a/app-arch/rar/rar-6.20.ebuild b/app-arch/rar/rar-6.20.ebuild
deleted file mode 100644
index 607885de93bd..000000000000
--- a/app-arch/rar/rar-6.20.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-MY_PV_WIN64="620"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV_WIN64}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_X86}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-	x86? ( ${URI_X86} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack_rar ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
diff --git a/app-arch/rar/rar-6.21.ebuild b/app-arch/rar/rar-6.21.ebuild
index cb2c7ce9afaa..cb4faa7c2b6d 100644
--- a/app-arch/rar/rar-6.21.ebuild
+++ b/app-arch/rar/rar-6.21.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all-sfx"
 RESTRICT="bindist mirror"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index b8e8410b4436..60a47e680095 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,5 +1,7 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
+AUX tar-1.34-fix-cve-2022-48303.patch 1123 BLAKE2B fd1fd30443372eb29ba6168ec421be849682587c40ecefe5a96050566ec198e680dd9e9baeacecb9ed01376672d826a65573f10e7dd443b7a79dcd66caf33060 SHA512 c9e21ac3bcb592262da9db07d0772d0c14b6e1d0c59542ef984b37e36987d6292343f228622433aed1bd776ca1f5fd049fe00661ec8661c608aad21637f13477
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
-EBUILD tar-1.34-r2.ebuild 2350 BLAKE2B 47563f0ed793806f802dd0f10f49b2de323bdb8f99387ba8ab341e1e7074cd67d59b24a1d5c7aab10e2d3f45f6ef054670c00ef06da5f53fe879b64beb89c816 SHA512 884b7924fd749bb2f7d500b4697f1a7acf9b81a28e86d3a878d78711898cd816939f7943b5851bfb6ef7c9aaf26d66709914b2f5098691038740f1fefe97a19c
+EBUILD tar-1.34-r2.ebuild 2509 BLAKE2B e4867e9669e4528e654c484d36a26eb16114e61725f1d6730bc0f61beb19c453821a319657337bdcef816216a785f27594e7ad6bcf313266339563981b1d969e SHA512 fef232a1bb0331994b3e46152111143759a4a5f263db30dae0e51272863c5a92b6f1d0da8a61f66c0c09211ebfbc2b91347feb9aea161d19fdcb22971c8e479b
+EBUILD tar-1.34-r3.ebuild 2575 BLAKE2B 3aa6dce66fb212c2c993f4fee3ee2d71f2c3e2799eeba004eb24d1328a711bb6819ea7d9f63193e5de001def2054bcf76747cf8fea8d3abec74e8bffb9dfe9b6 SHA512 6101788d14d1c981d0c9f45ac9436c2a78f9dfbcb861284c36e27e41370370d51e942d824491682b6164120eaf4ae6e253bfcbb9cd31f2b139588169903ded19
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch
new file mode 100644
index 000000000000..7ef604b52378
--- /dev/null
+++ b/app-arch/tar/files/tar-1.34-fix-cve-2022-48303.patch
@@ -0,0 +1,32 @@
+Gentoo Bug: https://bugs.gentoo.org/898176
+Upstream Commit Link: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8
+
+From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Sat, 11 Feb 2023 11:57:39 +0200
+Subject: [PATCH] Fix boundary checking in base-256 decoder
+
+* src/list.c (from_header): Base-256 encoding is at least 2 bytes
+long.
+---
+ src/list.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/list.c b/src/list.c
+index 9fafc425..86bcfdd1 100644
+--- a/src/list.c
++++ b/src/list.c
+@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type,
+ 	  where++;
+ 	}
+     }
+-  else if (*where == '\200' /* positive base-256 */
+-	   || *where == '\377' /* negative base-256 */)
++  else if (where <= lim - 2
++	   && (*where == '\200' /* positive base-256 */
++	       || *where == '\377' /* negative base-256 */))
+     {
+       /* Parse base-256 output.  A nonnegative number N is
+ 	 represented as (256**DIGS)/2 + N; a negative number -N is
+--
+2.39.2.637.g21b0678d19-goog
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild
index e6c0b272787b..86fdc8e05e20 100644
--- a/app-arch/tar/tar-1.34-r2.ebuild
+++ b/app-arch/tar/tar-1.34-r2.ebuild
@@ -38,8 +38,13 @@ PDEPEND="
 "
 
 src_configure() {
+	# -fanalyzer doesn't make sense for us in ebuilds, as it's for static analysis
+	export gl_cv_warn_c__fanalyzer=no
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
+		# Avoid -Werror
+		--disable-gcc-warnings
 		--enable-backup-scripts
 		--libexecdir="${EPREFIX}"/usr/sbin
 		$(use_with acl posix-acls)
diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild
new file mode 100644
index 000000000000..f92891dceff1
--- /dev/null
+++ b/app-arch/tar/tar-1.34-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
+inherit verify-sig
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/tar/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
+	)"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl minimal nls selinux xattr"
+
+RDEPEND="
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-tar )
+"
+PDEPEND="
+	app-alternatives/tar
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-cve-2022-48303.patch
+)
+
+src_configure() {
+	# -fanalyzer doesn't make sense for us in ebuilds, as it's for static analysis
+	export gl_cv_warn_c__fanalyzer=no
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		# Avoid -Werror
+		--disable-gcc-warnings
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+
+		# autoconf looks for gtar before tar (in configure scripts), hence
+		# in Prefix it is important that it is there, otherwise, a gtar from
+		# the host system (FreeBSD, Solaris, Darwin) will be found instead
+		# of the Prefix provided (GNU) tar
+		--program-prefix=g
+	)
+
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# a nasty yet required piece of baggage
+	exeinto /etc
+	doexe "${FILESDIR}"/rmt
+
+	mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
+	mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
+	mv "${ED}"/usr/sbin/{g,}backup.sh || die
+	mv "${ED}"/usr/sbin/{g,}dump-remind || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' -name gtar \
+			-delete || die
+	fi
+
+	if ! use minimal; then
+		dosym grmt /usr/sbin/rmt
+	fi
+	dosym grmt.8 /usr/share/man/man8/rmt.8
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlink before app-alternatives/tar
+	# is installed
+	if [[ ! -h ${EROOT}/bin/tar ]]; then
+		ln -s gtar "${EROOT}/bin/tar" || die
+	fi
+}