commit 6294edc23add72ffee57cb77291e7090636c1d48
Author: Jan Rękorajski <[email protected]>
Date: Mon Jan 20 09:48:38 2014 +0100
- don't add ssh-agent to the command mix, we have separate methodology
for that, and no other DM does this
- rel 8
gdm-xsession.patch | 16 ++++++++++++----
gdm2.20.spec | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/gdm2.20.spec b/gdm2.20.spec
index 91e6e5e..6453c88 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm2.20
Version: 2.20.11
-Release: 7
+Release: 8
License: GPL/LGPL
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
diff --git a/gdm-xsession.patch b/gdm-xsession.patch
index a5447ca..dd6070f 100644
--- a/gdm-xsession.patch
+++ b/gdm-xsession.patch
@@ -12,7 +12,7 @@ diff -urN gdm-2.6.0.3.orig/config/Xsession.in
gdm-2.6.0.3/config/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/config/Xsession.in
gdm-2.6.0.3/config/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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdm2.20.git/commitdiff/6294edc23add72ffee57cb77291e7090636c1d48
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
