diff --git a/SOURCES/0001-xwininfo-do-not-segfault-on-IO-error.patch b/SOURCES/0001-xwininfo-do-not-segfault-on-IO-error.patch new file mode 100644 index 0000000..7cebf63 --- /dev/null +++ b/SOURCES/0001-xwininfo-do-not-segfault-on-IO-error.patch @@ -0,0 +1,35 @@ +From 0c49f8f2bd56b1e77721e81030ea948386dcdf4e Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Tue, 6 Jan 2015 11:57:33 +0100 +Subject: [PATCH] xwininfo: do not segfault on IO error + +If the connection to the X server is lost while waiting for +the user to select a window interactively, xwininfo segfaults. + +This is a regression introduced with the port to XCB, because +xcb_wait_for_event() can return NULL in case of an IO error and +xwininfo does not check for the actual returned value. + +Signed-off-by: Olivier Fourdan +Reviewed-by: Adam Jackson +Signed-off-by: Peter Hutterer +--- + dsimple.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dsimple.c b/dsimple.c +index 6432e13..ca746e9 100644 +--- a/dsimple.c ++++ b/dsimple.c +@@ -205,6 +205,8 @@ xcb_window_t Select_Window(xcb_connection_t *dpy, + xcb_allow_events (dpy, XCB_ALLOW_SYNC_POINTER, XCB_TIME_CURRENT_TIME); + xcb_flush (dpy); + event = xcb_wait_for_event (dpy); ++ if (event == NULL) ++ Fatal_Error ("Fatal IO error"); + switch (event->response_type & 0x7f) { + case XCB_BUTTON_PRESS: + { +-- +2.5.0 + diff --git a/SOURCES/make-edid-decode-snapshot.sh b/SOURCES/make-edid-decode-snapshot.sh new file mode 100755 index 0000000..7960b9e --- /dev/null +++ b/SOURCES/make-edid-decode-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=edid-decode-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/app/edid-decode $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 cf - $DIRNAME | xz -c9 > $DIRNAME.tar.xz +rm -rf $DIRNAME diff --git a/SPECS/xorg-x11-utils.spec b/SPECS/xorg-x11-utils.spec new file mode 100644 index 0000000..c40fa68 --- /dev/null +++ b/SPECS/xorg-x11-utils.spec @@ -0,0 +1,270 @@ +%define pkgname utils + +Summary: X.Org X11 X client utilities +Name: xorg-x11-%{pkgname} +Version: 7.5 +Release: 23%{?dist} +License: MIT +Group: User Interface/X +URL: http://www.x.org + +Source0: https://www.x.org/pub/individual/app/xdpyinfo-1.3.2.tar.bz2 +Source2: https://www.x.org/pub/individual/app/xev-1.2.2.tar.bz2 +Source5: https://www.x.org/pub/individual/app/xlsatoms-1.1.2.tar.bz2 +Source6: https://www.x.org/pub/individual/app/xlsclients-1.1.4.tar.bz2 +Source7: https://www.x.org/pub/individual/app/xlsfonts-1.0.6.tar.bz2 +Source8: https://www.x.org/pub/individual/app/xprop-1.2.3.tar.bz2 +Source9: https://www.x.org/pub/individual/app/xvinfo-1.1.3.tar.bz2 +Source10: https://www.x.org/pub/individual/app/xwininfo-1.1.3.tar.bz2 + +Source100: edid-decode-20170328.tar.xz +Source101: make-edid-decode-snapshot.sh + +Patch1: 0001-xwininfo-do-not-segfault-on-IO-error.patch + +BuildRequires: autoconf automake libtool +BuildRequires: pkgconfig(xorg-macros) +BuildRequires: pkgconfig(dmx) pkgconfig(gl) pkgconfig(xext) pkgconfig(xft) +BuildRequires: pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xmu) pkgconfig(xrandr) +BuildRequires: pkgconfig(xpm) pkgconfig(xt) pkgconfig(xtst) pkgconfig(xv) +BuildRequires: pkgconfig(xxf86dga) pkgconfig(xxf86misc) pkgconfig(xxf86vm) +BuildRequires: pkgconfig(xcb) pkgconfig(xcb-atom) +BuildRequires: gettext-devel + +Provides: edid-decode xdpyinfo xev xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo + +%description +A collection of client utilities which can be used to query the X server +for various information. + +%prep +%setup -q -c %{name}-%{version} -a2 -a5 -a6 -a7 -a8 -a9 -a10 -a100 + +pushd xwininfo-* +%patch1 -p1 +popd + +%build +# Build all apps +{ + for app in * ; do + pushd $app + if [ -e ./configure ] ; then + autoreconf -vif + %configure + fi + make + popd + done +} + +%install +rm -rf $RPM_BUILD_ROOT +# Install all apps +{ + for app in * ; do + pushd $app + make install DESTDIR=$RPM_BUILD_ROOT + popd + done +} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc +%{_bindir}/edid-decode +%{_bindir}/xdpyinfo +%{_bindir}/xev +%{_bindir}/xlsatoms +%{_bindir}/xlsclients +%{_bindir}/xlsfonts +%{_bindir}/xprop +%{_bindir}/xvinfo +%{_bindir}/xwininfo +%{_mandir}/man1/edid-decode.1* +%{_mandir}/man1/xdpyinfo.1* +%{_mandir}/man1/xev.1* +%{_mandir}/man1/xlsatoms.1* +%{_mandir}/man1/xlsclients.1* +%{_mandir}/man1/xlsfonts.1* +%{_mandir}/man1/xprop.1* +%{_mandir}/man1/xvinfo.1* +%{_mandir}/man1/xwininfo.1* + +%changelog +* Tue May 22 2018 Adam Jackson - 7.5-23 +- xlsclients 1.1.4 +- xlsfonts 1.0.6 +- xprop 1.2.3 +- HTTPS URLs + +* Tue Mar 28 2017 Adam Jackson - 7.5-22 +- New edid-decode snapshot + +* Wed Feb 08 2017 Adam Jackson - 7.5-21 +- Sync with F25: xdpyinfo 1.3.2, xev 1.2.2, xlsatoms 1.1.2, xlsclients 1.1.3, + xlsfonts 1.0.5, xvinfo 1.1.3 + +* Tue Mar 22 2016 Olivier Fourdan 7.5-14 +- xwininfo: fix segfault on IO error (#1310021) + +* Wed Feb 12 2014 Adam Jackson 7.5-13.1 +- Mass rebuild + +* Wed Jan 29 2014 Adam Jackson 7.5-13 +- New edid-decode snapshot + +* Fri Aug 09 2013 Peter Hutterer 7.5-12 +- Update sources for latest tarballs, some changes got lost before the commit +- require gettext-devel for AM_ICONV (now required by xwininfo) + +* Fri Aug 09 2013 Peter Hutterer 7.5-11 +- xprop 1.2.2 +- xwininfo 1.1.2 +- xdpyinfo 1.3.1 +- xvinfo 1.1.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 7.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Mar 07 2013 Dave Airlie 7.5-9 +- autoreconf for aarch64 + +* Wed Jan 30 2013 Peter Hutterer 7.5-8 +- xev 1.2.1 +- xlsatoms 1.1.1 +- xlsfonts 1.0.4 +- xwininfo 1.1.2 + +* Sun Jul 22 2012 Fedora Release Engineering - 7.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 7.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Adam Jackson 7.5-5 +- xlsclients 1.1.2 +- Rebuild for new xcb-util + +* Wed Nov 09 2011 Adam Jackson 7.5-4 +- xdpyinfo 1.3.0 + +* Mon Sep 12 2011 Adam Jackson 7.5-3 +- xprop 1.2.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 08 2010 Peter Hutterer 7.5-1 +- xvinfo 1.1.1 +- xev 1.1.0 +- xdpyinfo 1.2.0 +- xwininfo 1.1.0 +- xlsclients 1.1.0 +- xlsfonts 1.0.3 + +* Fri Jun 04 2010 Adam Jackson 7.4-10 +- xlsatoms 1.1.0 +- xlsclients 1.1.0 + +* Fri Feb 05 2010 Adam Jackson 7.4-9 +- edid-decode snapshot + +* Mon Oct 19 2009 Adam Jackson 7.4-8 +- xdpyinfo 1.1.0 +- xlsclients 1.0.2 +- xvinfo 1.1.0 + +* Tue Oct 13 2009 Adam Jackson 7.4-7 +- xev 1.0.4 +- xlsatoms 1.0.2 +- xprop 1.1.0 +- xwininfo 1.0.5 + +* Mon Jul 27 2009 Fedora Release Engineering - 7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 02 2009 Adam Jackson 7.4-5 +- Drop xfd and xfontsel, move them to -apps to isolate libXaw deps. + +* Thu Feb 26 2009 Fedora Release Engineering - 7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jul 27 2008 Adam Jackson 7.4-3 +- Drop xdriinfo. Would be better suited to being in Mesa's glx-utils + subpackage anyway. (#456609) + +* Tue Jul 15 2008 Adam Jackson 7.4-2 +- Fix license tag. + +* Wed Jul 02 2008 Adam Jackson 7.4-1 +- xdpyinfo 1.0.3 +- xprop 1.0.4 +- xwininfo 1.0.4 + +* Fri Apr 25 2008 Adam Jackson 7.3-3 +- xdpyinfo-1.0.2-silence-misc-errors.patch: Make xf86misc and xf86dga protocol + errors non-fatal. (#442176) + +* Wed Feb 20 2008 Fedora Release Engineering - 7.3-2 +- Autorebuild for GCC 4.3 + +* Mon Sep 24 2007 Adam Jackson 7.3-1 +- xdriinfo 1.0.2 +- xwininfo 1.0.3 +- Bump to 7.3 + +* Fri Aug 17 2007 Dave Airlie 7.2-1 +- xfontsel 1.0.2, xlsfonts 1.0.2, xvinfo 1.0.2, xprop 1.0.3 + +* Mon Mar 26 2007 Adam Jackson 7.1-4 +- xdpyinfo 1.0.2 + +* Tue Jan 30 2007 Adam Jackson 7.1-3 +- Fix man page glob and rebuild for FC7. + +* Wed Jul 19 2006 Mike A. Harris 7.1-2.fc6 +- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021) +- Add 'dist' tag to package release string. + +* Wed Jul 12 2006 Jesse Keating 7.1-1.1 +- rebuild + +* Wed Jun 21 2006 Mike A. Harris 7.1-1 +- Bump package version to 7.1 to reflect the X11 release the utilities + are aggregated from. +- Updated to xdriinfo-1.0.1, xev-1.0.2, xwininfo-1.0.2 from X11R7.1 + +* Wed May 31 2006 Adam Jackson 1.0.1-3 +- Fix BuildRequires (#191966) + +* Tue Apr 25 2006 Adam Jackson 1.0.1-2 +- Remove a spurious Xprint dependency from xdpyinfo. + +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all tarballs to versions from X11R7.0 + +* Sat Dec 17 2005 Mike A. Harris 1.0.0-1 +- Updated all tarballs to version 1.0.0 from X11R7 RC4. +- Changed manpage dir from man1x to man1 to match upstream RC4 default. +- Moved all app-defaults files from _libdir to _datadir + +* Mon Nov 14 2005 Jeremy Katz 0.99.2-3 +- require newer filesystem package (#172610) + +* Mon Nov 14 2005 Jeremy Katz 0.99.2-2 +- rebuild + +* Fri Nov 11 2005 Mike A. Harris 0.99.2-1 +- Initial build, with all apps taken from X11R7 RC2 +- Use "make install DESTDIR=$RPM_BUILD_ROOT" as the makeinstall macro fails on + some packages.