xorg: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/apport/source_xorg.py        |    2 +-
 debian/changelog                    |   21 +++++++++++++++++++++
 debian/local/Failsafe/failsafeXinit |    9 +++++----
 3 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 73340f72e6fc0a5e32570e1b8bcede3f7e42a088
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Tue Jan 6 01:58:35 2009 -0800

    Fix for 311442
    Disable terminal (*ubuntu9)

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 30431f3..8f0977d 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -67,7 +67,7 @@ def add_info(report):
         pass
 
     try:
-        script = subprocess.Popen(['xkbcomp', ':0 -'], stdout=subprocess.PIPE)
+        script = subprocess.Popen(['xkbcomp', ':0', '-'], stdout=subprocess.PIPE)
         report['xkbcomp'] = script.communicate()[0]
     except OSError:
         pass
diff --git a/debian/changelog b/debian/changelog
index 053f432..d52e047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xorg (1:7.4~5ubuntu10) UNRELEASED; urgency=low
+
+  * apport/source_xorg.py:  Fix arg list to prevent error
+    'Error: Cannot open display ":0 -"'
+    (LP: #311442)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 06 Jan 2009 01:56:25 -0800
+
+xorg (1:7.4~5ubuntu9) jaunty; urgency=low
+
+  * Disable terminal function entirely
+  * Add x11fnc.sh to provide several general purpose X bash functions
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 22 Dec 2008 00:22:22 -0800
+
+xorg (1:7.4~5ubuntu8) jaunty; urgency=low
+
+  * Disable terminal to prevent root access (LP: #310126)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Sun, 21 Dec 2008 00:05:19 -0800
+
 xorg (1:7.4~5ubuntu7) jaunty; urgency=low
 
   * debian/scripts: Drop vmmouse from -input-all for now, doesn't build
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index d7de93d..2aa5731 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -106,10 +106,10 @@ backup_xorg_conf() {
     fi
 }
 
-run_terminal() {
+#run_terminal() {
 # Causes bug #310126
 #    gnome-terminal
-}
+#}
 
 run_dexconf() {
     backup_xorg_conf || return 1

commit 693641df4cf1823cd3967ee7bc07f99e43dfbfc4
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Sun Dec 21 00:05:04 2008 -0800

    Disable terminal (security issue)

diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 2725d4f..d7de93d 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -45,9 +45,9 @@ display_main_menu() {
           TRUE   LOW_RES_MODE "Run Ubuntu in low-graphics mode for just this session" \
           FALSE  RECONFIGURE "Reconfigure graphics" \
           FALSE  TROUBLESHOOT "Troubleshoot the error" \
-          FALSE  TERMINAL "Open a terminal" \
         --hide-column 2
 
+#          FALSE  TERMINAL "Open a terminal" \
 # TODO:          3 FILE_BUG "Report a bug about this failure" \
 }
 
@@ -107,7 +107,8 @@ backup_xorg_conf() {
 }
 
 run_terminal() {
-    gnome-terminal
+# Causes bug #310126
+#    gnome-terminal
 }
 
 run_dexconf() {