From 15e58a0b10ed51f61876b15b3153d30dace2ee62 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 6 Jul 2007 15:01:54 +0000
Subject: [PATCH] - gnupg-2.0.5 - gpg-agent not restarted after kde session
 crash/killed (#196327)

---
 .cvsignore           |  8 ++++----
 gnupg2.spec          | 14 +++++++++++---
 gpg-agent-startup.sh | 13 ++++++++++---
 sources              |  4 ++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6573f08..e22c595 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
 clog
-gnupg-2.0.2.tar.bz2
-gnupg-2.0.2.tar.bz2.sig
-gnupg-2.0.3.tar.bz2
-gnupg-2.0.3.tar.bz2.sig
+gnupg-2.0.4.tar.bz2
+gnupg-2.0.4.tar.bz2.sig
+gnupg-2.0.5.tar.bz2
+gnupg-2.0.5.tar.bz2.sig
diff --git a/gnupg2.spec b/gnupg2.spec
index c37b0ba..b311f53 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -9,7 +9,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.3
+Version: 2.0.5
 Release: 1%{?dist}
 
 License: GPL
@@ -25,13 +25,14 @@ Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.16-testverbose.patch
 
-Obsoletes: newpg < 0.9.5
+# ancient, deprecated
+#Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
 BuildRequires: libassuan-static >= 1.0.1 
-BuildRequires: libgcrypt-devel => 1.2.0
+BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
 
@@ -177,6 +178,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.5-1
+- gnupg-2.0.5
+- gpg-agent not restarted after kde session crash/killed (#196327)
+
+* Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.4-1
+- gnupg-2.0.4
+
 * Thu Mar 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.3-1
 - gnupg-2.0.3
 
diff --git a/gpg-agent-startup.sh b/gpg-agent-startup.sh
index c9a7095..fd84840 100755
--- a/gpg-agent-startup.sh
+++ b/gpg-agent-startup.sh
@@ -2,15 +2,22 @@
 
 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
+if [ -x "${GPG_AGENT}" ] ; then
 
   # check validity of GPG_SOCKET (in case of session crash)
   GPG_AGENT_INFO_FILE=${HOME}/.gpg-agent-info
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
-    GPG_SOCKET=$(cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:)
-    if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
+    GPG_AGENT_PID=`cat ${GPG_AGENT_INFO_FILE} | cut -f2 -d:`
+    GPG_PID_NAME=`ps -p ${GPG_AGENT_PID} -o comm=`
+    if [ ! "x${GPG_PID_NAME}" = "xgpg-agent" ]; then
       rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
+    else
+       GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:`
+       if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
+         rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
+       fi
     fi
+    unset GPG_AGENT_PID GPG_SOCKET GPG_PID_NAME
   fi
 
   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
diff --git a/sources b/sources
index 5badc5e..581d8f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4e33a5d35583da439f1bd26aa7e7042a  gnupg-2.0.3.tar.bz2
-6a846302488f087b152e511b29b8c595  gnupg-2.0.3.tar.bz2.sig
+a678b11b9333b66dbfdb9b6adb83b0b3  gnupg-2.0.5.tar.bz2
+c9160ab99de51fe167e4eb67f2edf8bd  gnupg-2.0.5.tar.bz2.sig