[xorg-x11-drv-nouveau] fix dri2 server crash

[Ben Skeggs]

commit 6ee2c2cf6f1d8f32df756a84ddad8152a0e21d99
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Wed Mar 9 16:40:53 2011 +1000

    fix dri2 server crash

 .gitignore                |    1 +
 sources                   |    2 +-
 xorg-x11-drv-nouveau.spec |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da70491..9b7e020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
 /xf86-video-nouveau-0.0.16-20110117git38e8809.tar.bz2
 /xf86-video-nouveau-0.0.16-20110216git42c16ff.tar.bz2
 /xf86-video-nouveau-0.0.16-20110224gitbc5dec2.tar.bz2
+/xf86-video-nouveau-0.0.16-20110303git92db2bc.tar.bz2
diff --git a/sources b/sources
index 6dd98c6..004fa4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6a1dcfdad1c209993ef65bc17bb82a2  xf86-video-nouveau-0.0.16-20110224gitbc5dec2.tar.bz2
+ae8521492984dc6559bd29eae9775689  xf86-video-nouveau-0.0.16-20110303git92db2bc.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 5caaadb..c4c58d8 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20110224
-%define git_version bc5dec2
+%define gitdate 20110303
+%define git_version 92db2bc
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   21.%{snapshot}%{?dist}
+Release:   22.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Mar 09 2011 Ben Skeggs <bskeggs at redhat.com> - 0.0.16-22
+- prevent server crash if dri2 memory allocation fails
+
 * Mon Feb 28 2011 Peter Hutterer <peter.hutterer at redhat.com> - 1:0.0.16-21.20110224gitbc5dec2
 - Rebuild for server 1.10