Update to git snapshot to fix the CVEs listed below:

- CVE-2013-1985
This commit is contained in:
Peter Hutterer 2013-05-24 16:14:20 +10:00
parent 43fe8fe524
commit d7a3d4d75d
5 changed files with 37 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
libXinerama-1.1.tar.bz2
/libXinerama-1.1.2.tar.bz2
/libXinerama-20130524.tar.bz2

1
commitid Normal file
View File

@ -0,0 +1 @@
99c644fc8488657bdd106717df7446d606f9ef22

View File

@ -1,12 +1,22 @@
%global tarball libXinerama
%global gitdate 20130524
%global gitversion 99c644fc8
Summary: X.Org X11 libXinerama runtime library
Name: libXinerama
Version: 1.1.2
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: http://xorg.freedesktop.org/archive/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 libXinerama development package
%prep
%setup -q
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%build
autoreconf -v --install --force
@ -51,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog
%doc COPYING
%{_libdir}/libXinerama.so.1
%{_libdir}/libXinerama.so.1.0.0
@ -64,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/X11/extensions/panoramiXext.h
%changelog
* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.2-5.20130524git99c644fc8
- Update to git snapshot to fix the CVEs listed below:
- CVE-2013-1985
* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.2-4
- autoreconf for aarch64

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

@ -0,0 +1,17 @@
#!/bin/sh
DIRNAME=libXinerama-$( date +%Y%m%d )
rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/lib/libXinerama $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 @@
cb45d6672c93a608f003b6404f1dd462 libXinerama-1.1.2.tar.bz2
140f5359542d795ac7e2242bfb4c61ea libXinerama-20130524.tar.bz2