4 files changed, 32 insertions, 23 deletions
diff --git a/misc/keychain/README b/misc/keychain/README
index 2deea65914..8227d425fd 100644
--- a/misc/keychain/README
+++ b/misc/keychain/README
@@ -1,9 +1,18 @@
-Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents.
-It acts as a front-end to the agents, allowing you to easily have one
-long running agent process per system, rather than per login session.
-This reduces the number of times you need to enter your passphrase
-from once per new login session to once every time your local machine
-is rebooted.
+Keychain helps you to manage SSH and GPG keys in a convenient and
+secure manner. It acts as a frontend to ssh-agent and ssh-add, but
+allows you to easily have one long running ssh-agent process per
+running ssh-agent process per system, rather than the norm of one
+ssh-agent per login session.
 
-This allows 'cron' jobs to use 'ssh' scripts in a friendly yet secure
-manner.
+This dramatically reduces the number of times you need to enter your
+passphrase. With keychain, you only need to enter a passphrase once
+every time your local machine is rebooted. Keychain also makes it
+easy for remote cron jobs to securely "hook in" to a long running
+ssh-agent process, allowing your scripts to take advantage of
+key-based logins.
+
+Keychain also integrates with gpg-agent, so that GPG keys can be
+cached at the same time as SSH keys.
+
+Additional documentation for Keychain can be found on the Keychain wiki
+page.
diff --git a/misc/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index a4227467e1..f61887f1ac 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -3,6 +3,7 @@
 
 # Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
 # Copyright 2014-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2025 Matt Egger, Phladelphia, PA, USA <matt.egger@gmail.com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -23,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=keychain
-VERSION=${VERSION:-2.8.5}
+VERSION=${VERSION:-2.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -63,8 +64,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Delete path that doesn't exist.
-sed -i 's|:/usr/ucb||' $PRGNAM
+make
 
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
 install -m 755 $PRGNAM $PKG/usr/bin
@@ -73,7 +73,7 @@ install -m 644 keychain.1 $PKG/usr/man/man1/keychain.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.txt ChangeLog README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.txt ChangeLog.md MAINTAINERS.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index f2ad3b6283..9619640dd4 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -1,8 +1,8 @@
 PRGNAM="keychain"
-VERSION="2.8.5"
-HOMEPAGE="https://www.funtoo.org/Keychain"
-DOWNLOAD="https://github.com/funtoo/keychain/archive/2.8.5/keychain-2.8.5.tar.gz"
-MD5SUM="b08ead19dc71c91e0ded2976e707b340"
+VERSION="2.9.6"
+HOMEPAGE="https://github.com/danielrobbins/keychain"
+DOWNLOAD="https://github.com/funtoo/keychain/archive/2.9.6/keychain-2.9.6.tar.gz"
+MD5SUM="c864b9e04b00aa7935090a1470b56e8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/keychain/slack-desc b/misc/keychain/slack-desc
index ea7d04f4d3..799d5b5ad9 100644
--- a/misc/keychain/slack-desc
+++ b/misc/keychain/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-keychain: keychain (front-end to SSH and GnuPG agents)
+keychain: keychain (A manager for ssh-agent and gpg-agent)
 keychain:
-keychain: It acts as a front-end to SSH and GnuPG agents, allowing
-keychain: to have one long-running agent process per system, rather
-keychain: than per login session.
+keychain: Keychain helps you to manage SSH and GPG keys in a convenient and
+keychain: secure manner. It acts as a frontend to ssh-agent and ssh-add, but
+keychain: allows you to easily have one long running ssh-agent process per
+keychain: running ssh-agent process per system, rather than the norm of one
+keychain: ssh-agent per login session.
 keychain:
-keychain: This allows 'cron' jobs to use 'ssh' scripts in a friendly
-keychain: (yet secure) manner.
+keychain: https://github.com/danielrobbins/keychain
 keychain:
-keychain: Keychain was created and is currently maintained by Daniel Robbins
 keychain: