gentoo auto-resync : 26:04:2023 - 00:13:39

10 files changed, 172 insertions, 4 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 22b06a3ec798..77836f6343b4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index dae59db2dc16..d309c9f55758 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,7 @@
+AUX keychain-2.8.5-empty-ssh-askpass.patch 737 BLAKE2B 6c48dcfac4494e237a9fd82d6fab6c5d185bc9cdc8b326b37ba67c12113403a47dd4d7c306a48694a6772844e7adc8fecaf3ae6b0a4187e8c3e2cea15994c94a SHA512 ddf7a9b976a51504421b523ff043507e54e0cc66aa457e4d79477fc3a85ef292e68a6d342bce2ca58720e72f9b7792419546ee373642970986b55d61e177ee9f
+AUX keychain-2.8.5-malformed-ssh-key.patch 993 BLAKE2B fd959123205865d4c467dd680583ee5f877b67d4f058e49d635701c1d8df01f0a916bf1d4aa6264d4d29e207b30e51c4cd66d766c0a5b2a4b165796ef3acc6bb SHA512 7fb740bf030bb8f0208a3e58b949e5b7c4e76337a4d43be3850dfec3dc24d4f128618bef35e66f4dc78bba78439612f7f32b3bb71f36357be085f9c1ee0ec47d
+AUX keychain-2.8.5-typos.patch 3639 BLAKE2B 98d4ad974d29808fab53ac155b98b9a70fd15434d33d55d52c453f1d26bd2f227d685829eb8610a65dacff05b08d760626db6f2de6ce5a928114cb9bddba0a95 SHA512 36dfb7b8c99cd41229280a3c77fabc226eae9b29f2e843b6f28a99361d3c384cc9f47aeeecb0cec417a8222365f56b2b39fee6122b7602f76bfba077c020d783
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5-r1.ebuild 619 BLAKE2B 887865a51c09dbe1a9d2dd36333628f850544b97bb8f5da6649f5b75896479882b7948b98aec22c14aa9e1bad045f40a32eadd9f8189172fce36495d1664ddde SHA512 b82a81ebae3366e0b2f4e6f8688bc6e0a55f40ad860c8eeefcea538b9e3a5a9c897134c1929e2d6cc260869f0213a1013a615e91c30e2efbea73bdfef442841e
+EBUILD keychain-2.8.5-r2.ebuild 782 BLAKE2B c94d22aa786f019955c9e7313d9cdb7358e830f5f64e24b4e71c7a4750ff7ec465287b99dd42be330e578e52191fee70a2f75f655ad10d4e7c1b073b50a201dd SHA512 93522bb29c81254d99e0acbb437d33762573f2a07294d3d1c2b9bb5ffeef28d18769c87e41c725bc9fd8cbd90a5efc41f49edc95904b7660da3c78cae9cb085d
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch b/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch
new file mode 100644
index 000000000000..00c93c8c07d9
--- /dev/null
+++ b/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch
@@ -0,0 +1,21 @@
+https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/empty-ssh-askpass.patch
+
+Description: Handle an empty (or unset) SSH_ASKPASS variable
+Bug-Debian: https://bugs.debian.org/325644
+Forwarded: no
+Author: Peter Pentchev <roam@debian.org>
+Author: Tim Connors <twc@aaocbn.aao.gov.au>
+Last-Updated: 2023-01-06
+
+--- a/keychain.sh
++++ b/keychain.sh
+@@ -1420,6 +1420,9 @@
+ 			IFS="$old_IFS"	# restore IFS
+ 			set +f			# re-enable globbing
+ 
++			if [ -z "$SSH_ASKPASS" ]; then
++				SSH_ASKPASS="$(command -v ssh-askpass || true)"
++			fi
+ 			if $noguiopt || [ -z "$SSH_ASKPASS" -o -z "$DISPLAY" ]; then
+ 				unset DISPLAY		# DISPLAY="" can cause problems
+ 				unset SSH_ASKPASS	# make sure ssh-add doesn't try SSH_ASKPASS
diff --git a/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch b/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch
new file mode 100644
index 000000000000..ef1ab63898d1
--- /dev/null
+++ b/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch
@@ -0,0 +1,28 @@
+https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/malformed-ssh-key.patch
+
+Description: Display a more visible warning for a malformed SSH public key.
+Bug-Debian: https://bugs.debian.org/673019
+Forwarded: https://github.com/funtoo/keychain/pull/111
+Author: Ryan Kavanagh <rak@debian.org>
+Author: Peter Pentchev <roam@debian.org>
+Last-Update: 2019-02-18
+
+--- a/keychain.sh
++++ b/keychain.sh
+@@ -853,7 +853,15 @@
+ 
+ 	for slm_k in "$@"; do
+ 		# Fingerprint current user-specified key
+-		slm_finger=$(ssh_f "$slm_k") || continue
++		if ! slm_finger=$(ssh_f "$slm_k"); then
++			warn "Unable to extract fingerprint from keyfile ${slm_k}.pub, skipping"
++			continue
++		fi
++		slm_wordcount="$(printf -- '%s\n' "$slm_finger" | wc -w)"
++		if [ "$slm_wordcount" -ne 1 ]; then
++			warn "Unable to extract exactly one key fingerprint from keyfile ${slm_k}.pub, got $slm_wordcount instead, skipping"
++			continue
++		fi
+ 
+ 		# Check if it needs to be added
+ 		case " $sshavail " in
diff --git a/net-misc/keychain/files/keychain-2.8.5-typos.patch b/net-misc/keychain/files/keychain-2.8.5-typos.patch
new file mode 100644
index 000000000000..6356ae44df9a
--- /dev/null
+++ b/net-misc/keychain/files/keychain-2.8.5-typos.patch
@@ -0,0 +1,88 @@
+https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/typos.patch
+
+Description: Correct some typographical and grammatical errors.
+Forwarded: https://github.com/funtoo/keychain/pull/112
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2020-05-07
+
+--- a/keychain.pod
++++ b/keychain.pod
+@@ -43,7 +43,7 @@
+ 
+ As an additional feature, if a private key has an extension ".ext", keychain
+ will look for privkey.ext.pub first, and if not found, will look for
+-privkeyname.pub.
++privkey.pub.
+ 
+ Keychain also supports gpg-agent in the same ways that ssh-agent is
+ supported.  By default keychain attempts to start ssh-agent only. 
+@@ -227,7 +227,7 @@
+ 
+ =item others
+ 
+-Kill agent processes other than the one keychain is providing.  Prior
++Kill agent processes other than the ones keychain is providing.  Prior
+ to keychain-2.5.0, keychain would do this automatically.  The new
+ behavior requires that you specify it explicitly if you want it.
+ 
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
+ keychain.1.gz: keychain.1
+ 	gzip -9 keychain.1
+ 
+-GENKEYCHAINPL = open P, "keychain.txt" or die "cant open keychain.txt"; \
++GENKEYCHAINPL = open P, "keychain.txt" or die "cannot open keychain.txt"; \
+ 			while (<P>) { \
+ 				$$printing = 0 if /^\w/; \
+ 				$$printing = 1 if /^(SYNOPSIS|OPTIONS)/; \
+@@ -39,7 +39,7 @@
+ 				s/(^|\s)(-+[-\w]+)/$$1\$${GREEN}$$2\$${OFF}/g; \
+ 				$$pod .= $$_; \
+ 			}; \
+-		open B, "keychain.sh" or die "cant open keychain.sh"; \
++		open B, "keychain.sh" or die "cannot open keychain.sh"; \
+ 			$$/ = undef; \
+ 			$$_ = <B>; \
+ 			s/INSERT_POD_OUTPUT_HERE[\r\n]/$$pod/ || die; \
+--- a/README.md
++++ b/README.md
+@@ -3,12 +3,12 @@
+ 
+ Please apply your patches to `keychain.sh`, *not* the generated `keychain`
+ script, which we are now including in the git repo to facilitate the
+-distribution of release archives direct from GitHub. All development work will 
+-be done on the 'devel' branch and will only be merged with the master branch when 
++distribution of release archives directly from GitHub. All development work will 
++be done on the 'devel' branch and will only be merged into the master branch when 
+ a new release is made. This should allow the generated files (keychain, man pages,
+-spec file)to remain in sync on the master branch but no guarantees are made except
++spec file) to remain in sync on the master branch but no guarantees are made except
+ for the tagged release. They will be regenerated for official release archives 
+-only (those tagged with the release version.). Anyone using or contributing to the
++only (those tagged with the release version). Anyone using or contributing to the
+ 'devel' branch should assume the generated files are out of date and regenerate 
+ locally if needed.
+ Thanks!
+--- a/keychain
++++ b/keychain
+@@ -354,7 +354,7 @@
+ 	# This function originates from Parallels Inc.'s OpenVZ vpsreboot script
+ 
+ 	# Description: This function attempts to acquire the lock. If it succeeds,
+-	# it returns 0. If it fails, it returns 1. This function retuns immediately
++	# it returns 0. If it fails, it returns 1. This function returns immediately
+ 	# and only tries to acquire the lock once.
+ 
+ 		tmpfile="$lockf.$$"
+--- a/keychain.sh
++++ b/keychain.sh
+@@ -173,7 +173,7 @@
+ 	# This function originates from Parallels Inc.'s OpenVZ vpsreboot script
+ 
+ 	# Description: This function attempts to acquire the lock. If it succeeds,
+-	# it returns 0. If it fails, it returns 1. This function retuns immediately
++	# it returns 0. If it fails, it returns 1. This function returns immediately
+ 	# and only tries to acquire the lock once.
+ 
+ 		tmpfile="$lockf.$$"
diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild
new file mode 100644
index 000000000000..6bb4d3533258
--- /dev/null
+++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG"
+HOMEPAGE="https://www.funtoo.org/Keychain"
+SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	# Patches from Debian
+	"${FILESDIR}/${P}-malformed-ssh-key.patch"
+	"${FILESDIR}/${P}-typos.patch"
+	"${FILESDIR}/${P}-empty-ssh-askpass.patch"
+)
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.md
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 6b0d47967a65..41e9a3f27be0 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -9,6 +9,6 @@ EBUILD streamlink-5.1.2.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe4
 EBUILD streamlink-5.2.1.ebuild 1528 BLAKE2B 25ea7531cafe46875406f97c314d785be7e2f5f13d33a4aa619116c05027536b580e915fcd3a0928188fded9985547c3e98523bae366fe3cb13d6dbda6009897 SHA512 c238d2ecf2b22739a9f557f64a78b9fa474f9164885ea4f0570c4cacd1f5c9511c59871261f93e50e727cc37c8fae3cb2a140f600046362e36d962a6b556b49d
 EBUILD streamlink-5.3.0.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
 EBUILD streamlink-5.3.1.ebuild 1528 BLAKE2B 25ea7531cafe46875406f97c314d785be7e2f5f13d33a4aa619116c05027536b580e915fcd3a0928188fded9985547c3e98523bae366fe3cb13d6dbda6009897 SHA512 c238d2ecf2b22739a9f557f64a78b9fa474f9164885ea4f0570c4cacd1f5c9511c59871261f93e50e727cc37c8fae3cb2a140f600046362e36d962a6b556b49d
-EBUILD streamlink-5.4.0.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
+EBUILD streamlink-5.4.0.ebuild 1534 BLAKE2B 0552fb885e48e9976e6cb5c4d3dc8f5069475307d1967f87dad5ad1976949fe1cca9f0e59d31be9f8d6eff245b76fece6d2c236b8e7a735c18761ee64eddb5c6 SHA512 6f599dd0cb5765d29f3b3e82ca5d469b6f08ae6d973855453eff20fdb590b3b072d0fd1dc8061456cc5359cfd64b4c56c179bc1f69fb9739cc699f78db2bbbeb
 EBUILD streamlink-9999.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
 MISC metadata.xml 374 BLAKE2B 8c5f72454d8d00a99c18328838cc9c3be82cd9d68405f6e702239b8475a9162f3ba945b142bf2f5762fcc4ac52cae95c8e2d5c0707b1028c11faba2341a2d8e9 SHA512 038e509b340b1cc31382b0a1edf0c273fe99ca7c8c40370039a01cf6a95101d1217db7fea64bc67f5c113c99d504ceb7256008c1539c4d7e13ad6ceb8b922a58
diff --git a/net-misc/streamlink/streamlink-5.4.0.ebuild b/net-misc/streamlink/streamlink-5.4.0.ebuild
index ff7c51d0ed88..d3f39ab69623 100644
--- a/net-misc/streamlink/streamlink-5.4.0.ebuild
+++ b/net-misc/streamlink/streamlink-5.4.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index e4770bda8e15..7fd6f4b94663 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -2,6 +2,6 @@ AUX trurl-0.5-fix-makefile.patch 589 BLAKE2B 2e243b7706cfa6c5d409b5e5f57e1dfe7e5
 DIST trurl-0.4.tar.gz 23602 BLAKE2B c780fc52010f868fddbe1a06feb1ed1df627eb9ff8916d0212c8196c1efeb282b06900d2259dbaa4abdbc3c68002b1f3dfeb308c4ae2202578c40c112120b77c SHA512 7d106bf7dd39fb39316a9890bc562a5824dc046acfa50b97954e87ba455b479a2b86cfbf09a130dd39000abbc2e0fdc7038109410cf44c97812489d410693a01
 DIST trurl-0.5.tar.gz 28792 BLAKE2B e552d04599628ea17e19627a1aa24871bf71fb100253f6eb945a9062ad0db98ea0a87125cc2c6a5f05f8c0296953c972b8fc9a6d5c01bdbc74d9ab9e28b9094c SHA512 1bf81030e8c904e551180b5c51f37ebe382345f397165695b47554e3c712c568351a53a7527891807f89127ea270b72632b24388db4c8efee3e9994cae1def47
 EBUILD trurl-0.4.ebuild 866 BLAKE2B 15442b900a37f2fda2c876a1bfa1c56e2575126af4a320652c11013d7ce09a4fcacd65bf5a6ab8467a02080fb00d84e8d880272c20a6c2ea0c57e6bdb1a384ad SHA512 bbcdc06d0b47a4af64d1175e0febe22ca64c89716fce0bf993de5e72b7bd39ad8631dfcc6c334f6f24493d2bd04b0fe01ac242b1af856a8792f4dbe2b7b8a986
-EBUILD trurl-0.5.ebuild 1051 BLAKE2B 4de2e0abac10b6962a06336a423a21e4c3ecdab52ea2131f6609cb075b5276aa9e5628443b8c7119feff82ff29d0a8ad4d5dab248a2f7843263dcaabb6241083 SHA512 05bd16c51b777da9fe5573bacb75a2ac84934032f65e0781e2238eebb763601c9c7e740667628a8c74bd01ae089c449636446e06aef503ac2bb6b268371fe4f3
+EBUILD trurl-0.5.ebuild 1058 BLAKE2B d0377339add2be9d1795b006a15e7683a20ad131410f417085ebd199450ab04698cfba1a7e4eafa0fb6c1d48ed1279eef6428afe0a3481c0c50fe4aa0a42984b SHA512 b1bbbe4a1b05a5cf07146288e533fbdff7de95e4e9ba732e29206be6aecd0c8fd9a7fd891f808dc5184b3b6174fb392e76f402ed76a39e4b1532ba4a2cc79813
 EBUILD trurl-9999.ebuild 1046 BLAKE2B 9cb09bf57a16182c7fdea1aad3911f3a02ff4cecb5d41845415ef931a03d091585f44c1b711e742b7b40f9cb246ba115c12cb9cefe3e049498cac365eb04e2bd SHA512 3a1e1c988de376537ea7c7997e69dd3ef181dc8f266fced0889fffe6abdabfec56029b2d80587e1ea2ef9c163ba99782ccc16f2c466f27258d446d23962b6d27
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
diff --git a/net-misc/trurl/trurl-0.5.ebuild b/net-misc/trurl/trurl-0.5.ebuild
index 283c217c2a55..6a2113d8634b 100644
--- a/net-misc/trurl/trurl-0.5.ebuild
+++ b/net-misc/trurl/trurl-0.5.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-${P}
 
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 LICENSE="curl"