rpms/gnupg2/devel .cvsignore, 1.21, 1.22 gnupg2.spec, 1.68, 1.69 gpg-agent-startup.sh, 1.6, 1.7 sources, 1.23, 1.24

[Rex Dieter (rdieter)]

Author: rdieter

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

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/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	8 Mar 2007 16:52:12 -0000	1.21
+++ .cvsignore	6 Jul 2007 15:01:54 -0000	1.22
@@ -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


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnupg2.spec	8 Mar 2007 16:52:12 -0000	1.68
+++ gnupg2.spec	6 Jul 2007 15:01:54 -0000	1.69
@@ -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 @@
 
 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 @@
 
 
 %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
 


Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/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:01:54 -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/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	8 Mar 2007 16:52:12 -0000	1.23
+++ sources	6 Jul 2007 15:01:54 -0000	1.24
@@ -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