[Pkg-xfce-commits] r1895 - desktop/trunk/xfce4-utils/debian/patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-25 06:45:41 +0000 (Fri, 25 Apr 2008)
New Revision: 1895

Added:
   desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
Modified:
   desktop/trunk/xfce4-utils/debian/patches/series
Log:
uncommitted patch /o\


Added: desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	2008-04-25 06:45:41 UTC (rev 1895)
@@ -0,0 +1,20 @@
+diff --git a/scripts/xinitrc.in b/scripts/xinitrc.in
+index 1a00294..b99fb8e 100755
+--- a/scripts/xinitrc.in
++++ b/scripts/xinitrc.in
+@@ -64,12 +64,15 @@ fi
+ 
+ # Use ssh-agent if installed and not already running.  Run it separately
+ # so it populates the environment here, so we can clean it up later.
++# Don't use ssh-agent if it has been disabled in Xsession.options
++if grep -qs ^use-ssh-agent "/etc/X11/Xsession.options"; then
+ sshagent=`which ssh-agent`
+ kill_sshagent=0
+ if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
+ 	eval `$sshagent -s`
+ 	kill_sshagent=1
+ fi
++fi
+ 
+ # Use dbus-launch if installed.
+ if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then

Modified: desktop/trunk/xfce4-utils/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/series	2008-04-25 06:42:43 UTC (rev 1894)
+++ desktop/trunk/xfce4-utils/debian/patches/series	2008-04-25 06:45:41 UTC (rev 1895)
@@ -1 +1,2 @@
 01_xflock4-test-running-screensaver.patch
+02_use-Xsessions.options-for-ssh-agent-handling.patch