Update to git snapshot to fix CVEs listed below:

- CVE-2013-1986
This commit is contained in:
Peter Hutterer 2013-05-24 15:47:24 +10:00
parent 8858ae07e1
commit b7544954d9
5 changed files with 38 additions and 5 deletions

1
.gitignore vendored
View File

@ -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

1
commitid Normal file
View File

@ -0,0 +1 @@
c90f74497dbcb96854346435349c6e2207b530c5

View File

@ -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

17
make-git-snapshot.sh Executable file
View File

@ -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

View File

@ -1 +1 @@
0c843636124cc1494e3d87df16957672 libXrandr-1.4.0.tar.bz2
8d8d82d12de5fb99d6480e49a9d8136f libXrandr-20130524.tar.bz2