From 81a92c310907a51d2a03b6d470f4276a7d7ac00c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Apr 2023 00:13:39 +0100 Subject: gentoo auto-resync : 26:04:2023 - 00:13:39 --- net-misc/keychain/Manifest | 4 + .../files/keychain-2.8.5-empty-ssh-askpass.patch | 21 ++++++ .../files/keychain-2.8.5-malformed-ssh-key.patch | 28 +++++++ net-misc/keychain/files/keychain-2.8.5-typos.patch | 88 ++++++++++++++++++++++ net-misc/keychain/keychain-2.8.5-r2.ebuild | 27 +++++++ 5 files changed, 168 insertions(+) create mode 100644 net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch create mode 100644 net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch create mode 100644 net-misc/keychain/files/keychain-2.8.5-typos.patch create mode 100644 net-misc/keychain/keychain-2.8.5-r2.ebuild (limited to 'net-misc/keychain') 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 +Author: Tim Connors +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 +Author: Peter Pentchev +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 +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 (

) { \ + $$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; \ + $$_ = ; \ + 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 +} -- cgit v1.2.3