3 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e7bea69c..cc7735140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xorg-server (2:1.5.2-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Shut up rmdir error when trying to remove dirs; this might confuse
     debconf.
 
+  [ Julien Cristau ]
+  * Fix infinite loop on server reset when swrast_dri.so is missing.  Only
+    push swrast on the glx provider stack on first generation, so we don't
+    turn the stack into a circular list (closes: #500287).
+
  -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 21:50:15 +0200
 
 xorg-server (2:1.5.2-1) experimental; urgency=low
diff --git a/debian/patches/03_glx-init-infinite-loop.diff b/debian/patches/03_glx-init-infinite-loop.diff
new file mode 100644
index 000000000..6cf8faa75
--- /dev/null
+++ b/debian/patches/03_glx-init-infinite-loop.diff
@@ -0,0 +1,27 @@
+From 913b9e9b16c02577f7180e020e0a0b6aa7e65352 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 3 Nov 2008 18:07:39 +0100
+Subject: [PATCH] Fix infinite loop on regen when swrast_dri.so is missing.
+
+The swrast DRI provider gets pushed on the glx provider stack at every
+server generation, so the stack turns into a circular list on regen.
+---
+ mi/miinitext.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mi/miinitext.c b/mi/miinitext.c
+index 55faec3..750c425 100644
+--- a/mi/miinitext.c
++++ b/mi/miinitext.c
+@@ -661,7 +661,7 @@ InitExtensions(argc, argv)
+ #endif
+ 
+ #ifdef GLXEXT
+-    GlxPushProvider(&__glXDRISWRastProvider);
++    if (serverGeneration == 1) GlxPushProvider(&__glXDRISWRastProvider);
+     if (!noGlxExtension) GlxExtensionInit();
+ #endif
+ }
+-- 
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 93f18a2fc..512ad5a02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 001_fedora_extramodes.patch
 02_Disable-DRI-in-Xephyr.patch
+03_glx-init-infinite-loop.diff
 #06_use_proc_instead_of_sysfs_for_pci_domains.diff
 13_debian_add_xkbpath_env_variable.diff