summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2012-06-06 09:19:51 +0000
committerAndreas Proschofsky <suka@gentoo.org>2012-06-06 09:19:51 +0000
commitb0b2e18c3fd7adc072d06440780baa49d04bae10 (patch)
treeda15f3672ca206f82e67af6871a64d6c50ea89bd /gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
parentAnother bunch of GNOME 3.5.2 updates (diff)
downloadsuka-b0b2e18c3fd7adc072d06440780baa49d04bae10.tar.gz
suka-b0b2e18c3fd7adc072d06440780baa49d04bae10.tar.bz2
suka-b0b2e18c3fd7adc072d06440780baa49d04bae10.zip
And the next GNOME 3.5.2 round...
svn path=/; revision=339
Diffstat (limited to 'gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch')
-rw-r--r--gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
new file mode 100644
index 0000000..b1cddf1
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
@@ -0,0 +1,32 @@
+From 1cb1841da3a8fedc1671637e2828d5e361af21fa Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 2 Nov 2010 23:19:31 +0100
+Subject: [PATCH 5/6] ssh-agent handling must be done at xinitrc.d
+
+Gentoo bug: #220603
+---
+ data/Xsession.in | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/data/Xsession.in b/data/Xsession.in
+index 0da187d..aa49b90 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -189,14 +189,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ done
+ fi
+
+-# add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+- command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+- echo "$0: ssh-agent not found!"
+-fi
+-
+ echo "$0: Setup done, will execute: $command"
+
+ eval exec $command
+--
+1.7.3.1
+