[xorg-x11-apps] x11perf 1.5.4 - fixes CVE-2011-2504

[Dave Airlie]

commit 175842b1fe2362268ecf797f6f8975e2e37488b7
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Sep 12 16:32:47 2012 +1000

    x11perf 1.5.4 - fixes CVE-2011-2504

 .gitignore         |    1 +
 sources            |    2 +-
 xorg-x11-apps.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ceca05..ba49062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ xinput-1.5.3.tar.bz2
 xkill-1.0.3.tar.bz2
 xeyes-1.1.1.tar.bz2
 /x11perf-1.5.3.tar.bz2
+/x11perf-1.5.4.tar.bz2
diff --git a/sources b/sources
index deeaa15..efda0f2 100644
--- a/sources
+++ b/sources
@@ -16,4 +16,4 @@ cb9377b09e562e4084cc614a44df2641  luit-1.1.0.tar.bz2
 e40eeb4454f2a7cdde3a14f5dfd3aadd  xvidtune-1.0.2.tar.bz2
 b9102fe787eda2a1c9578079d8f55eed  xclipboard-1.1.1.tar.bz2
 a3035dcecdbdb89e864177c080924981  xeyes-1.1.1.tar.bz2
-c3ac3667a6f5c3cead9847fbf4b5f36e  x11perf-1.5.3.tar.bz2
+5c3c7431a38775caaea6051312a49bc9  x11perf-1.5.4.tar.bz2
diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec
index 0cb8eaf..ee7d2ce 100644
--- a/xorg-x11-apps.spec
+++ b/xorg-x11-apps.spec
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Wed Sep 12 2012 Dave Airlie <airlied at redhat.com> 7.6-7
+- x11perf 1.5.4 - fixes CVE-2011-2504
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild