Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/dtlogin-integration-02-dbus-launch.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 13693 9c80f5ad363f
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13693
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     1
 
diff -urN dtlogin-integration-0.36.orig/config/Xsession.in dtlogin-integration-0.36.hacked/config/Xsession.in
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     2
 
--- dtlogin-integration-0.36.orig/config/Xsession.in	2008-08-29 12:20:36.000000000 -0100
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     3
 
+++ dtlogin-integration-0.36.hacked/config/Xsession.in	2008-09-19 17:53:48.405539000 -0100
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     4
 
@@ -21,6 +21,16 @@
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     5
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     6
 
 command=/usr/dt/bin/Xsession
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     7
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     8
 
-eval `dbus-launch --exit-with-session --auto-syntax`
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
     9
 
+# Save a copy of the user's SHELL value and restore after dbus-launch command
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    10
 
+shell_saved=$SHELL
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    11
 
+
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    12
 
+# Tell dbus-launch we want the environment value in ksh compatible syntax
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    13
 
+export SHELL=/bin/ksh
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    14
 
+eval `dbus-launch --exit-with-session --sh-syntax`
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    15
 
+
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    16
 
+# unset SHELL and restore user's value
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    17
 
+unset SHELL
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    18
 
+export SHELL=$shell_saved
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    19
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    20
 
 exec $command
9c80f5ad363f 2008-09-19 Ghee Teo <[email protected]>
gheet
parents:
diff changeset 
    21
 
+
upstream/oracle/spec-files