Update to git snapshot for CVEs listed below:

- CVE-2013-1992
This commit is contained in:
Peter Hutterer 2013-05-24 15:18:58 +10:00
parent 26a726e04a
commit ace01e287f
5 changed files with 41 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
libdmx-1.1.0.tar.bz2 libdmx-1.1.0.tar.bz2
/libdmx-1.1.1.tar.bz2 /libdmx-1.1.1.tar.bz2
/libdmx-1.1.2.tar.bz2 /libdmx-1.1.2.tar.bz2
/libdmx-20130524.tar.bz2

1
commitid Normal file
View File

@ -0,0 +1 @@
5074d9d64192bd04519a438062b7d5bf216d06ee

View File

@ -1,14 +1,26 @@
%global tarball libdmx
%global gitdate 20130524
%global gitversion 5074d9d64
Summary: X.Org X11 DMX runtime library Summary: X.Org X11 DMX runtime library
Name: libdmx Name: libdmx
Version: 1.1.2 Version: 1.1.2
Release: 3%{?dist} Release: 4%{?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: pkgconfig(xext) BuildRequires: pkgconfig(xext)
BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-util-macros
%description %description
The X.Org X11 DMX (Distributed Multihead X) runtime library. The X.Org X11 DMX (Distributed Multihead X) runtime library.
@ -22,9 +34,10 @@ Requires: %{name} = %{version}-%{release}
The X.Org X11 DMX (Distributed Multihead X) development files. The X.Org X11 DMX (Distributed Multihead X) development files.
%prep %prep
%setup -q %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%build %build
autoreconf -v --install --force
%configure --disable-static %configure --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
@ -44,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING ChangeLog %doc COPYING
%{_libdir}/libdmx.so.1 %{_libdir}/libdmx.so.1
%{_libdir}/libdmx.so.1.0.0 %{_libdir}/libdmx.so.1.0.0
@ -56,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/X11/extensions/dmxext.h %{_includedir}/X11/extensions/dmxext.h
%changelog %changelog
* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.2-4.20130524git5074d9d64
- Update to git snapshot for CVEs listed below:
- CVE-2013-1992
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-3 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

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

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