rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Check for all 3 of SSH_AGENT, SSH_AGENT_PID and SSH_AUTH_SOCK to fix

Browse Source 
a regression introduced by the previous fix (rhbz#1352339)
This commit is contained in:
Hans de Goede 2016-12-14 12:25:14 +01:00
parent 133329260e
commit 777ac9b4d9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinitrc-common
View File

@ -56,7 +56,7 @@ for file in /etc/X11/xinit/xinitrc.d/* ; do
done done
# Prefix launch of session with ssh-agent if available and not already running. # 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 if [ "x$TMPDIR" != "x" ]; then
SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR" SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR"
else else

6
xorg-x11-xinit.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.3.4 Version: 1.3.4
Release: 12%{?dist} Release: 13%{?dist}
License: MIT License: MIT
URL: http://www.x.org 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 %{_datadir}/xsessions/xinit-compat.desktop
%changelog %changelog
* Wed Dec 14 2016 Hans de Goede <hdegoede@redhat.com> - 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 <hdegoede@redhat.com> - 1.3.4-12 * Mon Aug 29 2016 Hans de Goede <hdegoede@redhat.com> - 1.3.4-12
- Drop 0001-startx-Pass-nolisten-tcp-by-default.patch this is the - Drop 0001-startx-Pass-nolisten-tcp-by-default.patch this is the
server default now server default now