diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-09 23:34:21 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-09 23:34:21 +0800 |
| commit | 7e8aec51942f00f98efb3affe543123ffe8148f3 (patch) | |
| tree | 13edb45252892f2cf59bfcab8481d689b1a46069 | |
| parent | 00eedbb363c956199ae09a8857dbf13e81246324 (diff) | |
| download | marcuscom-ports-7e8aec51942f00f98efb3affe543123ffe8148f3.tar.gz marcuscom-ports-7e8aec51942f00f98efb3affe543123ffe8148f3.tar.zst marcuscom-ports-7e8aec51942f00f98efb3affe543123ffe8148f3.zip | |
Remove this patch, it launches seahorse-agent instead of ssh-agent when
gdm launches gnome-session. Since seahorse 3.x doesn't ship seahorse-agent
anymore we the patch is bogus.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18873 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/files/patch-data_Xsession.in | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in deleted file mode 100644 index 14fa9788a..000000000 --- a/x11/gdm/files/patch-data_Xsession.in +++ /dev/null @@ -1,39 +0,0 @@ ---- data/Xsession.in.orig 2011-03-11 13:18:54.000000000 +0100 -+++ data/Xsession.in 2011-03-11 13:20:48.000000000 +0100 -@@ -189,12 +189,31 @@ - fi - fi - -+is_gnome=0 -+if [ "x$command" = "xgnome-session" ]; then -+ is_gnome=1 -+fi -+ -+# add seahorse-agent if found -+if [ ${is_gnome} = 1 ]; then -+ seahorseagent="`gdmwhich seahorse-agent`" -+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then -+ command="dbus-launch --exit-with-session $seahorseagent --execute $command" -+ elif [ -z "$seahorseagent" ] ; then -+ echo "$0: seahorse-agent not found!" -+ 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!" -+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched -+# from gnome-session -+if [ ${is_gnome} != 1 ]; then -+ 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 - fi - - echo "$0: Setup done, will execute: $command" |