diff options
| author | marcus <marcus@FreeBSD.org> | 2008-06-09 13:31:11 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2008-06-09 13:31:11 +0800 |
| commit | 454595d71d43b0fffb58b59314004b18872eb325 (patch) | |
| tree | c11bfadb0d2d7efc65fb0e258acbb8abf9b562b4 /x11/gdm | |
| parent | e318ce5feaeceb0d4033b912d68d44894e7b9657 (diff) | |
| download | freebsd-ports-gnome-454595d71d43b0fffb58b59314004b18872eb325.tar.gz freebsd-ports-gnome-454595d71d43b0fffb58b59314004b18872eb325.tar.zst freebsd-ports-gnome-454595d71d43b0fffb58b59314004b18872eb325.zip | |
* Make sure seahorse-agent is only run when we're starting gnome-session
* Run seahorse-agent using dbus-launch
* No longer run ssh-agent when running gnome-session as gnome-keyring-daemon
provides this functionality
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/gdm/files/patch-config_Xsession.in | 42 |
2 files changed, 33 insertions, 11 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 59c799341e8b..96c9cafa2bc3 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -8,7 +8,7 @@ PORTNAME= gdm PORTVERSION= 2.20.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/files/patch-config_Xsession.in b/x11/gdm/files/patch-config_Xsession.in index b97529b0700c..c2f25be0e9dd 100644 --- a/x11/gdm/files/patch-config_Xsession.in +++ b/x11/gdm/files/patch-config_Xsession.in @@ -1,17 +1,39 @@ ---- config/Xsession.in.orig 2008-06-08 09:54:23.000000000 -0400 -+++ config/Xsession.in 2008-06-08 09:56:36.000000000 -0400 -@@ -231,6 +231,14 @@ +--- config/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400 ++++ config/Xsession.in 2008-06-09 01:29:59.000000000 -0400 +@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then fi fi ++is_gnome=0 ++if [ "x$command" = "xgnome-session" ]; then ++ is_gnome=1 ++fi ++ +# add seahorse-agent if found -+seahorseagent="`gdmwhich seahorse-agent`" -+if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then -+ command="$seahorseagent --execute $command" -+elif [ -z "$seahorseagent" ] ; then -+ echo "$0: seahorse-agent not 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 +-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" |