From b5e756be8e70d52cd1cb178b3930d3ccbe3bfc2b Mon Sep 17 00:00:00 2001 From: adalloz Date: Fri, 5 Aug 2005 02:55:43 +0000 Subject: [PATCH 01/63] auto-import keychain-2.5.5-1 on branch devel from keychain-2.5.5-1.src.rpm --- .cvsignore | 1 + README.Fedora | 44 +++++++++++++++++++++++ keychain-manpage.patch | 79 ++++++++++++++++++++++++++++++++++++++++++ keychain.csh | 30 ++++++++++++++++ keychain.sh | 22 ++++++++++++ keychain.spec | 63 +++++++++++++++++++++++++++++++++ sources | 1 + 7 files changed, 240 insertions(+) create mode 100644 README.Fedora create mode 100644 keychain-manpage.patch create mode 100755 keychain.csh create mode 100755 keychain.sh create mode 100644 keychain.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f1d22b8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +keychain-2.5.5.tar.bz2 diff --git a/README.Fedora b/README.Fedora new file mode 100644 index 0000000..748349d --- /dev/null +++ b/README.Fedora @@ -0,0 +1,44 @@ +README.Fedora - keychain opt-in + +keychain is a manager for both ssh-agent and gpg-agent. It allows your shells +and cron jobs to share a single ssh-agent or gpg-agent process. keychain +typically runs from the login shell environment setting, i.e. ~/.bash_profile +when using bash or ~/.login when running a tcsh shell. It's general usage and +different options are documented in keychain(1). + +Installed from Fedora Extras keychain can be easily activated by simply +touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or +tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to +their ~/.zlogin file. +This will let the user's shell invoke a default setup of keychain where it +loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are +not loaded by default as the necessary gpg-agent is not part of the Fedora +Core gnupg package, but provided by the additional gnupg2 package of Fedora +Extras. The default setup starts keychain in quiet mode, so only messages are +printed out in case of warnings, errors or if interactivity is required. + +To override the default settings with which keychain is activated when +the shell environment finds a ~/.keychainrc, the user can customize following +variables by setting them inside the ~/.keychainrc. + +KCHOPTS="" + This variable takes options for keychain like "--nocolor" or "--noask". + Please see the keychain manpage for a full list. +SSHKEYS="" + Instead of loading all keys the user can list those keys to be loaded by + their file names. The key list has to be space separated. +GPGKEYS="" + gpg keys to be loaded by keychain have to be specified by their key ID. + The user can get a full list of keys and IDs in his secret keyring by + running `gpg --list-secret-keys'. GPGKEYS defines a single key ID or a + space separated list of key IDs. + +Please be aware that you still need to source the keychain file with the +ssh-agent environment variables along with the crontab entry when you want +to make use of ssh public key auth or of gpg signing through cron jobs, +because cron uses a non-interactive shell and has a limited environment set. + +Note: This opt-in is not part of keychain, which is originally written by +Daniel Robbins , but added to the Fedora Extras package +of keychain to allow Fedora users an overall ease of use. + diff --git a/keychain-manpage.patch b/keychain-manpage.patch new file mode 100644 index 0000000..f5c7be5 --- /dev/null +++ b/keychain-manpage.patch @@ -0,0 +1,79 @@ +diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1 +--- keychain-2.5.0.orig/keychain.1 2005-01-08 04:02:36.000000000 +0200 ++++ keychain-2.5.0/keychain.1 2005-01-08 13:49:25.542402807 +0200 +@@ -291,9 +291,11 @@ + .SH "EXAMPLES" + .IX Header "EXAMPLES" + This snippet would work in .bash_profile (for bash) or .zlogin (for +-zsh) to load two ssh keys and one gpg key: ++zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID ++0123ABCD): + .PP + .Vb 5 ++\& which keychain &>/dev/null && \e + \& keychain id_rsa id_dsa 0123ABCD + \& [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e + \& source $HOME/.keychain/$HOSTNAME-sh +@@ -305,6 +307,7 @@ + \&.profile: + .PP + .Vb 6 ++\& which keychain >/dev/null 2>/dev/null && \e + \& keychain id_rsa id_dsa 0123ABCD + \& host=`uname -n` + \& [ -f $HOME/.keychain/$host-sh ] && \e +@@ -316,6 +319,7 @@ + This snippet would work in .login for tcsh: + .PP + .Vb 7 ++\& which keychain >& /dev/null && \e + \& keychain id_rsa id_dsa 0123ABCD + \& if (-f $HOME/.keychain/$HOST-csh) then + \& source $HOME/.keychain/$HOST-csh +@@ -328,6 +332,7 @@ + This snippet would work in .login for csh: + .PP + .Vb 8 ++\& which keychain >& /dev/null && \e + \& keychain id_rsa id_dsa 0123ABCD + \& host=`uname -n` + \& if (-f $HOME/.keychain/$host-csh) then +diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod +--- keychain-2.5.0.orig/keychain.pod 2005-01-08 04:02:36.000000000 +0200 ++++ keychain-2.5.0/keychain.pod 2005-01-08 13:49:44.002694389 +0200 +@@ -193,8 +193,10 @@ + =head1 EXAMPLES + + This snippet would work in .bash_profile (for bash) or .zlogin (for +-zsh) to load two ssh keys and one gpg key: ++zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID ++0123ABCD): + ++ which keychain &>/dev/null && \ + keychain id_rsa id_dsa 0123ABCD + [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \ + source $HOME/.keychain/$HOSTNAME-sh +@@ -204,6 +206,7 @@ + For other Bourne-compatible shells such as sh, you can use this in + .profile: + ++ which keychain >/dev/null 2>/dev/null && \ + keychain id_rsa id_dsa 0123ABCD + host=`uname -n` + [ -f $HOME/.keychain/$host-sh ] && \ +@@ -213,6 +216,7 @@ + + This snippet would work in .login for tcsh: + ++ which keychain >& /dev/null && \ + keychain id_rsa id_dsa 0123ABCD + if (-f $HOME/.keychain/$HOST-csh) then + source $HOME/.keychain/$HOST-csh +@@ -223,6 +227,7 @@ + + This snippet would work in .login for csh: + ++ which keychain >& /dev/null && \ + keychain id_rsa id_dsa 0123ABCD + host=`uname -n` + if (-f $HOME/.keychain/$host-csh) then diff --git a/keychain.csh b/keychain.csh new file mode 100755 index 0000000..302f566 --- /dev/null +++ b/keychain.csh @@ -0,0 +1,30 @@ +# /etc/profile.d/keychain.csh - calling keychain the Fedora way +# read in user's keychain settings or use defaults running keychain + +if (-f $HOME/.keychainrc) then + + eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ + sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` + + if (! $?KCHOPTS) then + set KCHOPTS = "--quiet" + endif + if (! $?SSHKEYS) then + set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` + endif + if (! $?GPGKEYS ) then + set GPGKEYS = "" + endif + + keychain $KCHOPTS $SSHKEYS $GPGKEYS + + set HOST = `uname -n` + if (-f $HOME/.keychain/$HOST-csh) then + source $HOME/.keychain/$HOST-csh + endif + if (-f $HOME/.keychain/$HOST-csh-gpg) then + source $HOME/.keychain/$HOST-csh-gpg + endif + +endif + diff --git a/keychain.sh b/keychain.sh new file mode 100755 index 0000000..4ab4027 --- /dev/null +++ b/keychain.sh @@ -0,0 +1,22 @@ +# /etc/profile.d/keychain.sh - calling keychain the Fedora way +# read in user's keychain settings or use defaults running keychain + +if [ -f $HOME/.keychainrc ]; then + + source $HOME/.keychainrc + + [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" + [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ + $HOME/.ssh/*` + [ -n "$GPGKEYS" ] || GPGKEYS="" + + keychain $KCHOPTS $SSHKEYS $GPGKEYS + + HOST=`uname -n` + [ -f $HOME/.keychain/$HOST-sh ] && \ + . $HOME/.keychain/$HOST-sh + [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ + . $HOME/.keychain/$HOST-sh-gpg + +fi + diff --git a/keychain.spec b/keychain.spec new file mode 100644 index 0000000..1c351c9 --- /dev/null +++ b/keychain.spec @@ -0,0 +1,63 @@ +Name: keychain +Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG +Version: 2.5.5 +Release: 1 +License: GPL +Group: Applications/Internet +URL: http://www.gentoo.org/proj/en/keychain/ +Source0: http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2 +Source1: keychain.sh +Source2: keychain.csh +Source3: README.Fedora +Patch0: keychain-manpage.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +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 dramatically 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. + +%prep +%setup -q +%patch0 -p1 +sed -i -e 's|/usr/ucb:||' keychain + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 755 keychain %{buildroot}%{_bindir}/keychain +install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh +install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh +install -m 644 keychain.1 %{buildroot}%{_mandir}/man1 +install -m 644 %{SOURCE3} README.Fedora + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING ChangeLog README README.Fedora +%doc %{_mandir}/man1/keychain.1.gz +%{_bindir}/keychain +%config(noreplace) %{_sysconfdir}/profile.d/keychain.sh +%config(noreplace) %{_sysconfdir}/profile.d/keychain.csh + +%changelog +* Fri Aug 05 2005 Alexander Dalloz - 2.5.5-1 +- Updated to new upstream version +- Removed keychain.pod from %%doc. + +* Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 +- Added manpage patch and %%prep removal of non existing path + (thanks Ville Skyttä) +- Added opt-in mechanism through profile.d scripts for all + login shells Fedora ships. + +* Sun Jul 10 2005 Alexander Dalloz - 2.5.4.1-1 +- Initial build, based on upstream .spec by Aron Griffis. diff --git a/sources b/sources index e69de29..f81dc20 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3afa5ce32a5c57e43caac82db3396aac keychain-2.5.5.tar.bz2 From 1ed844d36687661791e6269358ab2b3306bcad3f Mon Sep 17 00:00:00 2001 From: adalloz Date: Tue, 16 Aug 2005 20:55:11 +0000 Subject: [PATCH 02/63] =?UTF-8?q?added=20test=20functionality=20to=20keych?= =?UTF-8?q?ain.{sh,csh}=20opt-in=20scripts=20problem=20=20=20=20=20reporte?= =?UTF-8?q?d=20by=20Ville=20Skytt=C3=A4=20for=20using=20`sudo=20-s'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keychain.csh | 3 ++- keychain.sh | 5 +++-- keychain.spec | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/keychain.csh b/keychain.csh index 302f566..ec2638f 100755 --- a/keychain.csh +++ b/keychain.csh @@ -1,7 +1,8 @@ # /etc/profile.d/keychain.csh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain -if (-f $HOME/.keychainrc) then +set USERHOME = `getent passwd $USER | cut -d: -f6` +if ($HOME == $USERHOME && -f $HOME/.keychainrc) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` diff --git a/keychain.sh b/keychain.sh index 4ab4027..d180f50 100755 --- a/keychain.sh +++ b/keychain.sh @@ -1,9 +1,10 @@ # /etc/profile.d/keychain.sh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain -if [ -f $HOME/.keychainrc ]; then +USERHOME=`getent passwd $USER | cut -d: -f6` +if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then - source $HOME/.keychainrc + . $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ diff --git a/keychain.spec b/keychain.spec index 1c351c9..b9c1f6e 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.5.5 -Release: 1 +Release: 2 License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh %changelog +* Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 +- Added test for homedir mismatch in opt-in scripts, covering + `sudo -s' (reported by Ville Skyttä). + * Fri Aug 05 2005 Alexander Dalloz - 2.5.5-1 - Updated to new upstream version - Removed keychain.pod from %%doc. From 19b747607e8b8c0479927aec234d89ffc0bc2e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 10 Sep 2005 15:57:01 +0000 Subject: [PATCH 03/63] Add disttag. --- keychain.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index b9c1f6e..1b6b02b 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.5.5 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ From 8168ce724465a361b3d3d7848f81df41060f63e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 1 Dec 2005 13:28:40 +0000 Subject: [PATCH 04/63] - Update to 2.6.1. - Invoke keychain with --noask in opt-in scripts in non-interactive shells to fix scp'ing to an opt-in enabled account for which keychain hasn't run. - Make opt-in config work the same way with zsh as with other shells. - Replace tweaks in manpage patch with more generic instructions. - Make profile.d snippets non-executable (#35714). - Preserve timestamps of installed files, other cosmetics. (See #174262 for more info.) --- .cvsignore | 2 +- README.Fedora | 5 +- keychain-manpage.patch | 101 ++++++++++++----------------------------- keychain.csh | 5 +- keychain.sh | 10 +++- keychain.spec | 27 +++++++---- sources | 2 +- 7 files changed, 64 insertions(+), 88 deletions(-) diff --git a/.cvsignore b/.cvsignore index f1d22b8..da51cb7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -keychain-2.5.5.tar.bz2 +keychain-2.6.1.tar.bz2 diff --git a/README.Fedora b/README.Fedora index 748349d..1a249d9 100644 --- a/README.Fedora +++ b/README.Fedora @@ -7,9 +7,8 @@ when using bash or ~/.login when running a tcsh shell. It's general usage and different options are documented in keychain(1). Installed from Fedora Extras keychain can be easily activated by simply -touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or -tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to -their ~/.zlogin file. +touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh, +csh or tcsh. This will let the user's shell invoke a default setup of keychain where it loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are not loaded by default as the necessary gpg-agent is not part of the Fedora diff --git a/keychain-manpage.patch b/keychain-manpage.patch index f5c7be5..3cb4dc7 100644 --- a/keychain-manpage.patch +++ b/keychain-manpage.patch @@ -1,79 +1,36 @@ -diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1 ---- keychain-2.5.0.orig/keychain.1 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.1 2005-01-08 13:49:25.542402807 +0200 -@@ -291,9 +291,11 @@ +--- keychain-2.6.1/keychain.1~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.1 2005-11-26 16:56:14.000000000 +0200 +@@ -303,8 +303,13 @@ + Show version information. .SH "EXAMPLES" .IX Header "EXAMPLES" - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++.PP ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): .PP - .Vb 5 -+\& which keychain &>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e - \& source $HOME/.keychain/$HOSTNAME-sh -@@ -305,6 +307,7 @@ - \&.profile: - .PP - .Vb 6 -+\& which keychain >/dev/null 2>/dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& [ -f $HOME/.keychain/$host-sh ] && \e -@@ -316,6 +319,7 @@ - This snippet would work in .login for tcsh: - .PP - .Vb 7 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& if (-f $HOME/.keychain/$HOST-csh) then - \& source $HOME/.keychain/$HOST-csh -@@ -328,6 +332,7 @@ - This snippet would work in .login for csh: - .PP - .Vb 8 -+\& which keychain >& /dev/null && \e - \& keychain id_rsa id_dsa 0123ABCD - \& host=`uname -n` - \& if (-f $HOME/.keychain/$host-csh) then -diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod ---- keychain-2.5.0.orig/keychain.pod 2005-01-08 04:02:36.000000000 +0200 -+++ keychain-2.5.0/keychain.pod 2005-01-08 13:49:44.002694389 +0200 -@@ -193,8 +193,10 @@ + .Vb 1 + \& eval `keychain --eval id_rsa id_dsa 0123ABCD` +--- keychain-2.6.1/keychain.pod~ 2005-10-10 22:40:23.000000000 +0300 ++++ keychain-2.6.1/keychain.pod 2005-11-26 16:57:25.000000000 +0200 +@@ -207,8 +207,13 @@ + =head1 EXAMPLES - This snippet would work in .bash_profile (for bash) or .zlogin (for --zsh) to load two ssh keys and one gpg key: -+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID -+0123ABCD): +-This snippet should work in any shell to load two ssh keys and one gpg +-key: ++Note that the examples below assume that keychain is available on the ++machine they're run. If you're using them in your login profile snippets ++that are shared between systems, it may be a good idea to protect their ++invocation by first checking if keychain is indeed available. ++ ++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) ++and one gpg key (key id 0123ABCD): -+ which keychain &>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \ - source $HOME/.keychain/$HOSTNAME-sh -@@ -204,6 +206,7 @@ - For other Bourne-compatible shells such as sh, you can use this in - .profile: + eval `keychain --eval id_rsa id_dsa 0123ABCD` -+ which keychain >/dev/null 2>/dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - [ -f $HOME/.keychain/$host-sh ] && \ -@@ -213,6 +216,7 @@ - - This snippet would work in .login for tcsh: - -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - if (-f $HOME/.keychain/$HOST-csh) then - source $HOME/.keychain/$HOST-csh -@@ -223,6 +227,7 @@ - - This snippet would work in .login for csh: - -+ which keychain >& /dev/null && \ - keychain id_rsa id_dsa 0123ABCD - host=`uname -n` - if (-f $HOME/.keychain/$host-csh) then diff --git a/keychain.csh b/keychain.csh index ec2638f..7d4018d 100755 --- a/keychain.csh +++ b/keychain.csh @@ -10,10 +10,13 @@ if ($HOME == $USERHOME && -f $HOME/.keychainrc) then if (! $?KCHOPTS) then set KCHOPTS = "--quiet" endif + if (! $?prompt) then + set KCHOPTS = ( $KCHOPTS --noask ) + endif if (! $?SSHKEYS) then set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` endif - if (! $?GPGKEYS ) then + if (! $?GPGKEYS) then set GPGKEYS = "" endif diff --git a/keychain.sh b/keychain.sh index d180f50..1a99949 100755 --- a/keychain.sh +++ b/keychain.sh @@ -7,11 +7,19 @@ if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then . $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" + case $- in + *i*) ;; + *) KCHOPTS="$KCHOPTS --noask" ;; + esac [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" - keychain $KCHOPTS $SSHKEYS $GPGKEYS + if [ -n "$ZSH_VERSION" ] ; then + keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS} + else + keychain $KCHOPTS $SSHKEYS $GPGKEYS + fi HOST=`uname -n` [ -f $HOME/.keychain/$HOST-sh ] && \ diff --git a/keychain.spec b/keychain.spec index 1b6b02b..c466a6c 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.5.5 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -31,11 +31,11 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_mandir}/man1 -install -m 755 keychain %{buildroot}%{_bindir}/keychain -install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh -install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh -install -m 644 keychain.1 %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE3} README.Fedora +install -pm 755 keychain %{buildroot}%{_bindir}/keychain +install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh +install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh +install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 +install -pm 644 %{SOURCE3} README.Fedora %clean rm -rf %{buildroot} @@ -43,12 +43,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc COPYING ChangeLog README README.Fedora -%doc %{_mandir}/man1/keychain.1.gz -%{_bindir}/keychain %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh +%{_bindir}/keychain +%{_mandir}/man1/keychain.1* %changelog +* Sat Nov 26 2005 Ville Skyttä - 2.6.1-1 +- Update to 2.6.1. +- Invoke keychain with --noask in opt-in scripts in non-interactive shells + to fix scp'ing to an opt-in enabled account for which keychain hasn't run. +- Make opt-in config work the same way with zsh as with other shells. +- Replace tweaks in manpage patch with more generic instructions. +- Make profile.d snippets non-executable (#35714). +- Preserve timestamps of installed files, other cosmetics. + * Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 - Added test for homedir mismatch in opt-in scripts, covering `sudo -s' (reported by Ville Skyttä). diff --git a/sources b/sources index f81dc20..f601a64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3afa5ce32a5c57e43caac82db3396aac keychain-2.5.5.tar.bz2 +408caf4fe29cd88d5684410ef896c33d keychain-2.6.1.tar.bz2 From 24d7760457c7305c12339a42081fc19bff619b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:33:09 +0000 Subject: [PATCH 05/63] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 3a1f6fd432208dedbaee56259fc16867706f6da9 Mon Sep 17 00:00:00 2001 From: adalloz Date: Tue, 29 Aug 2006 15:32:41 +0000 Subject: [PATCH 06/63] Rebuild for FC6. --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index c466a6c..69130b3 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Tue Aug 29 2006 Alexander Dalloz - 2.6.1-2 +- Rebuild for FC6. + * Sat Nov 26 2005 Ville Skyttä - 2.6.1-1 - Update to 2.6.1. - Invoke keychain with --noask in opt-in scripts in non-interactive shells From bcb224fe0849d9a989da285575741e3fc5972f00 Mon Sep 17 00:00:00 2001 From: adalloz Date: Fri, 1 Sep 2006 02:11:46 +0000 Subject: [PATCH 07/63] Update to current upstream version 2.6.2 --- .cvsignore | 2 +- keychain.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index da51cb7..b6873aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -keychain-2.6.1.tar.bz2 +keychain-2.6.2.tar.bz2 diff --git a/keychain.spec b/keychain.spec index 69130b3..32aaa11 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 +- Update to 2.6.2. + * Tue Aug 29 2006 Alexander Dalloz - 2.6.1-2 - Rebuild for FC6. diff --git a/sources b/sources index f601a64..4f69064 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -408caf4fe29cd88d5684410ef896c33d keychain-2.6.1.tar.bz2 +b20933be0fdbb0b32aa5eb7b5b082852 keychain-2.6.2.tar.bz2 From eb173309b39526b45bb36a77b53ffa5ab10687be Mon Sep 17 00:00:00 2001 From: adalloz Date: Sun, 3 Sep 2006 21:04:03 +0000 Subject: [PATCH 08/63] already rebuild for fc6 - needs.rebuild was not destroyed --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From becb5414a300fab51fb1057ffa7553328f928286 Mon Sep 17 00:00:00 2001 From: adalloz Date: Sat, 4 Nov 2006 21:23:53 +0000 Subject: [PATCH 09/63] update to latest upstream version changes: # keychain 2.6.8 (24 Oct 2006) Save LC_ALL for gpg invocation so that pinentry-curses works. This affected peper and kloeri, though it seems to work for me in any case. # keychain 2.6.7 (24 Oct 2006) Prevent gpg_listmissing from accidentally loading keys --- .cvsignore | 2 +- keychain.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b6873aa..8af66c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -keychain-2.6.2.tar.bz2 +keychain-2.6.8.tar.bz2 diff --git a/keychain.spec b/keychain.spec index 32aaa11..b37b116 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,6 +1,6 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.2 +Version: 2.6.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 +- Update to 2.6.8. + * Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 - Update to 2.6.2. diff --git a/sources b/sources index 4f69064..728adb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b20933be0fdbb0b32aa5eb7b5b082852 keychain-2.6.2.tar.bz2 +2a23b311e438ecebed5639b568738d28 keychain-2.6.8.tar.bz2 From 10787657de660df0ee1befd5a18859b98b2c6f0f Mon Sep 17 00:00:00 2001 From: adalloz Date: Sat, 4 Nov 2006 22:34:33 +0000 Subject: [PATCH 10/63] add fix for bug #212190 --- keychain.csh | 2 +- keychain.sh | 2 +- keychain.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/keychain.csh b/keychain.csh index 7d4018d..1fb2bdd 100755 --- a/keychain.csh +++ b/keychain.csh @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain set USERHOME = `getent passwd $USER | cut -d: -f6` -if ($HOME == $USERHOME && -f $HOME/.keychainrc) then +if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` diff --git a/keychain.sh b/keychain.sh index 1a99949..411caf7 100755 --- a/keychain.sh +++ b/keychain.sh @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain USERHOME=`getent passwd $USER | cut -d: -f6` -if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then +if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then . $HOME/.keychainrc diff --git a/keychain.spec b/keychain.spec index b37b116..40f0884 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-2 +- Fix #212190. + * Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 - Update to 2.6.8. From 4ca63e9992f35451db870ab48c046ac0c7abd330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 17 Feb 2008 10:36:37 +0000 Subject: [PATCH 11/63] Note https://bugs.gentoo.org/show_bug.cgi?id=208372 --- keychain.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keychain.spec b/keychain.spec index 40f0884..dfedb8c 100644 --- a/keychain.spec +++ b/keychain.spec @@ -5,6 +5,7 @@ Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ +# Source0 MIA: https://bugs.gentoo.org/show_bug.cgi?id=208372 Source0: http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2 Source1: keychain.sh Source2: keychain.csh From 98172a327bba08bbac9623004c83e39daf146a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Apr 2008 16:09:07 +0000 Subject: [PATCH 12/63] - Make profile.d sh snippet check if it has already run (skip if yes), and avoid polluting the shell with its internval variables. - License: GPLv2. - Update URLs. --- keychain.sh | 7 +++++++ keychain.spec | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/keychain.sh b/keychain.sh index 411caf7..c366f75 100755 --- a/keychain.sh +++ b/keychain.sh @@ -1,6 +1,9 @@ # /etc/profile.d/keychain.sh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain +# Don't do anything if we're already done. +[ -n "$KEYCHAIN_DONE" ] && return + USERHOME=`getent passwd $USER | cut -d: -f6` if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then @@ -27,5 +30,9 @@ if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ . $HOME/.keychain/$HOST-sh-gpg + unset KCHOPTS SSHKEYS GPGKEYS HOST + + KEYCHAIN_DONE=1 fi +unset USERHOME diff --git a/keychain.spec b/keychain.spec index dfedb8c..2d752f7 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,12 +1,11 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 Group: Applications/Internet -URL: http://www.gentoo.org/proj/en/keychain/ -# Source0 MIA: https://bugs.gentoo.org/show_bug.cgi?id=208372 -Source0: http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2 +URL: http://agriffis.n01se.net/keychain/ +Source0: http://agriffis.n01se.net/keychain/%{name}-%{version}.tar.bz2 Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora @@ -50,6 +49,12 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Sun Apr 6 2008 Ville Skyttä - 2.6.8-3 +- Make profile.d sh snippet check if it has already run (skip if yes), + and avoid polluting the shell with its internval variables. +- License: GPLv2. +- Update URLs. + * Sat Nov 04 2006 Alexander Dalloz - 2.6.8-2 - Fix #212190. From 4724e90a7e4c5d6008ee066c27f2d474fdf9999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Apr 2008 16:10:16 +0000 Subject: [PATCH 13/63] Changelog typo fix. --- keychain.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 2d752f7..f1c84b6 100644 --- a/keychain.spec +++ b/keychain.spec @@ -51,7 +51,7 @@ rm -rf %{buildroot} %changelog * Sun Apr 6 2008 Ville Skyttä - 2.6.8-3 - Make profile.d sh snippet check if it has already run (skip if yes), - and avoid polluting the shell with its internval variables. + and avoid polluting the shell with its internal variables. - License: GPLv2. - Update URLs. From c465cd678bbe378de5faf80e8395c036ec96983e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 16 Feb 2009 18:06:55 +0000 Subject: [PATCH 14/63] - Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913). --- keychain.csh | 14 +++++++------- keychain.sh | 18 +++++++++--------- keychain.spec | 5 ++++- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/keychain.csh b/keychain.csh index 1fb2bdd..9ba0f1e 100755 --- a/keychain.csh +++ b/keychain.csh @@ -1,8 +1,8 @@ # /etc/profile.d/keychain.csh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain -set USERHOME = `getent passwd $USER | cut -d: -f6` -if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then +set userhome = `getent passwd $USER | cut -d: -f6` +if ( "$HOME" == "$userhome" && -f "$HOME/.keychainrc" ) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` @@ -22,12 +22,12 @@ if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then keychain $KCHOPTS $SSHKEYS $GPGKEYS - set HOST = `uname -n` - if (-f $HOME/.keychain/$HOST-csh) then - source $HOME/.keychain/$HOST-csh + set host = `uname -n` + if (-f $HOME/.keychain/$host-csh) then + source $HOME/.keychain/$host-csh endif - if (-f $HOME/.keychain/$HOST-csh-gpg) then - source $HOME/.keychain/$HOST-csh-gpg + if (-f $HOME/.keychain/$host-csh-gpg) then + source $HOME/.keychain/$host-csh-gpg endif endif diff --git a/keychain.sh b/keychain.sh index c366f75..27d5311 100755 --- a/keychain.sh +++ b/keychain.sh @@ -4,8 +4,8 @@ # Don't do anything if we're already done. [ -n "$KEYCHAIN_DONE" ] && return -USERHOME=`getent passwd $USER | cut -d: -f6` -if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then +userhome=`getent passwd $USER | cut -d: -f6` +if [ "$HOME" = "$userhome" -a -f "$HOME/.keychainrc" ]; then . $HOME/.keychainrc @@ -24,15 +24,15 @@ if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then keychain $KCHOPTS $SSHKEYS $GPGKEYS fi - HOST=`uname -n` - [ -f $HOME/.keychain/$HOST-sh ] && \ - . $HOME/.keychain/$HOST-sh - [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ - . $HOME/.keychain/$HOST-sh-gpg + host=`uname -n` + [ -f $HOME/.keychain/$host-sh ] && \ + . $HOME/.keychain/$host-sh + [ -f $HOME/.keychain/$host-sh-gpg ] && \ + . $HOME/.keychain/$host-sh-gpg - unset KCHOPTS SSHKEYS GPGKEYS HOST + unset KCHOPTS SSHKEYS GPGKEYS host KEYCHAIN_DONE=1 fi -unset USERHOME +unset userhome diff --git a/keychain.spec b/keychain.spec index f1c84b6..c0d1a3a 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Mon Feb 16 2009 Ville Skyttä - 2.6.8-4 +- Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913). + * Sun Apr 6 2008 Ville Skyttä - 2.6.8-3 - Make profile.d sh snippet check if it has already run (skip if yes), and avoid polluting the shell with its internal variables. From d8db74cb9cd2a6647109c1aae75a5ba44f26dfae Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 11:09:25 +0000 Subject: [PATCH 15/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index c0d1a3a..14e9a0e 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.6.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Ville Skyttä - 2.6.8-4 - Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913). From 5eb9ca9901e1390b5c633f535d7053470d38946f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 2 Mar 2009 21:15:20 +0000 Subject: [PATCH 16/63] - Write ~/.gpg-agent-info when launching gpg-agent for better compatibility with other things using it, e.g. KDE 4 (#486025). - Drop no longer needed zsh special case which caused issues with ksh from profile.d script (#314431). --- keychain-2.6.8-gpg-agent-envfile.patch | 14 ++++++++++++++ keychain.sh | 6 +----- keychain.spec | 16 +++++++++++++++- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 keychain-2.6.8-gpg-agent-envfile.patch diff --git a/keychain-2.6.8-gpg-agent-envfile.patch b/keychain-2.6.8-gpg-agent-envfile.patch new file mode 100644 index 0000000..2126203 --- /dev/null +++ b/keychain-2.6.8-gpg-agent-envfile.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=486025 + +diff -up keychain-2.6.8/keychain~ keychain-2.6.8/keychain +--- keychain-2.6.8/keychain~ 2006-10-25 01:09:34.000000000 +0300 ++++ keychain-2.6.8/keychain 2009-03-01 01:05:18.000000000 +0200 +@@ -860,7 +860,7 @@ startagent() { + unset start_gpg_timeout + fi + # the 1.9.x series of gpg spews debug on stderr +- start_out=`gpg-agent --daemon $start_gpg_timeout 2>/dev/null` ++ start_out=`gpg-agent --daemon --write-env-file $start_gpg_timeout 2>/dev/null` + else + error "I don't know how to start $start_prog-agent (2)" + return 1 diff --git a/keychain.sh b/keychain.sh index 27d5311..8903ccf 100755 --- a/keychain.sh +++ b/keychain.sh @@ -18,11 +18,7 @@ if [ "$HOME" = "$userhome" -a -f "$HOME/.keychainrc" ]; then $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" - if [ -n "$ZSH_VERSION" ] ; then - keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS} - else - keychain $KCHOPTS $SSHKEYS $GPGKEYS - fi + keychain $KCHOPTS $SSHKEYS $GPGKEYS host=`uname -n` [ -f $HOME/.keychain/$host-sh ] && \ diff --git a/keychain.spec b/keychain.spec index 14e9a0e..89bc8c7 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -10,9 +10,16 @@ Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora Patch0: keychain-manpage.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=486025 +Patch1: keychain-2.6.8-gpg-agent-envfile.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# https://bugzilla.redhat.com/show_bug.cgi?id=486025 +Conflicts: kde-settings < 4.2-3 +# https://bugzilla.redhat.com/show_bug.cgi?id=314431 +Conflicts: zsh < 4.3.4-7 + %description 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 @@ -24,6 +31,7 @@ local machine is rebooted. %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's|/usr/ucb:||' keychain %install @@ -49,6 +57,12 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Mon Mar 2 2009 Ville Skyttä - 2.6.8-6 +- Write ~/.gpg-agent-info when launching gpg-agent for better compatibility + with other things using it, e.g. KDE 4 (#486025). +- Drop no longer needed zsh special case which caused issues with ksh from + profile.d script (#314431). + * Wed Feb 25 2009 Fedora Release Engineering - 2.6.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 1a678a5483e024b77a3bb1e4f7c6be8186ed8e98 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 04:33:49 +0000 Subject: [PATCH 17/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 89bc8c7..bf13c7f 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.6.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Mar 2 2009 Ville Skyttä - 2.6.8-6 - Write ~/.gpg-agent-info when launching gpg-agent for better compatibility with other things using it, e.g. KDE 4 (#486025). From 6e0b8c4456e185079aba84fd782cf48556dd8027 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:21 +0000 Subject: [PATCH 18/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e512bef..75e8b30 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: keychain -# $Id$ +# $Id: Makefile,v 1.1 2005/08/05 02:54:42 adalloz Exp $ NAME := keychain SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2aed8c0bcbe19942931b3c494dbea01bfc66e4c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:07:19 +0000 Subject: [PATCH 19/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 75e8b30..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: keychain -# $Id: Makefile,v 1.1 2005/08/05 02:54:42 adalloz Exp $ -NAME := keychain -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From e73fc61cb9aee5180f9fa373a295becd5a056e90 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:32:31 -0600 Subject: [PATCH 20/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index bf13c7f..0f46d54 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.6.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 2.6.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 96d1d63f27c900dae27dbab0ce9c0d0d9b0de6f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 00:49:37 -0600 Subject: [PATCH 21/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 0f46d54..32ca015 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 2.6.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.6.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 5e059a7ce704a29b3a17516efb51a1123add1587 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 13:00:25 -0500 Subject: [PATCH 22/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 32ca015..6763b54 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.6.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 2.6.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 12c78a65bbdf56ad42cea7248cd43113f7f98769 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 21:20:53 -0600 Subject: [PATCH 23/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 6763b54..9936ffe 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.6.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 2.6.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 42ba92aca51cb122c7c0a4643b9d760384c6b5b4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 17:27:29 -0500 Subject: [PATCH 24/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 9936ffe..47db12c 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.6.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 2.6.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 7870c654a80ada79e1ca4d6cbdc5a4ad64392d4c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:18:26 -0500 Subject: [PATCH 25/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 47db12c..a1b51f2 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/Internet URL: http://agriffis.n01se.net/keychain/ @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.6.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.6.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 383c77d418489f388627a4b1790577fd7043e031 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 5 May 2015 10:01:33 +0200 Subject: [PATCH 26/63] 2.8.0-1 - version upgrade (rhbz#531382, rhbz#811365, rhbz#1209473) - support for newer openssh/gnupg (rhbz#1204340) --- .gitignore | 1 + keychain-2.6.8-gpg-agent-envfile.patch | 14 ---------- keychain-manpage.patch | 36 -------------------------- keychain.spec | 20 +++++++------- sources | 2 +- 5 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 keychain-2.6.8-gpg-agent-envfile.patch delete mode 100644 keychain-manpage.patch diff --git a/.gitignore b/.gitignore index 8af66c8..36515b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ keychain-2.6.8.tar.bz2 +/keychain-2.8.0.tar.bz2 diff --git a/keychain-2.6.8-gpg-agent-envfile.patch b/keychain-2.6.8-gpg-agent-envfile.patch deleted file mode 100644 index 2126203..0000000 --- a/keychain-2.6.8-gpg-agent-envfile.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=486025 - -diff -up keychain-2.6.8/keychain~ keychain-2.6.8/keychain ---- keychain-2.6.8/keychain~ 2006-10-25 01:09:34.000000000 +0300 -+++ keychain-2.6.8/keychain 2009-03-01 01:05:18.000000000 +0200 -@@ -860,7 +860,7 @@ startagent() { - unset start_gpg_timeout - fi - # the 1.9.x series of gpg spews debug on stderr -- start_out=`gpg-agent --daemon $start_gpg_timeout 2>/dev/null` -+ start_out=`gpg-agent --daemon --write-env-file $start_gpg_timeout 2>/dev/null` - else - error "I don't know how to start $start_prog-agent (2)" - return 1 diff --git a/keychain-manpage.patch b/keychain-manpage.patch deleted file mode 100644 index 3cb4dc7..0000000 --- a/keychain-manpage.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- keychain-2.6.1/keychain.1~ 2005-10-10 22:40:23.000000000 +0300 -+++ keychain-2.6.1/keychain.1 2005-11-26 16:56:14.000000000 +0200 -@@ -303,8 +303,13 @@ - Show version information. - .SH "EXAMPLES" - .IX Header "EXAMPLES" --This snippet should work in any shell to load two ssh keys and one gpg --key: -+Note that the examples below assume that keychain is available on the -+machine they're run. If you're using them in your login profile snippets -+that are shared between systems, it may be a good idea to protect their -+invocation by first checking if keychain is indeed available. -+.PP -+This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) -+and one gpg key (key id 0123ABCD): - .PP - .Vb 1 - \& eval `keychain --eval id_rsa id_dsa 0123ABCD` ---- keychain-2.6.1/keychain.pod~ 2005-10-10 22:40:23.000000000 +0300 -+++ keychain-2.6.1/keychain.pod 2005-11-26 16:57:25.000000000 +0200 -@@ -207,8 +207,13 @@ - - =head1 EXAMPLES - --This snippet should work in any shell to load two ssh keys and one gpg --key: -+Note that the examples below assume that keychain is available on the -+machine they're run. If you're using them in your login profile snippets -+that are shared between systems, it may be a good idea to protect their -+invocation by first checking if keychain is indeed available. -+ -+This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa) -+and one gpg key (key id 0123ABCD): - - eval `keychain --eval id_rsa id_dsa 0123ABCD` - diff --git a/keychain.spec b/keychain.spec index a1b51f2..8b3b865 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,17 +1,14 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.8 -Release: 13%{?dist} +Version: 2.8.0 +Release: 1%{?dist} License: GPLv2 Group: Applications/Internet -URL: http://agriffis.n01se.net/keychain/ -Source0: http://agriffis.n01se.net/keychain/%{name}-%{version}.tar.bz2 +URL: http://www.funtoo.org/Keychain +Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora -Patch0: keychain-manpage.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=486025 -Patch1: keychain-2.6.8-gpg-agent-envfile.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,8 +27,6 @@ local machine is rebooted. %prep %setup -q -%patch0 -p1 -%patch1 -p1 sed -i -e 's|/usr/ucb:||' keychain %install @@ -50,13 +45,18 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc COPYING ChangeLog README README.Fedora +%doc COPYING.txt ChangeLog README.md README.Fedora %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh %{_bindir}/keychain %{_mandir}/man1/keychain.1* %changelog +* Tue May 05 2015 Andreas Bierfert +- 2.8.0-1 +- version upgrade (rhbz#531382, rhbz#811365, rhbz#1209473) +- support for newer openssh/gnupg (rhbz#1204340) + * Sun Jun 08 2014 Fedora Release Engineering - 2.6.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 728adb3..d016d7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a23b311e438ecebed5639b568738d28 keychain-2.6.8.tar.bz2 +89a3771f39a8a9fd65f11c5fdd4c4b93 keychain-2.8.0.tar.bz2 From 95a608c85d4171a71f776b66918a76aa18baccf9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 13:08:33 +0000 Subject: [PATCH 27/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 8b3b865..8f5240b 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue May 05 2015 Andreas Bierfert - 2.8.0-1 - version upgrade (rhbz#531382, rhbz#811365, rhbz#1209473) From b2993f682d56eb194cfadb1a663c5ebce5cbd014 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 01:56:44 +0000 Subject: [PATCH 28/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 8f5240b..5eeb3f7 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9fc587d382eab749e2bdd2572966151cdee52fb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 17:45:21 +0000 Subject: [PATCH 29/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 5eeb3f7..313a1f5 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 2.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From bb4940cbde24caa0b3719baa62f889d1462101a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 15:09:28 +0000 Subject: [PATCH 30/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 313a1f5..5c3785e 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From ab0d64d0334e7c832fee02352b19226b8e6ffbd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 19:54:40 +0000 Subject: [PATCH 31/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 5c3785e..6c276c8 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{_mandir}/man1/keychain.1* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 72514fe8e4b213dabaf3bfe6706a6773dcb46ff2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:36:05 +0100 Subject: [PATCH 32/63] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- keychain.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 6c276c8..4397fcd 100644 --- a/keychain.spec +++ b/keychain.spec @@ -10,7 +10,6 @@ Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # https://bugzilla.redhat.com/show_bug.cgi?id=486025 Conflicts: kde-settings < 4.2-3 From 82207fe4376ddd1dafc0be33d7c83d6f4233e331 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:16:44 +0100 Subject: [PATCH 33/63] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- keychain.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/keychain.spec b/keychain.spec index 4397fcd..54070cc 100644 --- a/keychain.spec +++ b/keychain.spec @@ -39,9 +39,6 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 install -pm 644 %{SOURCE3} README.Fedora -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc COPYING.txt ChangeLog README.md README.Fedora From 08d3e51c3d104d324f714c4c26cffa3a2db87354 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:30:10 -0500 Subject: [PATCH 34/63] Remove needless use of %defattr --- keychain.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 54070cc..191b644 100644 --- a/keychain.spec +++ b/keychain.spec @@ -40,7 +40,6 @@ install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 install -pm 644 %{SOURCE3} README.Fedora %files -%defattr(-,root,root) %doc COPYING.txt ChangeLog README.md README.Fedora %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh From e5376334542a4773ff464a98dfbb7194fe922515 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:00:35 +0000 Subject: [PATCH 35/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 191b644..83d31d4 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/Internet URL: http://www.funtoo.org/Keychain @@ -47,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.8.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e40990f9777dd7ce2c34de707bebf6ba666aeb17 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:50 +0100 Subject: [PATCH 36/63] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- keychain.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 83d31d4..d4eb5ba 100644 --- a/keychain.spec +++ b/keychain.spec @@ -3,7 +3,6 @@ Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 Release: 7%{?dist} License: GPLv2 -Group: Applications/Internet URL: http://www.funtoo.org/Keychain Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 Source1: keychain.sh From 2ee34ac368cd47b2bc5ecb6680874fdc2ae475df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 05:21:25 +0000 Subject: [PATCH 37/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index d4eb5ba..a46950d 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 URL: http://www.funtoo.org/Keychain Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 059ebee916f19d93a24c86c00d1f3d0ab1272c7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 11:23:55 +0000 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index a46950d..86a71f5 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: http://www.funtoo.org/Keychain Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.8.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3ebec095c5566c6937c34cbeb12f8ad4a57b5654 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 07:00:50 +0000 Subject: [PATCH 39/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 86a71f5..77b27b9 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: http://www.funtoo.org/Keychain Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From bf2d5a0b424db9d6ca949a435bb48f58f9b994aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 1 Jun 2020 23:32:17 +0100 Subject: [PATCH 40/63] Update to 2.8.5 (#1226492) --- .gitignore | 1 + keychain.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 36515b8..2cd33d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ keychain-2.6.8.tar.bz2 /keychain-2.8.0.tar.bz2 +/keychain-2.8.5.tar.gz diff --git a/keychain.spec b/keychain.spec index 77b27b9..82b31b5 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,10 +1,10 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.8.0 -Release: 10%{?dist} +Version: 2.8.5 +Release: 1%{?dist} License: GPLv2 -URL: http://www.funtoo.org/Keychain -Source0: http://www.funtoo.org/distfiles/keychain/keychain-%{version}.tar.bz2 +URL: https://www.funtoo.org/Keychain +Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Mon Jun 01 2020 Sérgio Basto - 2.8.5-1 +- Update to 2.8.5 (#1226492) + * Wed Jan 29 2020 Fedora Release Engineering - 2.8.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d016d7d..988ec87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89a3771f39a8a9fd65f11c5fdd4c4b93 keychain-2.8.0.tar.bz2 +SHA512 (keychain-2.8.5.tar.gz) = 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024 From 576d0695ddaf23b9a9f2d833b4e45be2cee233d4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 1 Jun 2020 19:58:39 -0500 Subject: [PATCH 41/63] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From f262fbe7cfe12b918ec70652020517aad69de41c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 03:01:28 +0000 Subject: [PATCH 42/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 82b31b5..3a91d3a 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 01 2020 Sérgio Basto - 2.8.5-1 - Update to 2.8.5 (#1226492) From 131ff2e26d7d5055cc089156c5ddac87c3a96148 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:13:18 +0000 Subject: [PATCH 43/63] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From a885a6566731f5e830e5c7cba50c50b9fa435bf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:29:14 +0000 Subject: [PATCH 44/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 3a91d3a..7cf59f8 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 292bed7aa2d437d65ac0ddf65b331aa32e3a17a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:43:33 +0000 Subject: [PATCH 45/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 7cf59f8..8cd1d0b 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.8.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 35e05b1e75241bd0af8a37399cc45d07c0f6d686 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:27:21 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 8cd1d0b..9d96de0 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.8.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.8.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 467bbe7780ab7370af6f5b663bcc3e2381307f2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:53:50 +0000 Subject: [PATCH 47/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 9d96de0..fbcfb95 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.8.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.8.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0ef670631f286c60d8a1ca523f37113375304f4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:23:41 +0000 Subject: [PATCH 48/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index fbcfb95..486a813 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -46,6 +46,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.8.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.8.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3ca424bb0a0e704a0f49888701b27d5d95c2328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 18 Apr 2023 15:00:08 +0100 Subject: [PATCH 49/63] Requires findutils (#2187705) --- keychain.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index fbcfb95..79ab572 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -9,6 +9,7 @@ Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora BuildArch: noarch +Requires: findutils # https://bugzilla.redhat.com/show_bug.cgi?id=486025 Conflicts: kde-settings < 4.2-3 @@ -46,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Tue Apr 18 2023 Sérgio Basto - 2.8.5-7 +- Requires findutils (#2187705) + * Thu Jul 21 2022 Fedora Release Engineering - 2.8.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b2052ba328d54e2a4bbab01e9f8338489b84e0af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:43:34 +0000 Subject: [PATCH 50/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 0eda84e..3e444e1 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -47,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.8.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 18 2023 Sérgio Basto - 2.8.5-8 - Requires findutils (#2187705) From 7c5e4164529995acf8c83042a218f64e226a5664 Mon Sep 17 00:00:00 2001 From: Luc Ducazu Date: Sun, 17 Sep 2023 11:13:37 +0200 Subject: [PATCH 51/63] Suppress grep error messages. `grep` will show error messages when subdirectories exist under `~/.ssh`, eg when using package `ssh-key-dir`. --- keychain.csh | 2 +- keychain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keychain.csh b/keychain.csh index 9ba0f1e..f937a7a 100755 --- a/keychain.csh +++ b/keychain.csh @@ -14,7 +14,7 @@ if ( "$HOME" == "$userhome" && -f "$HOME/.keychainrc" ) then set KCHOPTS = ( $KCHOPTS --noask ) endif if (! $?SSHKEYS) then - set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` + set SSHKEYS = `grep -s -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` endif if (! $?GPGKEYS) then set GPGKEYS = "" diff --git a/keychain.sh b/keychain.sh index 8903ccf..08b81e8 100755 --- a/keychain.sh +++ b/keychain.sh @@ -14,7 +14,7 @@ if [ "$HOME" = "$userhome" -a -f "$HOME/.keychainrc" ]; then *i*) ;; *) KCHOPTS="$KCHOPTS --noask" ;; esac - [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ + [ -n "$SSHKEYS" ] || SSHKEYS=`grep -s -l -e '[DRS]S[AH] PRIVATE KEY' \ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" From 726f28a1d03f58b977259eafcce6dbe67551d878 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 00:16:28 +0000 Subject: [PATCH 52/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 3e444e1..c5e5536 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -47,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.8.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 2.8.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8d50b527c4456b3b69455c467552b41d81affbbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:56:34 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index c5e5536..ae7ea85 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -47,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.8.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.8.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 884ced839fa4a82d083e739f81fd4311685fa992 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:40:25 +0000 Subject: [PATCH 54/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index ae7ea85..380e5f4 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -47,6 +47,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.8.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.8.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d53d86a12a4396f5236e8a77532bd60b49c4c0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 10:55:11 +0200 Subject: [PATCH 55/63] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- keychain.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keychain.spec b/keychain.spec index 380e5f4..7571901 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,8 +1,9 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 12%{?dist} -License: GPLv2 +Release: 13%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz Source1: keychain.sh @@ -47,6 +48,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2.8.5-13 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 2.8.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cbd48f03746b52789e4f7e0d7fa61abd1cfdbbe4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:39:20 +0000 Subject: [PATCH 56/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- keychain.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 7571901..5cca0f0 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.8.5 -Release: 13%{?dist} +Release: 14%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only URL: https://www.funtoo.org/Keychain @@ -48,6 +48,9 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.8.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 2.8.5-13 - convert license to SPDX From 99593db08d9bcbb45851b0053f03a179686f000f Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 18 Jun 2025 17:46:20 +0200 Subject: [PATCH 57/63] Update to latest upstream release Remove outdated conflicts review license use %license --- .gitignore | 1 + README.Fedora | 17 ++++++++--------- keychain.sh | 26 +++++++++++++------------- keychain.spec | 23 ++++++++++++++--------- sources | 2 +- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 2cd33d0..757b98b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ keychain-2.6.8.tar.bz2 /keychain-2.8.0.tar.bz2 /keychain-2.8.5.tar.gz +/keychain-2.9.2.tar.gz diff --git a/README.Fedora b/README.Fedora index 1a249d9..7d0a9a0 100644 --- a/README.Fedora +++ b/README.Fedora @@ -6,15 +6,14 @@ typically runs from the login shell environment setting, i.e. ~/.bash_profile when using bash or ~/.login when running a tcsh shell. It's general usage and different options are documented in keychain(1). -Installed from Fedora Extras keychain can be easily activated by simply -touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh, -csh or tcsh. +Installed from Fedora keychain can be easily activated by simply touching an +empty ~/.keychainrc file when using either bash, sh, ksh, zsh, csh or tcsh. This will let the user's shell invoke a default setup of keychain where it loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are -not loaded by default as the necessary gpg-agent is not part of the Fedora -Core gnupg package, but provided by the additional gnupg2 package of Fedora -Extras. The default setup starts keychain in quiet mode, so only messages are -printed out in case of warnings, errors or if interactivity is required. +not loaded by default as the necessary gpg-agent is not part of the Fedora Core +gnupg package, but provided by the additional gnupg2 package of Fedora. The +default setup starts keychain in quiet mode, so only messages are printed out +in case of warnings, errors or if interactivity is required. To override the default settings with which keychain is activated when the shell environment finds a ~/.keychainrc, the user can customize following @@ -38,6 +37,6 @@ to make use of ssh public key auth or of gpg signing through cron jobs, because cron uses a non-interactive shell and has a limited environment set. Note: This opt-in is not part of keychain, which is originally written by -Daniel Robbins , but added to the Fedora Extras package -of keychain to allow Fedora users an overall ease of use. +Daniel Robbins , but added to the Fedora package of +keychain to allow Fedora users an overall ease of use. diff --git a/keychain.sh b/keychain.sh index 08b81e8..964f391 100755 --- a/keychain.sh +++ b/keychain.sh @@ -1,30 +1,30 @@ +# # /etc/profile.d/keychain.sh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain # Don't do anything if we're already done. [ -n "$KEYCHAIN_DONE" ] && return -userhome=`getent passwd $USER | cut -d: -f6` -if [ "$HOME" = "$userhome" -a -f "$HOME/.keychainrc" ]; then - - . $HOME/.keychainrc +userhome=$(getent passwd "$USER" | cut -d: -f6) +if [ "$HOME" = "$userhome" ] && [ -f "$HOME/.keychainrc" ]; then + . "$HOME/.keychainrc" [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" case $- in - *i*) ;; - *) KCHOPTS="$KCHOPTS --noask" ;; + *i*) ;; + *) KCHOPTS="$KCHOPTS --noask" ;; esac - [ -n "$SSHKEYS" ] || SSHKEYS=`grep -s -l -e '[DRS]S[AH] PRIVATE KEY' \ - $HOME/.ssh/*` + [ -n "$SSHKEYS" ] || SSHKEYS=$(grep -s -l -e '[DRS]S[AH] PRIVATE KEY' \ + "$HOME/.ssh/*") [ -n "$GPGKEYS" ] || GPGKEYS="" keychain $KCHOPTS $SSHKEYS $GPGKEYS - host=`uname -n` - [ -f $HOME/.keychain/$host-sh ] && \ - . $HOME/.keychain/$host-sh - [ -f $HOME/.keychain/$host-sh-gpg ] && \ - . $HOME/.keychain/$host-sh-gpg + host=$(uname -n) + [ -f "$HOME/.keychain/$host-sh" ] && \ + . "$HOME/.keychain/$host-sh" + [ -f "$HOME/.keychain/$host-sh-gpg" ] && \ + . "$HOME/.keychain/$host-sh-gpg" unset KCHOPTS SSHKEYS GPGKEYS host diff --git a/keychain.spec b/keychain.spec index 5cca0f0..1193a01 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,8 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.8.5 -Release: 14%{?dist} -# Automatically converted from old format: GPLv2 - review is highly recommended. +Version: 2.9.2 +Release: 1%{?dist} License: GPL-2.0-only URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz @@ -12,10 +11,6 @@ Source3: README.Fedora BuildArch: noarch Requires: findutils -# https://bugzilla.redhat.com/show_bug.cgi?id=486025 -Conflicts: kde-settings < 4.2-3 -# https://bugzilla.redhat.com/show_bug.cgi?id=314431 -Conflicts: zsh < 4.3.4-7 %description Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. @@ -27,7 +22,10 @@ local machine is rebooted. %prep %setup -q -sed -i -e 's|/usr/ucb:||' keychain +sed -i -e 's|/usr/ucb:||' keychain.sh + +%build +make keychain keychain.1 %install rm -rf %{buildroot} @@ -41,13 +39,20 @@ install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1 install -pm 644 %{SOURCE3} README.Fedora %files -%doc COPYING.txt ChangeLog README.md README.Fedora +%doc ChangeLog.md README.md README.Fedora +%license COPYING.txt %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh %{_bindir}/keychain %{_mandir}/man1/keychain.1* %changelog +* Tue Jun 17 2025 Till Maas - 2.9.2-1 +- Update to latest upstream release +- Remove outdated conflicts +- review license +- use %%license + * Fri Jan 17 2025 Fedora Release Engineering - 2.8.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 988ec87..3d5bad2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keychain-2.8.5.tar.gz) = 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024 +SHA512 (keychain-2.9.2.tar.gz) = 1b4aa06037cb3f89f4cfa6a4c1a1104ca6a757175a636043b7fb4776773a81f20b38b058b86618b8e6b89cf7c61af86e6441da70ed92b0c18d31fb50b3dd8a96 From 0dacf4875b3ad5d8605bccd1d8aab1b2af9c9aa4 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 18 Jun 2025 18:17:59 +0200 Subject: [PATCH 58/63] Fix build error - Ad BR: make - Use %autochangelog - Unify white space --- keychain.spec | 180 ++++---------------------------------------------- 1 file changed, 13 insertions(+), 167 deletions(-) diff --git a/keychain.spec b/keychain.spec index 1193a01..305fae4 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,14 +1,15 @@ -Name: keychain -Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.9.2 -Release: 1%{?dist} -License: GPL-2.0-only -URL: https://www.funtoo.org/Keychain -Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz -Source1: keychain.sh -Source2: keychain.csh -Source3: README.Fedora -BuildArch: noarch +Name: keychain +Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG +Version: 2.9.2 +Release: %autorelase +License: GPL-2.0-only +URL: https://www.funtoo.org/Keychain +Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz +Source1: keychain.sh +Source2: keychain.csh +Source3: README.Fedora +BuildArch: noarch +BuildRequires: make Requires: findutils @@ -47,159 +48,4 @@ install -pm 644 %{SOURCE3} README.Fedora %{_mandir}/man1/keychain.1* %changelog -* Tue Jun 17 2025 Till Maas - 2.9.2-1 -- Update to latest upstream release -- Remove outdated conflicts -- review license -- use %%license - -* Fri Jan 17 2025 Fedora Release Engineering - 2.8.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 2.8.5-13 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 2.8.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.8.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.8.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 2.8.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 18 2023 Sérgio Basto - 2.8.5-8 -- Requires findutils (#2187705) - -* Thu Jan 19 2023 Fedora Release Engineering - 2.8.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.8.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.8.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2.8.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.8.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2.8.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 01 2020 Sérgio Basto - 2.8.5-1 -- Update to 2.8.5 (#1226492) - -* Wed Jan 29 2020 Fedora Release Engineering - 2.8.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.8.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.8.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.8.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 2.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 05 2015 Andreas Bierfert -- 2.8.0-1 -- version upgrade (rhbz#531382, rhbz#811365, rhbz#1209473) -- support for newer openssh/gnupg (rhbz#1204340) - -* Sun Jun 08 2014 Fedora Release Engineering - 2.6.8-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 2.6.8-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.6.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 2.6.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 2.6.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.6.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 2.6.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Mar 2 2009 Ville Skyttä - 2.6.8-6 -- Write ~/.gpg-agent-info when launching gpg-agent for better compatibility - with other things using it, e.g. KDE 4 (#486025). -- Drop no longer needed zsh special case which caused issues with ksh from - profile.d script (#314431). - -* Wed Feb 25 2009 Fedora Release Engineering - 2.6.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Ville Skyttä - 2.6.8-4 -- Don't override/unset $HOST or $USERHOME in profile.d snippets (#463913). - -* Sun Apr 6 2008 Ville Skyttä - 2.6.8-3 -- Make profile.d sh snippet check if it has already run (skip if yes), - and avoid polluting the shell with its internal variables. -- License: GPLv2. -- Update URLs. - -* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-2 -- Fix #212190. - -* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 -- Update to 2.6.8. - -* Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 -- Update to 2.6.2. - -* Tue Aug 29 2006 Alexander Dalloz - 2.6.1-2 -- Rebuild for FC6. - -* Sat Nov 26 2005 Ville Skyttä - 2.6.1-1 -- Update to 2.6.1. -- Invoke keychain with --noask in opt-in scripts in non-interactive shells - to fix scp'ing to an opt-in enabled account for which keychain hasn't run. -- Make opt-in config work the same way with zsh as with other shells. -- Replace tweaks in manpage patch with more generic instructions. -- Make profile.d snippets non-executable (#35714). -- Preserve timestamps of installed files, other cosmetics. - -* Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 -- Added test for homedir mismatch in opt-in scripts, covering - `sudo -s' (reported by Ville Skyttä). - -* Fri Aug 05 2005 Alexander Dalloz - 2.5.5-1 -- Updated to new upstream version -- Removed keychain.pod from %%doc. - -* Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 -- Added manpage patch and %%prep removal of non existing path - (thanks Ville Skyttä) -- Added opt-in mechanism through profile.d scripts for all - login shells Fedora ships. - -* Sun Jul 10 2005 Alexander Dalloz - 2.5.4.1-1 -- Initial build, based on upstream .spec by Aron Griffis. +%autochangelog From 98851915e6a5950a486ca7724d022082c8d9480c Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 18 Jun 2025 18:25:30 +0200 Subject: [PATCH 59/63] Fix typo in %autorelease --- keychain.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index 305fae4..63ae22b 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.9.2 -Release: %autorelase +Release: %autorelease License: GPL-2.0-only URL: https://www.funtoo.org/Keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz From da50187361db498cd52df2bf5a2936d21980bbc5 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 18 Jun 2025 19:17:52 +0200 Subject: [PATCH 60/63] - add BR perl-podlators --- keychain.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keychain.spec b/keychain.spec index 63ae22b..a613ca1 100644 --- a/keychain.spec +++ b/keychain.spec @@ -10,6 +10,7 @@ Source2: keychain.csh Source3: README.Fedora BuildArch: noarch BuildRequires: make +BuildRequires: perl-podlators Requires: findutils From 698ae930ce2935b24d07dafb2398128e7dd249c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:24:04 +0000 Subject: [PATCH 61/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0a4ece9cee4fbd46baedcd13fea37b5a35732ff6 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 10 Nov 2025 08:55:47 -0500 Subject: [PATCH 62/63] update to 2.9.8 (rhbz#2358703) Fixes an issue with `--systemd` setting environment variables with embedded newlines. --- .gitignore | 1 + keychain.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 757b98b..5742e6b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ keychain-2.6.8.tar.bz2 /keychain-2.8.0.tar.bz2 /keychain-2.8.5.tar.gz /keychain-2.9.2.tar.gz +/keychain-2.9.8.tar.gz diff --git a/keychain.spec b/keychain.spec index a613ca1..eb1c1c4 100644 --- a/keychain.spec +++ b/keychain.spec @@ -1,6 +1,6 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.9.2 +Version: 2.9.8 Release: %autorelease License: GPL-2.0-only URL: https://www.funtoo.org/Keychain diff --git a/sources b/sources index 3d5bad2..e9ff696 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (keychain-2.9.2.tar.gz) = 1b4aa06037cb3f89f4cfa6a4c1a1104ca6a757175a636043b7fb4776773a81f20b38b058b86618b8e6b89cf7c61af86e6441da70ed92b0c18d31fb50b3dd8a96 +SHA512 (keychain-2.9.8.tar.gz) = f6677f1e365703bada641757bb7d06d8d578c48fb0350c7e3ea032c6c3b4e725f59fd10800ef02aadbf25e8e973135da5d4d3705270340dc75b6756a736a71af From f395d6bed2ffb431047c9b4b9aabf917b75e0b55 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 22 Nov 2025 14:03:18 -0300 Subject: [PATCH 63/63] keychain URL is back to github.com/danielrobbins/keychain --- keychain.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keychain.spec b/keychain.spec index eb1c1c4..0074446 100644 --- a/keychain.spec +++ b/keychain.spec @@ -3,7 +3,7 @@ Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.9.8 Release: %autorelease License: GPL-2.0-only -URL: https://www.funtoo.org/Keychain +URL: https://github.com/danielrobbins/keychain Source0: https://github.com/funtoo/keychain/archive/%{version}/keychain-%{version}.tar.gz Source1: keychain.sh Source2: keychain.csh