[xorg-x11-server] Git snapshot 98cde254acb9b98337ddecf64c138d38c14ec2bf xserver-1.11.99-optionstr.patch: drop 0001-Xex

[Peter Hutterer]

commit 9aad602913a2e87aad78568a0f8668a70d0a3fee
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jan 4 08:23:18 2012 +1000

    Git snapshot 98cde254acb9b98337ddecf64c138d38c14ec2bf
    xserver-1.11.99-optionstr.patch: drop
    0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch: drop

 .gitignore                                         |    1 +
 ...-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch |   37 --------------------
 commitid                                           |    2 +-
 sources                                            |    2 +-
 xorg-x11-server.spec                               |   17 ++++-----
 xserver-1.11.99-optionstr.patch                    |   27 --------------
 xserver-1.6.0-displayfd.patch                      |   16 ++++----
 7 files changed, 19 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81f6fe2..7a2e632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.11.0.tar.bz2
 /xorg-server-1.11.1.tar.bz2
 /xorg-server-20111109.tar.xz
+/xorg-server-20120103.tar.xz
diff --git a/commitid b/commitid
index 80e4f15..832a426 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-f0d50cc6651dce3a8a3cd3fb84210aa92b139763
+98cde254acb9b98337ddecf64c138d38c14ec2bf
diff --git a/sources b/sources
index 19a555f..2a150b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36962a81cacca200673a687651865dcc  xorg-server-20111109.tar.xz
+1d57316232fb6d617b844639456239a6  xorg-server-20120103.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index d030949..a650056 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-%define gitdate 20111109
+%define gitdate 20120103
 %define stable_abi 0
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.11.99.1
-Release:   11%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.11.99.901
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -98,12 +98,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 # tests require Xorg
 Patch7007: xserver-1.10.99.1-test.patch
 
-# Fix selinux build error
-Patch7010: 0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch
-
-# missing file needed to build other stuff
-Patch7011: xserver-1.11.99-optionstr.patch
-
 # always install xaa headers even though we don't build the module
 Patch7012: xserver-1.12-xaa-sdk-headers.patch
 
@@ -562,6 +556,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jan 03 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.11.99.901-1.20120103
+- Git snapshot 98cde254acb9b98337ddecf64c138d38c14ec2bf
+- xserver-1.11.99-optionstr.patch: drop
+- 0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch: drop
+
 * Fri Dec 16 2011 Adam Jackson <ajax at redhat.com> 1.11.99.1-11
 - Always install XAA SDK headers so drivers still build
 
diff --git a/xserver-1.6.0-displayfd.patch b/xserver-1.6.0-displayfd.patch
index 36e92cd..1eec93a 100644
--- a/xserver-1.6.0-displayfd.patch
+++ b/xserver-1.6.0-displayfd.patch
@@ -1,7 +1,7 @@
-From f14a89c627d9c4d790cc6785dd6628c9bda1c317 Mon Sep 17 00:00:00 2001
+From 47d4a39c0c82d45b8e0eada36d14c233dbb1cff2 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Thu, 18 Jun 2009 16:56:41 +1000
-Subject: [PATCH 3/9] displayfd hack
+Subject: [PATCH] displayfd hack
 
 ---
  dix/globals.c    |    1 +
@@ -35,7 +35,7 @@ index 5c70717..f23203f 100644
  extern _X_EXPORT int defaultBackingStore;
  extern _X_EXPORT Bool disableBackingStore;
 diff --git a/os/connection.c b/os/connection.c
-index 0c580ab..1acdb7f 100644
+index 8a677a7..fea227a 100644
 --- a/os/connection.c
 +++ b/os/connection.c
 @@ -145,6 +145,7 @@ Bool AnyClientsWriteBlocked;	/* true if some client blocked on write */
@@ -63,7 +63,7 @@ index 0c580ab..1acdb7f 100644
 +{
 +    char port[20];
 +
-+    sprintf(port, "%d", num);
++    snprintf (port, sizeof(port), "%d", num);
 +
 +    return _XSERVTransMakeAllCOTSServerListeners(port, partial,
 +						 &ListenTransCount,
@@ -85,7 +85,7 @@ index 0c580ab..1acdb7f 100644
  
      FD_ZERO (&WellKnownConnections);
  
--    sprintf (port, "%d", atoi (display));
+-    snprintf (port, sizeof(port), "%d", atoi (display));
 -
 -    if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial,
 -	&ListenTransCount, &ListenTransConns) >= 0) &&
@@ -149,10 +149,10 @@ index 0c580ab..1acdb7f 100644
      }
  
 diff --git a/os/utils.c b/os/utils.c
-index 36cb46f..6338860 100644
+index 6461ed5..17860df 100644
 --- a/os/utils.c
 +++ b/os/utils.c
-@@ -660,6 +660,17 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -661,6 +661,17 @@ ProcessCommandLine(int argc, char *argv[])
  	    else
  		UseMsg();
  	}
@@ -171,5 +171,5 @@ index 36cb46f..6338860 100644
  	else if ( strcmp( argv[i], "dpms") == 0)
  	    /* ignored for compatibility */ ;
 -- 
-1.7.4.4
+1.7.7.4