From 3ad5434a883fe624931a3507ceb00a7d3f6dc24a Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Mon, 20 Dec 2010 00:06:02 -0600
Subject: system/gdm: Don't start ssh-agent from gdm - this is user's job

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/gdm/gdm.SlackBuild                         |  7 +++++--
 system/gdm/make_xfce_default_session.diff         | 11 -----------
 system/gdm/patches/do_not_start_ssh-agent.diff    | 18 ++++++++++++++++++
 system/gdm/patches/make_xfce_default_session.diff | 11 +++++++++++
 4 files changed, 34 insertions(+), 13 deletions(-)
 delete mode 100644 system/gdm/make_xfce_default_session.diff
 create mode 100644 system/gdm/patches/do_not_start_ssh-agent.diff
 create mode 100644 system/gdm/patches/make_xfce_default_session.diff

(limited to 'system')

diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild
index 3d11815555..2b9e633d02 100644
--- a/system/gdm/gdm.SlackBuild
+++ b/system/gdm/gdm.SlackBuild
@@ -10,7 +10,7 @@
 
 PRGNAM=gdm
 VERSION=${VERSION:-2.20.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -58,6 +58,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Don't automatically start ssh-agent -- this is the user's job
+patch -p1 < $CWD/patches/patches/do_not_start_ssh-agent.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,7 +86,7 @@ cp $CWD/sessions/* $PKG/usr/share/xsessions
 chmod 0755 $PKG/usr/share/xsessions/*
 
 # Make xfce the default session
-patch -d $PKG -p1 < $CWD/make_xfce_default_session.diff
+patch -d $PKG -p1 < $CWD/patches/make_xfce_default_session.diff
 
 # Let's not clobber the configs
 mv $PKG/etc/X11/gdm/custom.conf $PKG/etc/X11/gdm/custom.conf.new
diff --git a/system/gdm/make_xfce_default_session.diff b/system/gdm/make_xfce_default_session.diff
deleted file mode 100644
index 1b2fcc1ef9..0000000000
--- a/system/gdm/make_xfce_default_session.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/X11/gdm/custom.conf	2009-07-31 00:32:22.065895378 -0500
-+++ b/etc/X11/gdm/custom.conf	2009-07-31 00:32:38.975622851 -0500
-@@ -54,6 +54,8 @@
- 
- [daemon]
- 
-+DefaultSession=xfce.desktop
-+
- [security]
- 
- [xdmcp]
diff --git a/system/gdm/patches/do_not_start_ssh-agent.diff b/system/gdm/patches/do_not_start_ssh-agent.diff
new file mode 100644
index 0000000000..c437bdadf8
--- /dev/null
+++ b/system/gdm/patches/do_not_start_ssh-agent.diff
@@ -0,0 +1,18 @@
+diff -Nur gdm-2.20.11.orig//config/Xsession.in gdm-2.20.11/config/Xsession.in
+--- gdm-2.20.11.orig//config/Xsession.in	2010-06-02 20:06:25.000000000 -0500
++++ gdm-2.20.11/config/Xsession.in	2010-12-20 00:02:58.480225271 -0600
+@@ -213,14 +213,6 @@
+   fi
+ 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
diff --git a/system/gdm/patches/make_xfce_default_session.diff b/system/gdm/patches/make_xfce_default_session.diff
new file mode 100644
index 0000000000..1b2fcc1ef9
--- /dev/null
+++ b/system/gdm/patches/make_xfce_default_session.diff
@@ -0,0 +1,11 @@
+--- a/etc/X11/gdm/custom.conf	2009-07-31 00:32:22.065895378 -0500
++++ b/etc/X11/gdm/custom.conf	2009-07-31 00:32:38.975622851 -0500
+@@ -54,6 +54,8 @@
+ 
+ [daemon]
+ 
++DefaultSession=xfce.desktop
++
+ [security]
+ 
+ [xdmcp]
-- 
cgit v1.2.3