From b7544954d94ce2a7025103232dbe7db26eeafe26 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 24 May 2013 15:47:24 +1000
Subject: [PATCH] Update to git snapshot to fix CVEs listed below:

- CVE-2013-1986
---
 .gitignore           |  1 +
 commitid             |  1 +
 libXrandr.spec       | 22 ++++++++++++++++++----
 make-git-snapshot.sh | 17 +++++++++++++++++
 sources              |  2 +-
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 commitid
 create mode 100755 make-git-snapshot.sh

diff --git a/.gitignore b/.gitignore
index 9055bc8..bd6271a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libXrandr-1.2.99.4.tar.bz2
 libXrandr-1.3.0.tar.bz2
 /libXrandr-1.3.1.tar.bz2
 /libXrandr-1.4.0.tar.bz2
+/libXrandr-20130524.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..6034a05
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+c90f74497dbcb96854346435349c6e2207b530c5
diff --git a/libXrandr.spec b/libXrandr.spec
index b76b027..0e74ddb 100644
--- a/libXrandr.spec
+++ b/libXrandr.spec
@@ -1,13 +1,23 @@
+%global tarball libXrandr
+%global gitdate 20130524
+%global gitversion c90f74497
+
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
+Source2:    commitid
+%else
+Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+%endif
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
@@ -28,7 +38,7 @@ Requires: %{name} = %{version}-%{release}
 X.Org X11 libXrandr development package
 
 %prep
-%setup -q
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force
@@ -50,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING
 %{_libdir}/libXrandr.so.2
 %{_libdir}/libXrandr.so.2.2.0
 
@@ -63,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.4.0-4.20130524gitc90f74497
+- Update to git snapshot to fix CVEs listed below:
+- CVE-2013-1986
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.0-3
 - autoreconf for aarch64
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..2c38e4a
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libXrandr-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libXrandr $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/sources b/sources
index a3b3674..c2735cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c843636124cc1494e3d87df16957672  libXrandr-1.4.0.tar.bz2
+8d8d82d12de5fb99d6480e49a9d8136f  libXrandr-20130524.tar.bz2