From ffb5259d5f38d61cd75031c5f26ba7bbe88b425d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 May 2013 16:13:30 +1000
Subject: [PATCH 1/2] update to latest git for security fixes (CVE-2013-1991)

---
 .gitignore           |  1 +
 commitid             |  1 +
 libXxf86dga.spec     | 19 ++++++++++++++++---
 make-git-snapshot.sh | 17 +++++++++++++++++
 sources              |  2 +-
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 commitid
 create mode 100755 make-git-snapshot.sh

diff --git a/.gitignore b/.gitignore
index 93b6a13..3c5d254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libXxf86dga-1.1.1.tar.bz2
 /libXxf86dga-1.1.2.tar.bz2
 /libXxf86dga-1.1.3.tar.bz2
+/libXxf86dga-20130524.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..b22aeaa
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+a8dc6be3213bc91dec5e25535ef4bad5a9456af0
diff --git a/libXxf86dga.spec b/libXxf86dga.spec
index 0753b7c..9b01bb4 100644
--- a/libXxf86dga.spec
+++ b/libXxf86dga.spec
@@ -1,12 +1,22 @@
+%global tarball libXxf86dga
+%global gitdate 20130524
+%global gitversion a8dc6be32
+
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.1.3
-Release: 4%{?dist}
+Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
+Source2:    commitid
+%else
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+%endif
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
@@ -27,7 +37,7 @@ Requires: %{name} = %{version}-%{release}
 X.Org X11 libXxf86dga 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 COPYING ChangeLog README
+%doc COPYING README
 %{_libdir}/libXxf86dga.so.1
 %{_libdir}/libXxf86dga.so.1.0.0
 
@@ -63,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/Xxf86dga.h
 
 %changelog
+* Fri May 24 2013 Dave Airlie <airlied@redhat.com> 1.1.3-5.20130524gita8dc6be32
+- update to latest git for security fixes (CVE-2013-1991)
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-4
 - autoreconf for aarch64
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..1f17297
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libXxf86dga-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libXxf86dga $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 838d830..271ddee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7f38465c46e7145782d37dbb9da8c09  libXxf86dga-1.1.3.tar.bz2
+9d8064b1e472f89869a4cdee9b271510  libXxf86dga-20130524.tar.bz2

From 4e16eee95c1c42567bad068d83da1b4a3e3d9096 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 4 Jun 2013 14:09:08 +1000
Subject: [PATCH 2/2] libXxf86dga 1.1.4

---
 .gitignore       | 1 +
 libXxf86dga.spec | 9 ++++++---
 sources          | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c5d254..5f95e2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libXxf86dga-1.1.1.tar.bz2
 /libXxf86dga-1.1.2.tar.bz2
 /libXxf86dga-1.1.3.tar.bz2
 /libXxf86dga-20130524.tar.bz2
+/libXxf86dga-1.1.4.tar.bz2
diff --git a/libXxf86dga.spec b/libXxf86dga.spec
index c88a734..8618f9d 100644
--- a/libXxf86dga.spec
+++ b/libXxf86dga.spec
@@ -1,11 +1,11 @@
 %global tarball libXxf86dga
-%global gitdate 20130524
+#global gitdate 20130524
 %global gitversion a8dc6be32
 
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.1.3
-Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version: 1.1.4
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/Xxf86dga.h
 
 %changelog
+* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.4-1
+- libXxf86dga 1.1.4
+
 * Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-6.20130524gita8dc6be32
 - Require libX11 1.6RC2 for _XEatDataWords
 
diff --git a/sources b/sources
index 271ddee..b556ce9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d8064b1e472f89869a4cdee9b271510  libXxf86dga-20130524.tar.bz2
+d7dd9b9df336b7dd4028b6b56542ff2c  libXxf86dga-1.1.4.tar.bz2