update for CVE fixes (CVE-2013-1988)
This commit is contained in:
parent
882b86e078
commit
64d18318bb
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
libXres-1.0.4.tar.bz2
|
libXres-1.0.4.tar.bz2
|
||||||
/libXres-1.0.5.tar.bz2
|
/libXres-1.0.5.tar.bz2
|
||||||
/libXres-1.0.6.tar.bz2
|
/libXres-1.0.6.tar.bz2
|
||||||
|
/libXres-20130524.tar.bz2
|
||||||
|
19
libXres.spec
19
libXres.spec
@ -1,12 +1,22 @@
|
|||||||
|
%global tarball libXres
|
||||||
|
%global gitdate 20130524
|
||||||
|
%global gitversion f46818496
|
||||||
|
|
||||||
Summary: X-Resource extension client library
|
Summary: X-Resource extension client library
|
||||||
Name: libXres
|
Name: libXres
|
||||||
Version: 1.0.6
|
Version: 1.0.6
|
||||||
Release: 4%{?dist}
|
Release: 5%{?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
|
||||||
|
|
||||||
|
%if 0%{?gitdate}
|
||||||
|
Source0: %{tarball}-%{gitdate}.tar.bz2
|
||||||
|
Source1: make-git-snapshot.sh
|
||||||
|
Source2: commitid
|
||||||
|
%else
|
||||||
Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
|
Source0: ftp://ftp.x.org/pub/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: %{name} = %{version}-%{release}
|
|||||||
X.Org X11 libXres development package
|
X.Org X11 libXres 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 ChangeLog
|
%doc AUTHORS COPYING
|
||||||
%{_libdir}/libXRes.so.1
|
%{_libdir}/libXRes.so.1
|
||||||
%{_libdir}/libXRes.so.1.0.0
|
%{_libdir}/libXRes.so.1.0.0
|
||||||
|
|
||||||
@ -61,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man3/*.3*
|
%{_mandir}/man3/*.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 24 2013 Dave Airlie <airlied@redhat.com> 1.0.6-5.20130524gitf46818496
|
||||||
|
- update for CVE fixes (CVE-2013-1988)
|
||||||
|
|
||||||
* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-4
|
* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-4
|
||||||
- autoreconf for aarch64
|
- autoreconf for aarch64
|
||||||
|
|
||||||
|
17
make-git-snapshot.sh
Executable file
17
make-git-snapshot.sh
Executable file
@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
DIRNAME=libXres-$( date +%Y%m%d )
|
||||||
|
|
||||||
|
rm -rf $DIRNAME
|
||||||
|
git clone git://git.freedesktop.org/git/xorg/lib/libXRes $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
|
Loading…
Reference in New Issue
Block a user