diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 00:06:02 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 00:06:02 -0600 |
| commit | 3ad5434a883fe624931a3507ceb00a7d3f6dc24a (patch) | |
| tree | bf25d3196fe2921470c9e0f0d4d4cc7add692ed0 | |
| parent | 3f7c858b5ceb1159496d6ae4660b335c28be4363 (diff) | |
system/gdm: Don't start ssh-agent from gdm - this is user's job
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | system/gdm/gdm.SlackBuild | 7 | ||||
| -rw-r--r-- | system/gdm/patches/do_not_start_ssh-agent.diff | 18 | ||||
| -rw-r--r-- | system/gdm/patches/make_xfce_default_session.diff (renamed from system/gdm/make_xfce_default_session.diff) | 0 |
3 files changed, 23 insertions, 2 deletions
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild index 3d1181555564d..2b9e633d02bb5 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/patches/do_not_start_ssh-agent.diff b/system/gdm/patches/do_not_start_ssh-agent.diff new file mode 100644 index 0000000000000..c437bdadf87ae --- /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/make_xfce_default_session.diff b/system/gdm/patches/make_xfce_default_session.diff index 1b2fcc1ef9406..1b2fcc1ef9406 100644 --- a/system/gdm/make_xfce_default_session.diff +++ b/system/gdm/patches/make_xfce_default_session.diff |