From 777ac9b4d93954362fa9e6db94bba65ce2749dba Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 14 Dec 2016 12:25:14 +0100 Subject: [PATCH] Check for all 3 of SSH_AGENT, SSH_AGENT_PID and SSH_AUTH_SOCK to fix a regression introduced by the previous fix (rhbz#1352339) --- xinitrc-common | 2 +- xorg-x11-xinit.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xinitrc-common b/xinitrc-common index f4422f1..2700c84 100644 --- a/xinitrc-common +++ b/xinitrc-common @@ -56,7 +56,7 @@ for file in /etc/X11/xinit/xinitrc.d/* ; do done # Prefix launch of session with ssh-agent if available and not already running. -if [ -z "$SSH_AUTH_SOCK" ] && [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then +if [ -z "$SSH_AGENT" ] && [ -z "$SSH_AUTH_SOCK" ] && [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then if [ "x$TMPDIR" != "x" ]; then SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR" else diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec index 02c57b3..f7185ed 100644 --- a/xorg-x11-xinit.spec +++ b/xorg-x11-xinit.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.3.4 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT URL: http://www.x.org @@ -111,6 +111,10 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Wed Dec 14 2016 Hans de Goede - 1.3.4-13 +- Check for all 3 of SSH_AGENT, SSH_AGENT_PID and SSH_AUTH_SOCK to fix + a regression introduced by the previous fix (rhbz#1352339) + * Mon Aug 29 2016 Hans de Goede - 1.3.4-12 - Drop 0001-startx-Pass-nolisten-tcp-by-default.patch this is the server default now