xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/patches/168_closedir.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+)
New commits:
commit 00ffa5f6a18c64e99276c7025042a5c69737ea3b
Author: Bryce Harrington <bryce@bryce@bryceharrington.org>
Date: Tue Apr 22 14:16:38 2008 -0700
Fix for bug 217647 - crash on PS3 closing unopened dir
diff --git a/debian/changelog b/debian/changelog
index db4959d..e5cdac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
+ [Timo Aaltonen]
* 166_fix_lpl_monitors.diff:
- fix LPL monitors properly (LP: #204065)
* 167_xf86AutoConfig_geode_addition.diff:
- Autodetect geode video devices (LP: #219630)
+ [Bryce Harrington]
+ * 168_closedir.patch:
+ - Fix crash on PS3 due to closing a dir that wasn't successfully opened
+ (LP: #217647)
+
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 11:56:55 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
diff --git a/debian/patches/168_closedir.patch b/debian/patches/168_closedir.patch
new file mode 100644
index 0000000..93c8588
--- /dev/null
+++ b/debian/patches/168_closedir.patch
@@ -0,0 +1,18 @@
+--- xorg-server-patched/hw/xfree86/common/xf86AutoConfig.c~ 2008-02-19 11:16:36.000000000 -0800
++++ xorg-server-patched/hw/xfree86/common/xf86AutoConfig.c 2008-04-18 15:18:36.000000000 -0700
+@@ -450,6 +450,7 @@ chooseVideoDriver(void)
+ }
+ direntry = readdir(idsdir);
+ }
++ closedir(idsdir);
+ }
+
+ /* TODO Handle multiple drivers claiming to support the same PCI ID */
+@@ -478,7 +479,6 @@ chooseVideoDriver(void)
+ i++;
+ }
+ xfree(line);
+- closedir(idsdir);
+
+ return chosen_driver;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ca38a31..48631b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,3 +62,4 @@
165_fedora_xserver-1.5.0-xaa-option-inversion.patch
166_fix_lpl_monitors.diff
167_xf86AutoConfig_geode_addition.diff
+168_closedir.patch
Reply to: