Update to latest git to fix the following CVEs:

- CVE-2013-1983
This commit is contained in:
Peter Hutterer 2013-05-24 14:29:09 +10:00
parent 60847b54ce
commit 8f3429c92d
5 changed files with 38 additions and 6 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
libXfixes-4.0.5.tar.bz2 libXfixes-4.0.5.tar.bz2
/libXfixes-5.0.tar.bz2 /libXfixes-5.0.tar.bz2
/libXfixes-20130524.tar.bz2

1
commitid Normal file
View File

@ -0,0 +1 @@
c480fe3271873ec7471b0cbd680f4dac18ca8904

View File

@ -1,12 +1,22 @@
%global tarball libXfixes
%global gitdate 20130524
%global gitversion c480fe327
Summary: X Fixes library Summary: X Fixes library
Name: libXfixes Name: libXfixes
Version: 5.0 Version: 5.0
Release: 5%{?dist} Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
Source0: ftp://ftp.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: xorg-x11-util-macros
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
@ -25,7 +35,7 @@ Requires: pkgconfig
libXfixes development package libXfixes development package
%prep %prep
%setup -q %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%build %build
autoreconf -v --install --force autoreconf -v --install --force
@ -48,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog %doc AUTHORS COPYING README
%{_libdir}/libXfixes.so.3 %{_libdir}/libXfixes.so.3
%{_libdir}/libXfixes.so.3.1.0 %{_libdir}/libXfixes.so.3.1.0
@ -60,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/Xfixes.3* %{_mandir}/man3/Xfixes.3*
%changelog %changelog
* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 5.0-6.20130524gitc480fe327
- Update to latest git to fix the following CVEs:
- CVE-2013-1983
* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 5.0-5 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 5.0-5
- autoreconf for aarch64 - autoreconf for aarch64

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

@ -0,0 +1,17 @@
#!/bin/sh
DIRNAME=libXfixes-$( date +%Y%m%d )
rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/lib/libXfixes $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,2 +1 @@
1b4b8386bd5d1751b2c7177223ad4629 libXfixes-4.0.5.tar.bz2 66eae2f03f8cfd3d12633992eaa1d6ce libXfixes-20130524.tar.bz2
678071bd7f9f7467e2fc712d81022318 libXfixes-5.0.tar.bz2