rpms/keychain/FC-4 .cvsignore, 1.2, 1.3 README.Fedora, 1.1, 1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2, 1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3

Ville Skytta (scop) fedora-extras-commits at redhat.com
Thu Dec 1 13:28:36 UTC 2005 

Author: scop

Update of /cvs/extras/rpms/keychain/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7542/FC-4

Modified Files:
	.cvsignore README.Fedora keychain-manpage.patch keychain.csh 
	keychain.sh keychain.spec sources 
Log Message:
* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 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.

(See #174262 for more info.)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
+++ .cvsignore	1 Dec 2005 13:28:34 -0000	1.3
@@ -1 +1 @@
-keychain-2.5.5.tar.bz2
+keychain-2.6.1.tar.bz2


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	5 Aug 2005 02:55:43 -0000	1.1
+++ README.Fedora	1 Dec 2005 13:28:34 -0000	1.2
@@ -7,9 +7,8 @@
 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

keychain-manpage.patch:

Index: keychain-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain-manpage.patch	5 Aug 2005 02:55:43 -0000	1.1
+++ keychain-manpage.patch	1 Dec 2005 13:28:34 -0000	1.2
@@ -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 @@
- =head1 EXAMPLES
+ .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 @@
  
- 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:
+ =head1 EXAMPLES
  
-+    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 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):
  
- This snippet would work in .login for csh:
+     eval `keychain --eval id_rsa id_dsa 0123ABCD`
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	if (-f $HOME/.keychain/$host-csh) then


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.csh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.csh	1 Dec 2005 13:28:34 -0000	1.3
@@ -10,10 +10,13 @@
     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
 


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.sh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.sh	1 Dec 2005 13:28:34 -0000	1.3
@@ -7,11 +7,19 @@
     . $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 ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/keychain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
+++ keychain.spec	1 Dec 2005 13:28:34 -0000	1.4
@@ -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 @@
 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 @@
 %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ä <ville.skytta at iki.fi> - 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 <alex {%} dalloz {*} de> - 2.5.5-2
 - Added test for homedir mismatch in opt-in scripts, covering
   `sudo -s' (reported by Ville Skyttä).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 02:55:43 -0000	1.2
+++ sources	1 Dec 2005 13:28:34 -0000	1.3
@@ -1 +1 @@
-3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2
+408caf4fe29cd88d5684410ef896c33d  keychain-2.6.1.tar.bz2

More information about the scm-commits mailing list