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

xinitrc-common: Do not override SSH_AGENT if already set (rhbz#1067676)

Browse Source
This commit is contained in:
Hans de Goede 2015-02-03 10:16:56 +01:00
parent ff011b3db3
commit 31228d1c07
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xinitrc-common
View File

@ -56,8 +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.
SSH_AGENT= if [ -z "$SSH_AGENT" ] && [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then
if [ -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

8
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: 3%{?dist} Release: 4%{?dist}
License: MIT License: MIT
URL: http://www.x.org URL: http://www.x.org
@ -22,7 +22,8 @@ Source19: xinit-compat
# Fedora specific patches # Fedora specific patches
Patch1: xinit-1.0.2-client-session.patch Patch1: xinit-1.0.2-client-session.patch
# submitted upstream, rhbz#1111684 # This is the Xserver default starting at xorg-x11-server >= 1.17, drop once
# we've that version, rhbz#1111684
Patch2: 0001-startx-Pass-nolisten-tcp-by-default.patch Patch2: 0001-startx-Pass-nolisten-tcp-by-default.patch
# submitted upstream, rhbz#1177513 # submitted upstream, rhbz#1177513
Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch
@ -107,6 +108,9 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
%{_datadir}/xsessions/xinit-compat.desktop %{_datadir}/xsessions/xinit-compat.desktop
%changelog %changelog
* Tue Feb 3 2015 Hans de Goede <hdegoede@redhat.com> - 1.3.4-4
- xinitrc-common: Do not override SSH_AGENT if already set (rhbz#1067676)
* Thu Jan 22 2015 Simone Caronni <negativo17@gmail.com> - 1.3.4-3 * Thu Jan 22 2015 Simone Caronni <negativo17@gmail.com> - 1.3.4-3
- Xorg without root rights breaks by streams redirection (#1177513). - Xorg without root rights breaks by streams redirection (#1177513).
- Format SPEC file; trim changelog. - Format SPEC file; trim changelog.