- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)

- Use setup -n instead of -c, and remove extraneous calls to cd from build
    and install sections.
- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.
This commit is contained in:
mharris 2006-06-20 22:12:27 +00:00
parent bd3f2ce0df
commit ed1eb46261

View File

@ -6,11 +6,16 @@
Summary: X.Org X11 developmental X transport library
Name: xorg-x11-xtrans-devel
Version: 1.0.0
Release: 3.2
Release: 4
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xtrans-%{version}.tar.bz2
Source0: http://xorg.freedesktop.org/releases/individual/lib/xtrans-%{version}.tar.bz2
# NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
# at the time I'm committing this to Fedora development, is only a "potential"
# security issue, and does not yet have any known exploit vector.
Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xtrans-1.0.0-setuid.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -23,24 +28,25 @@ Requires(pre): xorg-x11-filesystem >= 0.99.2-3
X.Org X11 developmental X transport library
%prep
%setup -q -c %{name}-%{version}
%setup -q -n xtrans-%{version}
%patch0 -p0 -b .setuid
%build
cd xtrans-%{version}
%configure
# Running 'make' not needed.
%install
rm -rf $RPM_BUILD_ROOT
cd xtrans-%{version}
%makeinstall
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%dir %{_includedir}/X11
%dir %{_includedir}/X11/Xtrans
%{_includedir}/X11/Xtrans/Xtrans.c
@ -57,6 +63,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/xtrans.m4
%changelog
* Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-4
- Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
- Use setup -n instead of -c, and remove extraneous calls to cd from build
and install sections.
- Use "make install DESTDIR=$RPM_BUILD_ROOT" instead of makeinstall macro.
- Added "AUTHORS ChangeLog COPYING INSTALL NEWS README" to doc macro.
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-3.2
- bump again for double-long bug on ppc(64)
@ -84,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
*.pc files, and does not contain any ELF binaries or DSOs, so we disable
debuginfo generation.
* Sun Oct 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
* Sun Oct 02 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
- Use Fedora-Extras style BuildRoot tag
- Add tarball URL