rpms/gnupg2/devel gnupg2.spec, 1.36, 1.37 gpg-agent-startup.sh, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20488

Modified Files:
	gnupg2.spec gpg-agent-startup.sh 
Log Message:
* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-3
- fix "gpg-agent not restarted after kde session crash/killed (#196327)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnupg2.spec	22 Jun 2006 16:02:58 -0000	1.36
+++ gnupg2.spec	22 Jun 2006 16:38:21 -0000	1.37
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-3
+- fix "gpg-agent not restarted after kde session crash/killed (#196327)
+
 * Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-2
 - 1.9.21
 - omit gpg2 binary to address CVS-2006-3082 (#196190)


Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gpg-agent-startup.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpg-agent-startup.sh	22 Jun 2006 16:02:58 -0000	1.2
+++ gpg-agent-startup.sh	22 Jun 2006 16:38:21 -0000	1.3
@@ -3,11 +3,21 @@
 GPG_AGENT=/usr/bin/gpg-agent
 ## Run gpg-agent only if not already running, and available
 if [ -z "${GPG_AGENT_INFO}" -a -x ${GPG_AGENT} ] ; then
+
+  # check validity of GPG_SOCKET (in case of session crash)
   if [ -f ${HOME}/.gpg-agent-info ]; then
-    export GPG_AGENT_INFO=$(cat $HOME/.gpg-agent-info)
+    GPG_SOCKET=$(cat .gpg-agent-info |cut -f1 -d:)
+    if ! test -S ${GPG_SOCKET} -o ! test -O ${GPG_SOCKET} ; then
+      rm -f ${HOME}/.gpg-agent-info 2>&1 >/dev/null
+    fi
+  fi
+
+  if [ -f ${HOME}/.gpg-agent-info ]; then
+    export GPG_AGENT_INFO=$(cat ${HOME}/.gpg-agent-info)
     export GPG_TTY=$(tty)
   else
     eval "$(${GPG_AGENT} -s --daemon ${GPG_OPTIONS})"
-    echo $GPG_AGENT_INFO > $HOME/.gpg-agent-info
+    echo ${GPG_AGENT_INFO} > ${HOME}/.gpg-agent-info
   fi
+
 fi