- don't add ssh-agent to the command mix, we have separate methodology

  for that, and no other DM does this
- rel 2

diff --git a/gdm-xsession.patch b/gdm-xsession.patch
index b60d73a7f11f564d9959602455122d00e5e3291d..07b7c0eeeb12db1dd4f0556f1e7a35b93046aafd 100644 (file)
--- a/gdm-xsession.patch
+++ b/gdm-xsession.patch
@@ -12,7 +12,7 @@ diff -urN gdm-2.6.0.3.orig/data/Xsession.in gdm-2.6.0.3/data/Xsession.in
  # Translation stuff
  if [ -x "@EXPANDED_LIBEXECDIR@/gdmtranslate" ] ; then
    gdmtranslate="@EXPANDED_LIBEXECDIR@/gdmtranslate"
-@@ -222,6 +226,23 @@
+@@ -222,14 +226,23 @@
    fi
  fi
  
@@ -33,6 +33,14 @@ diff -urN gdm-2.6.0.3.orig/data/Xsession.in gdm-2.6.0.3/data/Xsession.in
 +    command="$wmstyledir/$command.sh"
 +fi
 +
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+-# 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/gdm.spec b/gdm.spec
index 1413934822ebebd8a9672c0872251874215e28f9..e197b55cf88ce1eac98e2d6c1d71b84076b50ed2 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
 Version:       3.10.0.1
-Release:       1
+Release:       2
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications