cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better startup sequence for ssh-agent, seahorse-agent and

Browse Source 
ck-launch-session.
This commit is contained in:
ajacoutot 2010-08-21 19:08:17 +00:00
parent dd5e40f963
commit a281cc5565
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/gdm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.77 2010/07/25 08:15:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.78 2010/08/21 19:08:17 ajacoutot Exp $
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 2.20.11
REVISION= 1
REVISION= 2
HOMEPAGE= http://projects.gnome.org/gdm/

22
x11/gnome/gdm/patches/patch-config_Xsession_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config_Xsession_in,v 1.11 2010/07/07 16:37:05 ajacoutot Exp $
$OpenBSD: patch-config_Xsession_in,v 1.12 2010/08/21 19:08:17 ajacoutot Exp $
--- config/Xsession.in.orig Thu Jun 3 03:06:25 2010
+++ config/Xsession.in Mon Jul 5 19:53:14 2010
+++ config/Xsession.in Thu Aug 5 18:43:40 2010
@@ -23,6 +23,8 @@
# based on:
# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
@ -20,7 +20,7 @@ $OpenBSD: patch-config_Xsession_in,v 1.11 2010/07/07 16:37:05 ajacoutot Exp $
else
if [ -n "$zenity" ] ; then
disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."`
@@ -213,12 +218,34 @@ if [ "x$command" = "xdefault" ] ; then
@@ -213,12 +218,32 @@ if [ "x$command" = "xdefault" ] ; then
fi
fi
@ -40,18 +40,16 @@ $OpenBSD: patch-config_Xsession_in,v 1.11 2010/07/07 16:37:05 ajacoutot Exp $
+
+fi
+
+# GDM 2.20.X is too old to support new versions of ConsoleKit natively
+cklaunch="`gdmwhich ck-launch-session`"
+if [ -n "$cklaunch" ] && [ -x "$cklaunch" ] ; then
+ command="$cklaunch $command"
+fi
+
+# add seahorse-agent if found
+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!"
+ eval `$seahorseagent`
+fi
+
+# GDM 2.20.X is too old to support new versions of ConsoleKit natively
+cklaunch="`gdmwhich ck-launch-session`"
+if [ -n "$cklaunch" ] && [ -x "$cklaunch" ] && [ -z "$XDG_SESSION_COOKIE" ] ; then
+ command="$cklaunch $command"
fi
echo "$0: Setup done, will execute: $command"