xorg-server: Changes to 'ubuntu'
debian/changelog | 7 +--
debian/patches/168_glibc_trace_to_stderr.patch | 23 +++++------
debian/patches/169_mipointer_nullptr_checks.patch | 33 +++++++---------
debian/patches/188_default_primary_to_first_busid.patch | 5 ++
debian/patches/series | 4 -
5 files changed, 37 insertions(+), 35 deletions(-)
New commits:
commit 447d94b04c794e6df03431428d625c17312cda0f
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Dec 3 14:09:59 2009 -0800
Refresh patch 168, which we need for apport to catch x crashes.
diff --git a/debian/changelog b/debian/changelog
index 1d75ad4..65a2329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,8 +59,6 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 186_autoconfig_geode.patch: Upstream.
* Patches disabled for now, need a review/refresh or both:
- 135_rethrow_signals.patch - TODO: Refresh
- - 168_glibc_trace_to_stderr.patch
- - 169_mipointer_nullptr_checks.patch
- 190_cache-xkbcomp_output_for_fast_start_up.patch
* 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version.
* control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
diff --git a/debian/patches/168_glibc_trace_to_stderr.patch b/debian/patches/168_glibc_trace_to_stderr.patch
index 0132229..ed218bb 100644
--- a/debian/patches/168_glibc_trace_to_stderr.patch
+++ b/debian/patches/168_glibc_trace_to_stderr.patch
@@ -1,18 +1,17 @@
-Index: xorg-server-1.6.0/hw/xfree86/common/xf86Init.c
-===================================================================
---- xorg-server-1.6.0.orig/hw/xfree86/common/xf86Init.c 2009-03-19 23:19:45.000000000 -0700
-+++ xorg-server-1.6.0/hw/xfree86/common/xf86Init.c 2009-03-19 23:23:22.000000000 -0700
-@@ -1345,8 +1345,12 @@
- signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
- #endif
+Report abort traces to stderr instead of terminal. This enables apport
+to catch the error so it can file a bug report about the crash.
+
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index d3de670..bc44a1a 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -1144,6 +1144,9 @@ OsVendorInit(void)
-- if (!beenHere)
-+ if (!beenHere) {
+ if (!beenHere) {
+ umask(022);
+ /* have glibc report internal abort traces to stderr instead of
+ the controlling terminal */
+ setenv("LIBC_FATAL_STDERR_","1",0);
xf86LogInit();
-+ }
+ }
- /* Set stderr to non-blocking. */
- #ifndef O_NONBLOCK
diff --git a/debian/patches/series b/debian/patches/series
index 5db9ace..cf89cad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,8 +22,8 @@
165_man_xorg_conf_no_device_ident.patch
166_nullptr_xinerama_keyrepeat.patch
167_nullptr_xisbread.patch
-#168_glibc_trace_to_stderr.patch
-#169_mipointer_nullptr_checks.patch
+168_glibc_trace_to_stderr.patch
+169_mipointer_nullptr_checks.patch
172_cwgetbackingpicture_nullptr_check.patch
177_animated_cursor_change_master.patch
184_virtual_devices_autodetect.patch
commit f40f6e6a3157217411d3ce8882c9881a537f13b1
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Dec 3 13:46:49 2009 -0800
Refresh patch 169. The MIPOINTER() macro still returns NULL in some
circumstances, and upstream code is still dereferencing MIPOINTER()
return values without checking for NULL.
diff --git a/debian/changelog b/debian/changelog
index c4546d3..1d75ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 110_fedora_no_move_damage.patch: Upstream dropped it.
- 140_quell_acpi_errmsgs.patch: Superseded.
- 153_make_dmx_compile.patch: Xdmx is fixed upstream.
+ - 156_exevents_copykeyclass_nullptrcheck.patch: No longer needed.
+ Appropriate checks are done on the pointers prior to CopyKeyClass
+ being called now.
- 174_set_bg_pixmap_of_cow_to_none.patch: Upstream
- 180_fedora_no_synaptics_mouse_synthesis.patch: Superseded.
- 181_fedora_log_proc_cmdline.patch: Upstream.
@@ -56,8 +59,6 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 186_autoconfig_geode.patch: Upstream.
* Patches disabled for now, need a review/refresh or both:
- 135_rethrow_signals.patch - TODO: Refresh
- - 156_exevents_copykeyclass_nullptrcheck.patch
- (might not be needed anymore)
- 168_glibc_trace_to_stderr.patch
- 169_mipointer_nullptr_checks.patch
- 190_cache-xkbcomp_output_for_fast_start_up.patch
diff --git a/debian/patches/169_mipointer_nullptr_checks.patch b/debian/patches/169_mipointer_nullptr_checks.patch
index 7565133..10071b3 100644
--- a/debian/patches/169_mipointer_nullptr_checks.patch
+++ b/debian/patches/169_mipointer_nullptr_checks.patch
@@ -15,16 +15,18 @@ whatever reason. Hopefully upstream can provide a better fix for this,
but for now it seems reasonable to check the return values of this macro
for NULL before usage, as a minimum.
+UPDATE: (Dec 3, 2009) Refreshed for xserver 1.7
+
Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
---
mi/mipointer.c | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/mi/mipointer.c b/mi/mipointer.c
-index e37316e..ed0c48c 100644
+index e1f63be..d3032ed 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
-@@ -140,6 +140,10 @@ miPointerCloseScreen (int index, ScreenPtr pScreen)
+@@ -139,6 +139,10 @@ miPointerCloseScreen (int index, ScreenPtr pScreen)
if (DevHasCursor(pDev))
{
pPointer = MIPOINTER(pDev);
@@ -35,7 +37,7 @@ index e37316e..ed0c48c 100644
if (pScreen == pPointer->pScreen)
pPointer->pScreen = 0;
-@@ -192,6 +196,10 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
+@@ -191,6 +195,10 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
return FALSE;
pPointer = MIPOINTER(pDev);
@@ -46,7 +48,7 @@ index e37316e..ed0c48c 100644
pPointer->pCursor = pCursor;
pPointer->pScreen = pScreen;
-@@ -205,6 +213,10 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
+@@ -204,6 +212,10 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
miPointerPtr pPointer;
pPointer = MIPOINTER(pDev);
@@ -57,18 +59,18 @@ index e37316e..ed0c48c 100644
pPointer->limits = *pBox;
pPointer->confined = PointerConfinedToScreen(pDev);
-@@ -304,6 +316,11 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
- BOOL changedScreen = FALSE;
-
+@@ -306,6 +318,11 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+ SetupScreen (pScreen);
pPointer = MIPOINTER(pDev);
+
+ if (pPointer == NULL) {
+ ErrorF("miPointerWarpCursor: Invalid input device pointer\n");
+ return;
+ }
+
- SetupScreen (pScreen);
-
if (pPointer->pScreen != pScreen)
+ {
+ (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE);
@@ -366,6 +383,10 @@ miPointerUpdateSprite (DeviceIntPtr pDev)
return;
@@ -78,9 +80,9 @@ index e37316e..ed0c48c 100644
+ return;
+ }
- pScreen = pPointer->pScreen;
- if (!pScreen)
-@@ -433,13 +454,17 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
+ if (!pPointer)
+ return;
+@@ -436,13 +457,17 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
ScreenPtr pScreen;
miPointerPtr pPointer;
@@ -100,7 +102,7 @@ index e37316e..ed0c48c 100644
pPointer->limits.x2 = pScreen->width;
pPointer->limits.y2 = pScreen->height;
}
-@@ -475,6 +500,10 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
+@@ -469,6 +494,10 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
SetupScreen(pScreen);
pPointer = MIPOINTER(pDev);
@@ -111,7 +113,7 @@ index e37316e..ed0c48c 100644
/* Hack: We mustn't call into ->MoveCursor for anything but the
* VCP, as this may cause a non-HW rendered cursor to be rendered during
-@@ -504,6 +533,11 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
+@@ -498,6 +527,11 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
miPointerPtr pPointer;
pPointer = MIPOINTER(pDev);
@@ -123,6 +125,3 @@ index e37316e..ed0c48c 100644
pScreen = pPointer->pScreen;
if (!pScreen)
return; /* called before ready */
---
-1.6.0.4
-
commit 35cf2adb4153fbfe05ef7ddf961094714793a975
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Dec 3 13:46:40 2009 -0800
Add description for patch 188
diff --git a/debian/patches/188_default_primary_to_first_busid.patch b/debian/patches/188_default_primary_to_first_busid.patch
index df8f066..4dd4ec9 100644
--- a/debian/patches/188_default_primary_to_first_busid.patch
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -1,3 +1,8 @@
+If there seems to be more than one possible primary device, just
+pick the first device and carry on (LP 459512)
+
+signed-off-by: Bryce Harrington <bryce@canonical.com>
+
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index ac018e7..c00391c 100644
--- a/hw/xfree86/common/xf86pciBus.c
Reply to: