commit ba4e3dfc2ed65b03bfa549c4d74b745e72aa3564
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Tue Aug 2 15:16:11 2016 +0200
- rel 3; use readlink from coreutils instead of our own resolvesymlink;
handle "gpg-agent (deleted)" symlink case
gnupg-agent.sh | 2 +-
gnupg2.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index 555b604..8efc42f 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: 2
+Release: 3
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 100ad8b..72dda0c 100644
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -14,7 +14,7 @@ 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)" && \
- agent="$(resolvesymlink "/proc/$pid/exe")" && \
+ agent="$(readlink -n "/proc/$pid/exe")" &&
agent=${agent%% *} && \
[ "$agent" = "/usr/bin/gpg-agent" -o "$agent" =
"/usr/bin/seahorse-agent" ]; then
export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/ba4e3dfc2ed65b03bfa549c4d74b745e72aa3564
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
