rpms/gnupg2/F-7 .cvsignore, 1.22, 1.23 gnupg2.spec, 1.69, 1.70 gpg-agent-startup.sh, 1.6, 1.7 sources, 1.24, 1.25

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12806

Modified Files:
	.cvsignore gnupg2.spec gpg-agent-startup.sh sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-7/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	3 Jul 2007 10:12:50 -0000	1.22
+++ .cvsignore	6 Jul 2007 15:03:56 -0000	1.23
@@ -1,7 +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


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-7/gnupg2.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnupg2.spec	3 Jul 2007 10:12:50 -0000	1.69
+++ gnupg2.spec	6 Jul 2007 15:03:56 -0000	1.70
@@ -9,7 +9,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 
 License: GPL
@@ -32,7 +32,7 @@
 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
 
@@ -178,6 +178,10 @@
 
 
 %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
 


Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-7/gpg-agent-startup.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpg-agent-startup.sh	18 Sep 2006 13:18:25 -0000	1.6
+++ gpg-agent-startup.sh	6 Jul 2007 15:03:56 -0000	1.7
@@ -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-7/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Jul 2007 10:12:50 -0000	1.24
+++ sources	6 Jul 2007 15:03:56 -0000	1.25
@@ -1,2 +1,2 @@
-e16efce067ba132f933792a3ec7f180e  gnupg-2.0.4.tar.bz2
-5c92699afb465541b510d989617c9aa9  gnupg-2.0.4.tar.bz2.sig
+a678b11b9333b66dbfdb9b6adb83b0b3  gnupg-2.0.5.tar.bz2
+c9160ab99de51fe167e4eb67f2edf8bd  gnupg-2.0.5.tar.bz2.sig