[packages/gnupg2] - handle seahorse-agent, too
baggins
baggins at pld-linux.org
Tue Oct 18 22:24:12 CEST 2016
commit c506720be17ac00f264978af49a63035b404098c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Aug 1 17:25:57 2016 +0200
- handle seahorse-agent, too
gnupg-agent.sh | 5 ++++-
gnupg2.spec | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index 75b3a8d..555b604 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -7,7 +7,7 @@ Summary: GNU Privacy Guard - tool for secure communication and data storage - en
Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
Name: gnupg2
Version: 2.0.30
-Release: 1
+Release: 2
License: GPL v3+
Group: Applications/File
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 68ec6f4..100ad8b 100644
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -14,7 +14,8 @@ fi
if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
if [ -f "${HOME}/.gnupg/GPG_AGENT_INFO" ] && \
pid="$(cut -d: -f2 $HOME/.gnupg/GPG_AGENT_INFO)" && \
- [ "$(resolvesymlink "/proc/$pid/exe")" = "/usr/bin/gpg-agent" ]; then
+ agent="$(resolvesymlink "/proc/$pid/exe")" && \
+ [ "$agent" = "/usr/bin/gpg-agent" -o "$agent" = "/usr/bin/seahorse-agent" ]; then
export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
else
if [ "$seahorse" = "no" ]; then
@@ -26,5 +27,7 @@ if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
export GPG_AGENT_INFO
fi
fi
+unset agent
+unset seahorse
unset CFG
unset pid
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/35b4bfec3cde3f52fcdc76c1f6514ed449314cc2
More information about the pld-cvs-commit
mailing list