rpms/keychain/devel keychain-2.6.8-gpg-agent-envfile.patch, NONE, 1.1 keychain.sh, 1.6, 1.7 keychain.spec, 1.13, 1.14

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/keychain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9611

Modified Files:
	keychain.sh keychain.spec 
Added Files:
	keychain-2.6.8-gpg-agent-envfile.patch 
Log Message:
* Mon Mar  2 2009 Ville Skyttä <ville.skytta at iki.fi> - 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).


keychain-2.6.8-gpg-agent-envfile.patch:

--- NEW FILE keychain-2.6.8-gpg-agent-envfile.patch ---
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


Index: keychain.sh
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- keychain.sh	16 Feb 2009 18:06:55 -0000	1.6
+++ keychain.sh	2 Mar 2009 21:15:20 -0000	1.7
@@ -18,11 +18,7 @@
 							   $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 ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- keychain.spec	25 Feb 2009 11:09:25 -0000	1.13
+++ keychain.spec	2 Mar 2009 21:15:20 -0000	1.14
@@ -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 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 sed -i -e 's|/usr/ucb:||' keychain
 
 %install
@@ -49,6 +57,12 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
+* Mon Mar  2 2009 Ville Skyttä <ville.skytta at iki.fi> - 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 <rel-eng at lists.fedoraproject.org> - 2.6.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild