[libX11] Udpate to git snapshot to fix CVEs listed below
Peter Hutterer
whot at fedoraproject.org
Fri May 24 01:11:23 UTC 2013
commit 2890ef6f818fcc98952e752211693ee2dc1f9801
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri May 24 11:05:31 2013 +1000
Udpate to git snapshot to fix CVEs listed below
- CVE-2013-1997
- CVE-2013-1981
- CVE-2013-2004
.gitignore | 1 +
commitid | 2 +-
libX11.spec | 25 +++++++++++++++++--------
sources | 2 +-
4 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5bbc3ce..d8bc648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ libX11-1.3.99.901.tar.bz2
/libX11-1.4.99.901.tar.bz2
/libX11-1.5.0.tar.bz2
/libX11-1.5.99.901.tar.bz2
+/libX11-20130524.tar.bz2
diff --git a/commitid b/commitid
index a5fe5ee..16ddd95 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-9da7e230d5320e1556ad2084fcd06ee7994385ea
+a3bdd2b090915fe0163b062f0e6576fe05dd332e
diff --git a/libX11.spec b/libX11.spec
index 418557a..1584cf2 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,18 +1,22 @@
-%define tarball libX11
-#define gitdate 20090805
+%global tarball libX11
+%global gitdate 20130524
+%global gitversion a3bdd2b09
Summary: Core X11 protocol client library
Name: libX11
Version: 1.5.99.901
-Release: 2%{?dist}
+Release: 3%{?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: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
-#Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2
-#Source0: %{tarball}-%{gitdate}.tar.bz2
-#Source1: make-git-snapshot.sh
+%endif
Patch2: dont-forward-keycode-0.patch
BuildRequires: xorg-x11-util-macros >= 1.11
@@ -44,8 +48,7 @@ Requires: %{name} = %{version}-%{release}
X.Org X11 libX11 development package
%prep
-%setup -q
-#setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch2 -p1 -b .dont-forward-keycode-0
%build
@@ -110,6 +113,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/*.5*
%changelog
+* Fri May 24 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-3..20130524gita3bdd2b09
+- Udpate to git snapshot to fix CVEs listed below
+- CVE-2013-1997
+- CVE-2013-1981
+- CVE-2013-2004
+
* Sun Mar 10 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-2
- Add BR for Pod::Usage, needed by compose-chart.pl
diff --git a/sources b/sources
index 1eb426c..44a1ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afee40a518a97b05300c26809d381497 libX11-1.5.99.901.tar.bz2
+eeaf3c7f6a99251e0f84dac2d153c6f0 libX11-20130524.tar.bz2
More information about the scm-commits
mailing list