Hello community, here is the log from the commit of package keychain for openSUSE:Factory checked in at 2015-02-16 21:14:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keychain (Old) and /work/SRC/openSUSE:Factory/.keychain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keychain" Changes: -------- --- /work/SRC/openSUSE:Factory/keychain/keychain.changes 2011-09-23 02:06:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.keychain.new/keychain.changes 2015-02-16 21:14:29.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 13 14:08:07 UTC 2015 - mrueck...@suse.de + +- added 0001-Update-inheritagents-for-GnuPG-v.2.1.patch: + Backport the GPG 2.1 support from git head + +------------------------------------------------------------------- New: ---- 0001-Update-inheritagents-for-GnuPG-v.2.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keychain.spec ++++++ --- /var/tmp/diff_new_pack.9FpLAf/_old 2015-02-16 21:14:30.000000000 +0100 +++ /var/tmp/diff_new_pack.9FpLAf/_new 2015-02-16 21:14:30.000000000 +0100 @@ -26,6 +26,7 @@ Release: 1 Summary: A Key Management Application for SSH2 RSA/DSA and GnuPG Keys Source: http://www.funtoo.org/archive/keychain/keychain-%{version}.tar.bz2 +Patch: 0001-Update-inheritagents-for-GnuPG-v.2.1.patch Group: Productivity/Security Requires: bash coreutils sed Requires: openssh @@ -60,6 +61,7 @@ %prep %setup -q +%patch -p1 %build %__make V="%{version}" ++++++ 0001-Update-inheritagents-for-GnuPG-v.2.1.patch ++++++ >From c24ec771cf991b9a2db8a087222460cbc04d9387 Mon Sep 17 00:00:00 2001 From: Tyler Cipriani <ty...@tylercipriani.com> Date: Fri, 9 Jan 2015 21:58:57 -0700 Subject: [PATCH] Update inheritagents for GnuPG v.2.1+ $GPG_AGENT_INFO doesn't exist as of GnuPG 2.1.0. Info available at: https://www.gnupg.org/faq/whats-new-in-2.1.html#autostart --- keychain.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keychain.sh b/keychain.sh index 4c35622..30e83b2 100755 --- a/keychain.sh +++ b/keychain.sh @@ -374,6 +374,10 @@ inheritagents() { if [ -n "$GPG_AGENT_INFO" ]; then inherit_gpg_agent_info="$GPG_AGENT_INFO" inherit_gpg_agent_pid=`echo "$GPG_AGENT_INFO" | cut -f2 -d:` + # GnuPG v.2.1+ removes $GPG_AGENT_INFO + elif [ -S "${GNUPGHOME:=$HOME/.gnupg}/S.gpg-agent" ]; then + inherit_gpg_agent_pid=$(ps -u "$me" -o 'pid,comm' | grep gpg-agent | tr -dc '[:digit:]') + inherit_gpg_agent_info="$GNUPGHOME/S.gpg-agent:${inherit_gpg_agent_pid}:1" fi fi fi -- 2.1.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
