rpms/gnupg2/FC-3 .cvsignore, 1.7, 1.8 gnupg2.spec, 1.12, 1.13 gpg-agent-startup.sh, 1.2, 1.3 sources, 1.8, 1.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Sep 18 13:59:14 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/gnupg2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28817
Modified Files:
.cvsignore gnupg2.spec gpg-agent-startup.sh sources
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
- gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-6
- fix "syntax error in gpg-agent-startup.sh" (#206887)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 22 Jun 2006 17:32:51 -0000 1.7
+++ .cvsignore 18 Sep 2006 13:59:14 -0000 1.8
@@ -1,2 +1,2 @@
-gnupg-1.9.21.tar.bz2
-gnupg-1.9.21.tar.bz2.sig
+gnupg-1.9.22.tar.bz2
+gnupg-1.9.22.tar.bz2.sig
Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnupg2.spec 22 Jun 2006 17:32:51 -0000 1.12
+++ gnupg2.spec 18 Sep 2006 13:59:14 -0000 1.13
@@ -1,6 +1,6 @@
-# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
-%if "%{?fedora}" > "3"
+# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
%define kde_scriptdir %{_sysconfdir}/kde
%else
%define kde_scriptdir %{_prefix}
@@ -15,13 +15,16 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
-Version: 1.9.21
-Release: 3%{?dist}
+Version: 1.9.22
+Release: 6%{?dist}
License: GPL
Group: Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
+#Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+#use mirror(s), since the primary site hardly ever works anymore
+Source0: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2
+Source1: http://mirrors.rootmode.com/ftp.gnupg.org/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
URL: http://www.gnupg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# omit broken x86_64 build
@@ -55,6 +58,8 @@
BuildRequires: pcsc-lite-libs
%endif
+# sed/kill used in gpg-agent-(startup/shutdown).sh
+Requires: fileutils util-linux
Requires: pinentry >= 0.7.1
%if "%{?_enable_gpg:1}" == "1"
@@ -167,6 +172,21 @@
%changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
+- gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists
+
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-6
+- fix "syntax error in gpg-agent-startup.sh" (#206887)
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-3
+- fc6 respin (for libksba-1.0)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-2
+- fc6 respin
+
+* Fri Jul 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-1
+- 1.9.22
+
* 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: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/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 17:32:51 -0000 1.2
+++ gpg-agent-startup.sh 18 Sep 2006 13:59:14 -0000 1.3
@@ -2,22 +2,23 @@
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 [ -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
- 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
+ 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
+ rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
fi
fi
- if [ -f ${HOME}/.gpg-agent-info ]; then
- export GPG_AGENT_INFO=$(cat ${HOME}/.gpg-agent-info)
+ if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
+ export GPG_AGENT_INFO=$(cat "${GPG_AGENT_INFO_FILE}")
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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 22 Jun 2006 17:32:51 -0000 1.8
+++ sources 18 Sep 2006 13:59:14 -0000 1.9
@@ -1,2 +1,2 @@
-94f4e2ded63820efa6903543c2e06017 gnupg-1.9.21.tar.bz2
-89d22744e0afe45528184b7b09d4c8a0 gnupg-1.9.21.tar.bz2.sig
+ccea28fbab26bcb01890f2687d71f900 gnupg-1.9.22.tar.bz2
+02ef9a70cfa097cfe11b33600adc2b72 gnupg-1.9.22.tar.bz2.sig
More information about the fedora-extras-commits
mailing list