From 930675b78bc25d02f0c62bb0bfa690bb2d539641 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:04:59 +0000 Subject: [PATCH 01/96] Initialize branch F-10 for libXi --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 6633f521bb3a65b93154863e3590ff4d3f3b662e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 3 Dec 2008 16:05:45 +0000 Subject: [PATCH 02/96] libXi 1.2.0 --- .cvsignore | 2 +- import.log | 1 + libXi.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 9dd55e2..1a3179d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-1.1.3.tar.bz2 +libXi-1.2.0.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..8d3276e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libXi-1_2_0-1_fc11:HEAD:libXi-1.2.0-1.fc11.src.rpm:1228320319 diff --git a/libXi.spec b/libXi.spec index 86b71fb..30f68da 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: xorg-x11-proto-devel +BuildRequires: pkgconfig(inputproto) = 1.5.0 BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXau-devel @@ -74,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Dec 03 2008 Adam Jackson 1.2.0-1 +- libXi 1.2.0 + * Tue Feb 19 2008 Fedora Release Engineering - 1.1.3-4 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 51a5b8a..43b01f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c510abb0cad8dc20493fb27ff7859d8 libXi-1.1.3.tar.bz2 +4b88e07d7dd77ca1e786f09066b58c02 libXi-1.2.0.tar.bz2 From 1391f255aed5ee3e0cfd7bc6901e229ec0bf6327 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 13:21:45 +0000 Subject: [PATCH 03/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 30f68da..317071b 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Dec 03 2008 Adam Jackson 1.2.0-1 - libXi 1.2.0 From 660748888d629708509bf9eb6639dedc07aed687 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Feb 2009 23:33:07 +0000 Subject: [PATCH 04/96] - libXi 1.2.1 --- .cvsignore | 2 +- libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1a3179d..edce4cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-1.2.0.tar.bz2 +libXi-1.2.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 317071b..b26e7e9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Feb 26 2009 Peter Hutterer - 1.2.1-1 +- libXi 1.2.1 + * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 43b01f1..cb5ac49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b88e07d7dd77ca1e786f09066b58c02 libXi-1.2.0.tar.bz2 +cfb36307e8e7ffafe40848dba24e0b11 libXi-1.2.1.tar.bz2 From 1c2dc742eb8a9706d9d1933e42ba2483bb346458 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 19 Jun 2009 06:58:27 +0000 Subject: [PATCH 05/96] - Update to today's git master --- .cvsignore | 2 +- libXi.spec | 32 ++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index edce4cb..1c85b10 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-1.2.1.tar.bz2 +libXi-20090619.tar.bz2 diff --git a/libXi.spec b/libXi.spec index b26e7e9..42872f7 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,19 +1,27 @@ +%define tarball libXi +%define gitdate 20090619 + Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.2.1 -Release: 1%{?dist} +Version: 1.2.99 +Release: 1.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) = 1.5.0 +BuildRequires: pkgconfig(inputproto) >= 1.9.99.12 BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXau-devel +BuildRequires: xmlto asciidoc >= 8.4.5 %description X.Org X11 libXi runtime library @@ -31,18 +39,21 @@ Requires: pkgconfig X.Org X11 libXi development package %prep -%setup -q +#%setup -q +%setup -q -n %{tarball}-%{gitdate} # Disable static library creation by default. %define with_static 0 %build - +autoreconf -v --install || exit 1 %configure \ %if ! %{with_static} --disable-static %endif -make %{?_smp_mflags} + +# FIXME: parallel builds disabled. Man page hate. +make #%{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -60,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog +%doc COPYING %{_libdir}/libXi.so.6 %{_libdir}/libXi.so.6.0.0 @@ -69,12 +80,17 @@ rm -rf $RPM_BUILD_ROOT %if %{with_static} %{_libdir}/libXi.a %endif +%{_includedir}/X11/extensions/XInput.h +%{_includedir}/X11/extensions/XInput2.h %{_libdir}/libXi.so %{_libdir}/pkgconfig/xi.pc #%dir %{_mandir}/man3x %{_mandir}/man3/*.3* %changelog +* Fri Jun 19 2009 Peter Hutterer 1.2.99-1.20090619 +- Update to today's git master + * Thu Feb 26 2009 Peter Hutterer - 1.2.1-1 - libXi 1.2.1 diff --git a/sources b/sources index cb5ac49..84c7366 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfb36307e8e7ffafe40848dba24e0b11 libXi-1.2.1.tar.bz2 +e1d6d5d3b809254d698bfe04e845c09b libXi-20090619.tar.bz2 From c9c75d186ce75e1bceaf9b58f27c4180c7f319bb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 19 Jun 2009 07:03:56 +0000 Subject: [PATCH 06/96] - Add missing make-git-snapshot.sh --- libXi.spec | 5 ++++- make-git-snapshot.sh | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 make-git-snapshot.sh diff --git a/libXi.spec b/libXi.spec index 42872f7..0c95e38 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 1.%{gitdate}%{?dist} +Release: 2.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jun 19 2009 Peter Hutterer 1.2.99-2.20090619 +- Add missing make-git-snapshot.sh + * Fri Jun 19 2009 Peter Hutterer 1.2.99-1.20090619 - Update to today's git master diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..bdf1dde --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXi-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXi $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 From bde31a744ecbbdc53f65297b5ed7df329ebfb2c3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sun, 12 Jul 2009 11:16:55 +0000 Subject: [PATCH 07/96] - Update to today's git master --- .cvsignore | 2 +- libXi.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c85b10..ec2c748 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090619.tar.bz2 +libXi-20090712.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 0c95e38..122c7b0 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090619 +%define gitdate 20090712 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 2.%{gitdate}%{?dist} +Release: 3.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,8 +17,8 @@ Source1: make-git-snapshot.sh BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 1.9.99.12 -BuildRequires: libX11-devel +BuildRequires: pkgconfig(inputproto) >= 1.9.99.13 +BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel BuildRequires: libXau-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sun Jul 12 2009 Peter Hutterer 1.2.99-3.20090712 +- Update to today's git master + * Fri Jun 19 2009 Peter Hutterer 1.2.99-2.20090619 - Add missing make-git-snapshot.sh diff --git a/sources b/sources index 84c7366..ae29d38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1d6d5d3b809254d698bfe04e845c09b libXi-20090619.tar.bz2 +7f04bdc7984dec37f6f2691537c92837 libXi-20090712.tar.bz2 From 9ccec19c218a1b46b8abd0507f57dd1ce11092f8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 13 Jul 2009 03:08:55 +0000 Subject: [PATCH 08/96] - Update to today's git master - Add commitid file. --- .cvsignore | 2 +- commitid | 1 + libXi.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 commitid diff --git a/.cvsignore b/.cvsignore index ec2c748..ffe0304 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090712.tar.bz2 +libXi-20090713.tar.bz2 diff --git a/commitid b/commitid new file mode 100644 index 0000000..e88d837 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +1fc161f058eecb61d37135fd024703a385769417 diff --git a/libXi.spec b/libXi.spec index 122c7b0..acc48f9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090712 +%define gitdate 20090713 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 3.%{gitdate}%{?dist} +Release: 4.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -88,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Jul 13 2009 Peter Hutterer 1.2.99-4.20090713 +- Update to today's git master +- Add commitid file. + * Sun Jul 12 2009 Peter Hutterer 1.2.99-3.20090712 - Update to today's git master diff --git a/sources b/sources index ae29d38..971f97e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f04bdc7984dec37f6f2691537c92837 libXi-20090712.tar.bz2 +fad3aa50bf0eb5c2252b1582fc1d93bd libXi-20090713.tar.bz2 From 584ac537f4f501566249b604b9281852dc718f05 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jul 2009 23:13:21 +0000 Subject: [PATCH 09/96] - Update to today's git master --- .cvsignore | 2 +- commitid | 2 +- libXi.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ffe0304..cfb7632 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090713.tar.bz2 +libXi-20090716.tar.bz2 diff --git a/commitid b/commitid index e88d837..ac9c832 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -1fc161f058eecb61d37135fd024703a385769417 +4f224f4da1405959b74c05d6b15469cf6c0c498f diff --git a/libXi.spec b/libXi.spec index acc48f9..55d954d 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090713 +%define gitdate 20090716 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 4.%{gitdate}%{?dist} +Release: 5.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,7 +17,7 @@ Source1: make-git-snapshot.sh BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 1.9.99.13 +BuildRequires: pkgconfig(inputproto) >= 1.9.99.14 BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel BuildRequires: libXau-devel @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 16 2009 Peter Hutterer 1.2.99-5.20090716 +- Update to today's git master + * Mon Jul 13 2009 Peter Hutterer 1.2.99-4.20090713 - Update to today's git master - Add commitid file. diff --git a/sources b/sources index 971f97e..cdda851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fad3aa50bf0eb5c2252b1582fc1d93bd libXi-20090713.tar.bz2 +7ff773ecb786efc28193619c639c59d1 libXi-20090716.tar.bz2 From 2c684edcdb6626d9a3e27b94c808d24835d3da83 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 22 Jul 2009 21:53:26 +0000 Subject: [PATCH 10/96] - Update to today's git master --- .cvsignore | 2 +- commitid | 2 +- libXi.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index cfb7632..c47db2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090716.tar.bz2 +libXi-20090723.tar.bz2 diff --git a/commitid b/commitid index ac9c832..0ec2a38 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -4f224f4da1405959b74c05d6b15469cf6c0c498f +888f6c238de6f09cc5b079ae22c6f37496083007 diff --git a/libXi.spec b/libXi.spec index 55d954d..5a4662b 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090716 +%define gitdate 20090723 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 5.%{gitdate}%{?dist} +Release: 6.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 23 2009 Peter Hutterer 1.2.99-6.20090723 +- Update to today's git master + * Thu Jul 16 2009 Peter Hutterer 1.2.99-5.20090716 - Update to today's git master diff --git a/sources b/sources index cdda851..db1f71c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ff773ecb786efc28193619c639c59d1 libXi-20090716.tar.bz2 +08f869c2d551e61e67016d8e41c9e54f libXi-20090723.tar.bz2 From 2508a28358376222bece8d739bf3b4e5fc268a1c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 23 Jul 2009 13:51:29 +0000 Subject: [PATCH 11/96] - Un-require xorg-x11-filesystem --- libXi.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 5a4662b..a0da292 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 6.%{gitdate}%{?dist} +Release: 7.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -29,7 +29,6 @@ X.Org X11 libXi runtime library %package devel Summary: X.Org X11 libXi development package Group: Development/Libraries -Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} # required by xi.pc Requires: xorg-x11-proto-devel @@ -88,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 23 2009 Adam Jackson 1.2.99-7.20090723 +- Un-require xorg-x11-filesystem + * Thu Jul 23 2009 Peter Hutterer 1.2.99-6.20090723 - Update to today's git master From ef480a8146aadc952836797ce084d1476cb8a5d5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:13:26 +0000 Subject: [PATCH 12/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index a0da292..835e961 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 7.%{gitdate}%{?dist} +Release: 8.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.2.99-8.20090723 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jul 23 2009 Adam Jackson 1.2.99-7.20090723 - Un-require xorg-x11-filesystem From 20cde6f38b27203e91e64d20f717b5798a5ed80b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Aug 2009 04:42:00 +0000 Subject: [PATCH 13/96] - Update to today's git master --- .cvsignore | 2 +- commitid | 2 +- libXi.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c47db2e..21bb351 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090723.tar.bz2 +libXi-20090804.tar.bz2 diff --git a/commitid b/commitid index 0ec2a38..1be7283 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -888f6c238de6f09cc5b079ae22c6f37496083007 +aa8272dd31b69f84d19dbe2c45889b806df8260e diff --git a/libXi.spec b/libXi.spec index 835e961..12950d8 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090723 +%define gitdate 20090804 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 8.%{gitdate}%{?dist} +Release: 9.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Aug 04 2009 Peter Hutterer 1.2.99-9.20090804 +- Update to today's git master + * Fri Jul 24 2009 Fedora Release Engineering - 1.2.99-8.20090723 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index db1f71c..8895578 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08f869c2d551e61e67016d8e41c9e54f libXi-20090723.tar.bz2 +e3c7fab893b4ff8d2e891fd99ab34886 libXi-20090804.tar.bz2 From 01da42ae73bfcef14bfddf2aea9a03c382390bc4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Aug 2009 22:44:38 +0000 Subject: [PATCH 14/96] - Update to today's git master - Re-enable parallel builds, the man page makefile is fixed now. --- .cvsignore | 2 +- commitid | 2 +- libXi.spec | 11 +++++++---- sources | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 21bb351..c187bb5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090804.tar.bz2 +libXi-20090805.tar.bz2 diff --git a/commitid b/commitid index 1be7283..68bde94 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -aa8272dd31b69f84d19dbe2c45889b806df8260e +bc3900ea706438005f8b5613de4d9fb6bd954f62 diff --git a/libXi.spec b/libXi.spec index 12950d8..2b07a46 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090804 +%define gitdate 20090805 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 9.%{gitdate}%{?dist} +Release: 10.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -51,8 +51,7 @@ autoreconf -v --install || exit 1 --disable-static %endif -# FIXME: parallel builds disabled. Man page hate. -make #%{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Aug 05 2009 Peter Hutterer 1.2.99-10.20090805 +- Update to today's git master +- Re-enable parallel builds, the man page makefile is fixed now. + * Tue Aug 04 2009 Peter Hutterer 1.2.99-9.20090804 - Update to today's git master diff --git a/sources b/sources index 8895578..68021b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3c7fab893b4ff8d2e891fd99ab34886 libXi-20090804.tar.bz2 +778252cf450025f852466c656f5ae87f libXi-20090805.tar.bz2 From 2a61d2460e9ff7e3a7415d5a222465c8158d46b1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Aug 2009 04:03:46 +0000 Subject: [PATCH 15/96] - Update to today's git master, requires inputproto 1.9.99.902 --- .cvsignore | 2 +- commitid | 2 +- libXi.spec | 11 +++++++---- sources | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c187bb5..197546b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090805.tar.bz2 +libXi-20090825.tar.bz2 diff --git a/commitid b/commitid index 68bde94..6621481 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -bc3900ea706438005f8b5613de4d9fb6bd954f62 +2ce629c30745fc4027d2a95745bf21e8d8c7b893 diff --git a/libXi.spec b/libXi.spec index 2b07a46..b45133e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,10 +1,10 @@ %define tarball libXi -%define gitdate 20090805 +%define gitdate 20090825 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.2.99 -Release: 10.%{gitdate}%{?dist} +Release: 11.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,7 +17,7 @@ Source1: make-git-snapshot.sh BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 1.9.99.14 +BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel BuildRequires: libXau-devel @@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING %{_libdir}/libXi.so.6 -%{_libdir}/libXi.so.6.0.0 +%{_libdir}/libXi.so.6.1.0 %files devel %defattr(-,root,root,-) @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Aug 25 2009 Peter Hutterer 1.2.99-11.20090825 +- Update to today's git master, requires inputproto 1.9.99.902 + * Wed Aug 05 2009 Peter Hutterer 1.2.99-10.20090805 - Update to today's git master - Re-enable parallel builds, the man page makefile is fixed now. diff --git a/sources b/sources index 68021b1..e05ebe7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -778252cf450025f852466c656f5ae87f libXi-20090805.tar.bz2 +ffa25245465d6547b8d93870c201cb0a libXi-20090825.tar.bz2 From 2834f75769aefb9250ffb89b3fd9a400a19f2945 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Oct 2009 07:21:16 +0000 Subject: [PATCH 16/96] - libXi 1.3 --- .cvsignore | 2 +- libXi.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 197546b..751d916 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXi-20090825.tar.bz2 +libXi-1.3.tar.bz2 diff --git a/libXi.spec b/libXi.spec index b45133e..a73af87 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,17 +1,17 @@ %define tarball libXi -%define gitdate 20090825 +#define gitdate 20090825 Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.2.99 -Release: 11.%{gitdate}%{?dist} +Version: 1.3 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Source0: %{tarball}-%{gitdate}.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +#Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh BuildRequires: autoconf automake libtool @@ -38,8 +38,8 @@ Requires: pkgconfig X.Org X11 libXi development package %prep -#%setup -q -%setup -q -n %{tarball}-%{gitdate} +%setup -q +#setup -q -n %{tarball}-%{gitdate} # Disable static library creation by default. %define with_static 0 @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 06 2009 Peter Hutterer 1.3-1 +- libXi 1.3 + * Tue Aug 25 2009 Peter Hutterer 1.2.99-11.20090825 - Update to today's git master, requires inputproto 1.9.99.902 diff --git a/sources b/sources index e05ebe7..ff5849f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffa25245465d6547b8d93870c201cb0a libXi-20090825.tar.bz2 +8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 From b306d7b1c75a7a11e6aa73ebbdd5212dacc0ec43 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:26 +0000 Subject: [PATCH 17/96] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f4893f7..49ff749 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXi -# $Id: Makefile,v 1.1 2005/08/26 21:27:45 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting Exp $ NAME := libXi SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From eebd8ca2bac32eaa86147fd9680e2e86f01fd316 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:56 +0000 Subject: [PATCH 18/96] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f4893f7..49ff749 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXi -# $Id: Makefile,v 1.1 2005/08/26 21:27:45 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting Exp $ NAME := libXi SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d446c9e42f9bb20b683e3110724457071bc57bdb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 2 Feb 2010 06:48:02 +0000 Subject: [PATCH 19/96] - Remove unnecessary libXau-devel BuildRequires. --- libXi.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index a73af87..4577b5f 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -20,7 +20,6 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel -BuildRequires: libXau-devel BuildRequires: xmlto asciidoc >= 8.4.5 %description @@ -86,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Feb 02 2010 Peter Hutterer 1.3-2 +- Remove unnecessary libXau-devel BuildRequires. + * Tue Oct 06 2009 Peter Hutterer 1.3-1 - libXi 1.3 From 61bd0ded96f35b8eb8607379daad0df317719a84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:39:04 +0000 Subject: [PATCH 20/96] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 49ff749..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXi -# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting Exp $ -NAME := libXi -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From 7ace2a4342a6476fa2fb0ccf47958eb23d3a0410 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:39:07 +0000 Subject: [PATCH 21/96] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 49ff749..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXi -# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting Exp $ -NAME := libXi -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 8d3276e..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXi-1_2_0-1_fc11:HEAD:libXi-1.2.0-1.fc11.src.rpm:1228320319 From dd6c7b502c5b68719f11676510594f977646bb42 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 2 Aug 2010 10:24:08 +1000 Subject: [PATCH 22/96] libXi 1.3.1 --- .gitignore | 2 +- libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 751d916..79dd840 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libXi-1.3.tar.bz2 +libXi-1.3.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 4577b5f..25150a5 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,8 +3,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Aug 02 2010 Peter Hutterer 1.3.1-1 +- libXi 1.3.1 + * Tue Feb 02 2010 Peter Hutterer 1.3-2 - Remove unnecessary libXau-devel BuildRequires. diff --git a/sources b/sources index ff5849f..587ea14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 +75324546e3d1c0cce9d508feb05e4ed0 libXi-1.3.1.tar.bz2 From 054b150d6fc6b02a73d178ba8761a584bec6a9ef Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Aug 2010 09:45:40 +1000 Subject: [PATCH 23/96] libXi 1.3.2 libXi 1.3.1 had a bug in the configure script. --- .gitignore | 1 + libXi.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 79dd840..2e45bc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libXi-1.3.1.tar.bz2 +libXi-1.3.2.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 25150a5..84df92d 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -85,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Aug 04 2010 Peter Hutterer 1.3.2-1 +- libXi 1.3.2 + libXi 1.3.1 had a bug in the configure script. + * Mon Aug 02 2010 Peter Hutterer 1.3.1-1 - libXi 1.3.1 diff --git a/sources b/sources index 587ea14..f2fdedf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75324546e3d1c0cce9d508feb05e4ed0 libXi-1.3.1.tar.bz2 +26f93781356b1fdde08f7ee9cd5884d6 libXi-1.3.2.tar.bz2 From 20848aeaea08753d37fd4e4c19376629e00fec48 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 3 Nov 2010 08:15:48 +1000 Subject: [PATCH 24/96] - libXi 1.4 - disable spec building, don't think they're of much of much use to our users. --- .gitignore | 3 +-- libXi.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2e45bc5..5587853 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -libXi-1.3.1.tar.bz2 -libXi-1.3.2.tar.bz2 +libXi-1.4.0.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 84df92d..29f39f5 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.3.2 +Version: 1.4.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -45,7 +45,7 @@ X.Org X11 libXi development package %build autoreconf -v --install || exit 1 -%configure \ +%configure --disable-specs \ %if ! %{with_static} --disable-static %endif @@ -85,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Nov 03 2010 Peter Hutterer 1.4.0-1 +- libXi 1.4 +- disable spec building, don't think they're of much of much use to our + users. + * Wed Aug 04 2010 Peter Hutterer 1.3.2-1 - libXi 1.3.2 libXi 1.3.1 had a bug in the configure script. diff --git a/sources b/sources index f2fdedf..911b0f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26f93781356b1fdde08f7ee9cd5884d6 libXi-1.3.2.tar.bz2 +4ccdfe866f94c99b9190d16ffcfb3bdc libXi-1.4.0.tar.bz2 From f9159b63c13cde2cd2c27fc1a7d7b4583c28e15b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Jan 2011 07:54:26 +1000 Subject: [PATCH 25/96] - libXi 1.4.1 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5587853..81f6a48 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libXi-1.4.0.tar.bz2 +/libXi-1.4.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 29f39f5..896af5d 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jan 26 2011 Peter Hutterer 1.4.1-1 +- libXi 1.4.1 + * Wed Nov 03 2010 Peter Hutterer 1.4.0-1 - libXi 1.4 - disable spec building, don't think they're of much of much use to our diff --git a/sources b/sources index 911b0f5..1dfa936 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ccdfe866f94c99b9190d16ffcfb3bdc libXi-1.4.0.tar.bz2 +e4b6fb1b08a92075469174f0cccde168 libXi-1.4.1.tar.bz2 From 952d7371ae422ac31fe77dbf139d1c2fa4a1f2e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:26:45 -0600 Subject: [PATCH 26/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 896af5d..e6638cc 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jan 26 2011 Peter Hutterer 1.4.1-1 - libXi 1.4.1 From da2e6685934e35ac95cba1ef08d9c5ae6bc0d0d3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 21 Mar 2011 10:53:48 -0400 Subject: [PATCH 27/96] libXi 1.4.2 --- .gitignore | 1 + libXi.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 81f6a48..50e9b97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libXi-1.4.0.tar.bz2 /libXi-1.4.1.tar.bz2 +/libXi-1.4.2.tar.bz2 diff --git a/libXi.spec b/libXi.spec index e6638cc..3644f3b 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,12 +3,11 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 #Source0: %{tarball}-%{gitdate}.tar.bz2 @@ -85,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Mar 21 2011 Adam Jackson 1.4.2-1 +- libXi 1.4.2 + * Mon Feb 07 2011 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 1dfa936..8cc692f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4b6fb1b08a92075469174f0cccde168 libXi-1.4.1.tar.bz2 +3d14f7bfc4a4335cf0144de9b67a5444 libXi-1.4.2.tar.bz2 From 981d403795f04827043a2d39319e63c405a36aca Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 7 Jun 2011 13:48:59 +1000 Subject: [PATCH 28/96] libXi 1.4.3 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 50e9b97..52092a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.4.1.tar.bz2 /libXi-1.4.2.tar.bz2 +/libXi-1.4.3.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 3644f3b..b662325 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Jun 07 2011 Peter Hutterer 1.4.3-1 +- libXi 1.4.3 + * Mon Mar 21 2011 Adam Jackson 1.4.2-1 - libXi 1.4.2 diff --git a/sources b/sources index 8cc692f..1ddbb16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d14f7bfc4a4335cf0144de9b67a5444 libXi-1.4.2.tar.bz2 +792e8a7ddc7175911d69f823d38eaff6 libXi-1.4.3.tar.bz2 From e9e6be20f0f57a75c8a70eb52b40a005af1afac9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 17 Aug 2011 15:40:37 +1000 Subject: [PATCH 29/96] 0001-Handle-unknown-device-classes.patch: don't corrupt memory when a server sends unknown device classes. --- 0001-Handle-unknown-device-classes.patch | 167 +++++++++++++++++++++++ libXi.spec | 9 +- 2 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 0001-Handle-unknown-device-classes.patch diff --git a/0001-Handle-unknown-device-classes.patch b/0001-Handle-unknown-device-classes.patch new file mode 100644 index 0000000..3654c3b --- /dev/null +++ b/0001-Handle-unknown-device-classes.patch @@ -0,0 +1,167 @@ +From 4fe9df2e06c2f0d258f9dbc34127b8f75930f985 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 17 Aug 2011 15:20:48 +1000 +Subject: [PATCH] Handle unknown device classes. + +If the server sends an unknown device class in response to an XIQueryDevice +call, no memory is allocated for these classes but we still write type +and sourceid as well as setting to->classes[i]. The latter causes multiple +classes to point to the same memory field. + +Move the common code of assigning these three into the respective class type +handlers so to automatically skip any unknown classes. + +Signed-off-by: Peter Hutterer +--- + src/XExtInt.c | 30 +++++++++++++++++++++--------- + src/XIQueryDevice.c | 2 +- + 2 files changed, 22 insertions(+), 10 deletions(-) + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index 86a780e..9e1ad19 100644 +--- a/src/XExtInt.c ++++ b/src/XExtInt.c +@@ -98,7 +98,7 @@ extern int _XiGetDevicePresenceNotifyEvent( + Display * /* dpy */ + ); + +-int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int nclasses); ++int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int *nclasses); + int size_classes(xXIAnyInfo* from, int nclasses); + + static XExtensionInfo *xinput_info; +@@ -1448,30 +1448,29 @@ size_classes(xXIAnyInfo* from, int nclasses) + * |______________________^ + */ + _X_HIDDEN int +-copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) ++copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) + { + XIAnyClassInfo *any_lib; + xXIAnyInfo *any_wire; + void *ptr_lib; + char *ptr_wire; + int i, len; ++ int cls_idx = 0; + + if (!to->classes) + return -1; + + ptr_wire = (char*)from; + ptr_lib = to->classes; +- to->classes = next_block(&ptr_lib, nclasses * sizeof(XIAnyClassInfo*)); ++ to->classes = next_block(&ptr_lib, *nclasses * sizeof(XIAnyClassInfo*)); ++ memset(to->classes, 0, sizeof(*nclasses * sizeof(XIAnyClassInfo*))); + len = 0; /* count wire length */ + +- for (i = 0; i < nclasses; i++) ++ for (i = 0; i < *nclasses; i++) + { + any_lib = (XIAnyClassInfo*)ptr_lib; + any_wire = (xXIAnyInfo*)ptr_wire; + +- to->classes[i] = any_lib; +- any_lib->type = any_wire->type; +- any_lib->sourceid = any_wire->sourceid; + switch(any_wire->type) + { + case XIButtonClass: +@@ -1485,6 +1484,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) + cls_lib = next_block(&ptr_lib, sizeof(XIButtonClassInfo)); + cls_wire = (xXIButtonInfo*)any_wire; + ++ cls_lib->type = cls_wire->type; ++ cls_lib->sourceid = cls_wire->sourceid; + cls_lib->num_buttons = cls_wire->num_buttons; + size = ((((cls_wire->num_buttons + 7)/8) + 3)/4); + cls_lib->state.mask_len = size * 4; +@@ -1499,6 +1500,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) + for (j = 0; j < cls_lib->num_buttons; j++) + cls_lib->labels[j] = *atoms++; + ++ to->classes[cls_idx++] = any_lib; + break; + } + case XIKeyClass: +@@ -1509,12 +1511,15 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) + cls_lib = next_block(&ptr_lib, sizeof(XIKeyClassInfo)); + cls_wire = (xXIKeyInfo*)any_wire; + ++ cls_lib->type = cls_wire->type; ++ cls_lib->sourceid = cls_wire->sourceid; + cls_lib->num_keycodes = cls_wire->num_keycodes; + cls_lib->keycodes = next_block(&ptr_lib, + cls_lib->num_keycodes * sizeof(int)); + memcpy(cls_lib->keycodes, &cls_wire[1], + cls_lib->num_keycodes); + ++ to->classes[cls_idx++] = any_lib; + break; + } + case XIValuatorClass: +@@ -1525,6 +1530,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) + cls_lib = next_block(&ptr_lib, sizeof(XIValuatorClassInfo)); + cls_wire = (xXIValuatorInfo*)any_wire; + ++ cls_lib->type = cls_wire->type; ++ cls_lib->sourceid = cls_wire->sourceid; + cls_lib->number = cls_wire->number; + cls_lib->label = cls_wire->label; + cls_lib->resolution = cls_wire->resolution; +@@ -1534,12 +1541,16 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) + /* FIXME: fractional parts */ + cls_lib->mode = cls_wire->mode; + ++ to->classes[cls_idx++] = any_lib; + } + break; + } + len += any_wire->length * 4; + ptr_wire += any_wire->length * 4; + } ++ ++ /* we may have skipped unknown classes, reset nclasses */ ++ *nclasses = cls_idx; + return len; + } + +@@ -1550,6 +1561,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) + XIDeviceChangedEvent *out; + XIDeviceInfo info; + int len; ++ int nclasses = in->num_classes; + + len = size_classes((xXIAnyInfo*)&in[1], in->num_classes); + +@@ -1564,13 +1576,13 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) + out->deviceid = in->deviceid; + out->sourceid = in->sourceid; + out->reason = in->reason; +- out->num_classes = in->num_classes; + + out->classes = (XIAnyClassInfo**)&out[1]; + + info.classes = out->classes; + +- copy_classes(&info, (xXIAnyInfo*)&in[1], in->num_classes); ++ copy_classes(&info, (xXIAnyInfo*)&in[1], &nclasses); ++ out->num_classes = nclasses; + + return 1; + } +diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c +index 4e2f392..c8197d2 100644 +--- a/src/XIQueryDevice.c ++++ b/src/XIQueryDevice.c +@@ -87,7 +87,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) + ptr += ((wire->name_len + 3)/4) * 4; + + lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, lib->num_classes)); +- ptr += copy_classes(lib, (xXIAnyInfo*)ptr, lib->num_classes); ++ ptr += copy_classes(lib, (xXIAnyInfo*)ptr, &lib->num_classes); + } + + Xfree(buf); +-- +1.7.6 + diff --git a/libXi.spec b/libXi.spec index b662325..1b1dcec 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -13,6 +13,8 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 #Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh +Patch01: 0001-Handle-unknown-device-classes.patch + BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -38,6 +40,7 @@ X.Org X11 libXi development package %prep %setup -q #setup -q -n %{tarball}-%{gitdate} +%patch01 -p1 # Disable static library creation by default. %define with_static 0 @@ -84,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Aug 17 2011 Peter Hutterer 1.4.3-2 +- 0001-Handle-unknown-device-classes.patch: don't corrupt memory when a + server sends unknown device classes. + * Tue Jun 07 2011 Peter Hutterer 1.4.3-1 - libXi 1.4.3 From f445c75e82f227eb53469f183088c70d9c53b4f7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 11 Oct 2011 10:51:40 +1000 Subject: [PATCH 30/96] Fix 0001-Handle-unknown-device-classes.patch: missing prototype change for copy_classes in XIQueryDevice caused parameter corruption (#744960) --- 0001-Handle-unknown-device-classes.patch | 19 ++++++++++++++----- libXi.spec | 6 +++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/0001-Handle-unknown-device-classes.patch b/0001-Handle-unknown-device-classes.patch index 3654c3b..b9cae1c 100644 --- a/0001-Handle-unknown-device-classes.patch +++ b/0001-Handle-unknown-device-classes.patch @@ -1,4 +1,4 @@ -From 4fe9df2e06c2f0d258f9dbc34127b8f75930f985 Mon Sep 17 00:00:00 2001 +From 635c2c029b1e73311c3f650bcaf7eeb9e782134b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 17 Aug 2011 15:20:48 +1000 Subject: [PATCH] Handle unknown device classes. @@ -14,8 +14,8 @@ handlers so to automatically skip any unknown classes. Signed-off-by: Peter Hutterer --- src/XExtInt.c | 30 +++++++++++++++++++++--------- - src/XIQueryDevice.c | 2 +- - 2 files changed, 22 insertions(+), 10 deletions(-) + src/XIQueryDevice.c | 4 ++-- + 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/XExtInt.c b/src/XExtInt.c index 86a780e..9e1ad19 100644 @@ -150,9 +150,18 @@ index 86a780e..9e1ad19 100644 return 1; } diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c -index 4e2f392..c8197d2 100644 +index 4e2f392..c22aee1 100644 --- a/src/XIQueryDevice.c +++ b/src/XIQueryDevice.c +@@ -29,7 +29,7 @@ + #include + #include "XIint.h" + +-extern int copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses); ++extern int copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses); + extern int size_classes(xXIAnyInfo* from, int nclasses); + + XIDeviceInfo* @@ -87,7 +87,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) ptr += ((wire->name_len + 3)/4) * 4; @@ -163,5 +172,5 @@ index 4e2f392..c8197d2 100644 Xfree(buf); -- -1.7.6 +1.7.6.4 diff --git a/libXi.spec b/libXi.spec index 1b1dcec..e590018 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 11 2011 Peter Hutterer 1.4.3-3 +- Fix 0001-Handle-unknown-device-classes.patch: missing prototype change for + copy_classes in XIQueryDevice caused parameter corruption (#744960) + * Wed Aug 17 2011 Peter Hutterer 1.4.3-2 - 0001-Handle-unknown-device-classes.patch: don't corrupt memory when a server sends unknown device classes. From 13541e0b1ec6b166edb245eea81a836e7a3cde93 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Nov 2011 11:35:12 +1000 Subject: [PATCH 31/96] Update to 1.5.99.1 (with XI 2.1 support) --- .gitignore | 1 + 0001-Handle-unknown-device-classes.patch | 176 ----------------------- libXi.spec | 12 +- sources | 2 +- 4 files changed, 8 insertions(+), 183 deletions(-) delete mode 100644 0001-Handle-unknown-device-classes.patch diff --git a/.gitignore b/.gitignore index 52092a7..5413427 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.4.1.tar.bz2 /libXi-1.4.2.tar.bz2 /libXi-1.4.3.tar.bz2 +/libXi-1.4.99.1.tar.bz2 diff --git a/0001-Handle-unknown-device-classes.patch b/0001-Handle-unknown-device-classes.patch deleted file mode 100644 index b9cae1c..0000000 --- a/0001-Handle-unknown-device-classes.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 635c2c029b1e73311c3f650bcaf7eeb9e782134b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 17 Aug 2011 15:20:48 +1000 -Subject: [PATCH] Handle unknown device classes. - -If the server sends an unknown device class in response to an XIQueryDevice -call, no memory is allocated for these classes but we still write type -and sourceid as well as setting to->classes[i]. The latter causes multiple -classes to point to the same memory field. - -Move the common code of assigning these three into the respective class type -handlers so to automatically skip any unknown classes. - -Signed-off-by: Peter Hutterer ---- - src/XExtInt.c | 30 +++++++++++++++++++++--------- - src/XIQueryDevice.c | 4 ++-- - 2 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 86a780e..9e1ad19 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -98,7 +98,7 @@ extern int _XiGetDevicePresenceNotifyEvent( - Display * /* dpy */ - ); - --int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int nclasses); -+int copy_classes(XIDeviceInfo *to, xXIAnyInfo* from, int *nclasses); - int size_classes(xXIAnyInfo* from, int nclasses); - - static XExtensionInfo *xinput_info; -@@ -1448,30 +1448,29 @@ size_classes(xXIAnyInfo* from, int nclasses) - * |______________________^ - */ - _X_HIDDEN int --copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) -+copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) - { - XIAnyClassInfo *any_lib; - xXIAnyInfo *any_wire; - void *ptr_lib; - char *ptr_wire; - int i, len; -+ int cls_idx = 0; - - if (!to->classes) - return -1; - - ptr_wire = (char*)from; - ptr_lib = to->classes; -- to->classes = next_block(&ptr_lib, nclasses * sizeof(XIAnyClassInfo*)); -+ to->classes = next_block(&ptr_lib, *nclasses * sizeof(XIAnyClassInfo*)); -+ memset(to->classes, 0, sizeof(*nclasses * sizeof(XIAnyClassInfo*))); - len = 0; /* count wire length */ - -- for (i = 0; i < nclasses; i++) -+ for (i = 0; i < *nclasses; i++) - { - any_lib = (XIAnyClassInfo*)ptr_lib; - any_wire = (xXIAnyInfo*)ptr_wire; - -- to->classes[i] = any_lib; -- any_lib->type = any_wire->type; -- any_lib->sourceid = any_wire->sourceid; - switch(any_wire->type) - { - case XIButtonClass: -@@ -1485,6 +1484,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) - cls_lib = next_block(&ptr_lib, sizeof(XIButtonClassInfo)); - cls_wire = (xXIButtonInfo*)any_wire; - -+ cls_lib->type = cls_wire->type; -+ cls_lib->sourceid = cls_wire->sourceid; - cls_lib->num_buttons = cls_wire->num_buttons; - size = ((((cls_wire->num_buttons + 7)/8) + 3)/4); - cls_lib->state.mask_len = size * 4; -@@ -1499,6 +1500,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) - for (j = 0; j < cls_lib->num_buttons; j++) - cls_lib->labels[j] = *atoms++; - -+ to->classes[cls_idx++] = any_lib; - break; - } - case XIKeyClass: -@@ -1509,12 +1511,15 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) - cls_lib = next_block(&ptr_lib, sizeof(XIKeyClassInfo)); - cls_wire = (xXIKeyInfo*)any_wire; - -+ cls_lib->type = cls_wire->type; -+ cls_lib->sourceid = cls_wire->sourceid; - cls_lib->num_keycodes = cls_wire->num_keycodes; - cls_lib->keycodes = next_block(&ptr_lib, - cls_lib->num_keycodes * sizeof(int)); - memcpy(cls_lib->keycodes, &cls_wire[1], - cls_lib->num_keycodes); - -+ to->classes[cls_idx++] = any_lib; - break; - } - case XIValuatorClass: -@@ -1525,6 +1530,8 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) - cls_lib = next_block(&ptr_lib, sizeof(XIValuatorClassInfo)); - cls_wire = (xXIValuatorInfo*)any_wire; - -+ cls_lib->type = cls_wire->type; -+ cls_lib->sourceid = cls_wire->sourceid; - cls_lib->number = cls_wire->number; - cls_lib->label = cls_wire->label; - cls_lib->resolution = cls_wire->resolution; -@@ -1534,12 +1541,16 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) - /* FIXME: fractional parts */ - cls_lib->mode = cls_wire->mode; - -+ to->classes[cls_idx++] = any_lib; - } - break; - } - len += any_wire->length * 4; - ptr_wire += any_wire->length * 4; - } -+ -+ /* we may have skipped unknown classes, reset nclasses */ -+ *nclasses = cls_idx; - return len; - } - -@@ -1550,6 +1561,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - XIDeviceChangedEvent *out; - XIDeviceInfo info; - int len; -+ int nclasses = in->num_classes; - - len = size_classes((xXIAnyInfo*)&in[1], in->num_classes); - -@@ -1564,13 +1576,13 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - out->deviceid = in->deviceid; - out->sourceid = in->sourceid; - out->reason = in->reason; -- out->num_classes = in->num_classes; - - out->classes = (XIAnyClassInfo**)&out[1]; - - info.classes = out->classes; - -- copy_classes(&info, (xXIAnyInfo*)&in[1], in->num_classes); -+ copy_classes(&info, (xXIAnyInfo*)&in[1], &nclasses); -+ out->num_classes = nclasses; - - return 1; - } -diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c -index 4e2f392..c22aee1 100644 ---- a/src/XIQueryDevice.c -+++ b/src/XIQueryDevice.c -@@ -29,7 +29,7 @@ - #include - #include "XIint.h" - --extern int copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses); -+extern int copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses); - extern int size_classes(xXIAnyInfo* from, int nclasses); - - XIDeviceInfo* -@@ -87,7 +87,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return) - ptr += ((wire->name_len + 3)/4) * 4; - - lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, lib->num_classes)); -- ptr += copy_classes(lib, (xXIAnyInfo*)ptr, lib->num_classes); -+ ptr += copy_classes(lib, (xXIAnyInfo*)ptr, &lib->num_classes); - } - - Xfree(buf); --- -1.7.6.4 - diff --git a/libXi.spec b/libXi.spec index e590018..5310e70 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,8 +3,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.99.1 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -13,12 +13,10 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 #Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh -Patch01: 0001-Handle-unknown-device-classes.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 +BuildRequires: pkgconfig(inputproto) >= 2.0.99.1 BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -40,7 +38,6 @@ X.Org X11 libXi development package %prep %setup -q #setup -q -n %{tarball}-%{gitdate} -%patch01 -p1 # Disable static library creation by default. %define with_static 0 @@ -87,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Nov 09 2011 Peter Hutterer 1.4.99.1-1 +- Update to 1.4.99.1 (with XI 2.1 support) + * Tue Oct 11 2011 Peter Hutterer 1.4.3-3 - Fix 0001-Handle-unknown-device-classes.patch: missing prototype change for copy_classes in XIQueryDevice caused parameter corruption (#744960) diff --git a/sources b/sources index 1ddbb16..d432bc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -792e8a7ddc7175911d69f823d38eaff6 libXi-1.4.3.tar.bz2 +4e9dedaa2fe2561f9f0161d5c14db804 libXi-1.4.99.1.tar.bz2 From 1217391c35a3a6fe553fe2bd31473ef7ca2b1fa3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 21 Dec 2011 15:36:57 +1000 Subject: [PATCH 32/96] libXi 1.5.0 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5413427..5747c89 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.4.2.tar.bz2 /libXi-1.4.3.tar.bz2 /libXi-1.4.99.1.tar.bz2 +/libXi-1.5.0.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 5310e70..6b3b8d4 100644 --- a/libXi.spec +++ b/libXi.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.4.99.1 +Version: 1.5.0 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Dec 21 2011 Peter Hutterer 1.5.0-1 +- libXi 1.5.0 + * Wed Nov 09 2011 Peter Hutterer 1.4.99.1-1 - Update to 1.4.99.1 (with XI 2.1 support) diff --git a/sources b/sources index d432bc3..1a42c47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e9dedaa2fe2561f9f0161d5c14db804 libXi-1.4.99.1.tar.bz2 +eed79448dd24b31f3fedb1750fc777b3 libXi-1.5.0.tar.bz2 From 1caeec08b3e6682e039dff6347abcac0c162b420 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 22 Dec 2011 10:10:01 +1000 Subject: [PATCH 33/96] 1.5.99.2 from git --- .gitignore | 2 ++ commitid | 2 +- libXi.spec | 24 +++++++++++++++--------- sources | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5747c89..4208d1e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ libXi-1.4.0.tar.bz2 /libXi-1.4.3.tar.bz2 /libXi-1.4.99.1.tar.bz2 /libXi-1.5.0.tar.bz2 +/libXi-20111221.tar.bz2 +/libXi-20111222.tar.bz2 diff --git a/commitid b/commitid index 6621481..6ebb904 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -2ce629c30745fc4027d2a95745bf21e8d8c7b893 +ae0187c8708d2378373889827117911086581fdd diff --git a/libXi.spec b/libXi.spec index 6b3b8d4..05cf9df 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,22 +1,26 @@ -%define tarball libXi -#define gitdate 20090825 +%global tarball libXi +%global gitdate 20111222 +%global gitversion ae0187c87 Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.5.0 -Release: 1%{?dist} +Version: 1.5.99.2 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -#Source0: %{tarball}-%{gitdate}.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh +%else +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +%endif BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 2.0.99.1 +BuildRequires: pkgconfig(inputproto) >= 2.1.99.3 BuildRequires: libX11-devel >= 1.2.99 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -36,8 +40,7 @@ Requires: pkgconfig X.Org X11 libXi development package %prep -%setup -q -#setup -q -n %{tarball}-%{gitdate} +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} # Disable static library creation by default. %define with_static 0 @@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Dec 22 2011 Peter Hutterer 1.5.99.2-1.20111222.gitae0187c87 +- 1.5.99.2 from git + * Wed Dec 21 2011 Peter Hutterer 1.5.0-1 - libXi 1.5.0 diff --git a/sources b/sources index 1a42c47..d903f46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eed79448dd24b31f3fedb1750fc777b3 libXi-1.5.0.tar.bz2 +7804e6c12a6e8802eed285c38e267c62 libXi-20111222.tar.bz2 From 92ab81a53c461821c25ac3b5f95936a2ebe3f668 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:18:15 -0600 Subject: [PATCH 34/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 05cf9df..4f45a51 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.5.99.2 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.5.99.2-2.20111222gitae0187c87 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Dec 22 2011 Peter Hutterer 1.5.99.2-1.20111222.gitae0187c87 - 1.5.99.2 from git From 8b3d09f0204fd1f9b3be694ec4b3a5f725a50a8f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Jan 2012 08:46:16 +1000 Subject: [PATCH 35/96] Bump libX11-devel requirement up to what configure actually wants --- libXi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 4f45a51..ff56759 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.5.99.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -21,7 +21,7 @@ BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(inputproto) >= 2.1.99.3 -BuildRequires: libX11-devel >= 1.2.99 +BuildRequires: libX11-devel >= 1.4.99.1 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jan 27 2012 Peter Hutterer 1.5.99.2-3 +- Bump libX11-devel requirement up to what configure actually wants + * Fri Jan 13 2012 Fedora Release Engineering - 1.5.99.2-2.20111222gitae0187c87 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From a1d8f40ae142eabd6f4abd3e5123ba497935a866 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 6 Feb 2012 23:20:49 +1000 Subject: [PATCH 36/96] Add requires for libX11 to avoid mismatches when updating --- libXi.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index ff56759..2ef7c69 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.5.99.2 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -25,6 +25,8 @@ BuildRequires: libX11-devel >= 1.4.99.1 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 +Requires: libX11 >= 1.4.99.1 + %description X.Org X11 libXi runtime library @@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Feb 06 2012 Peter Hutterer 1.5.99.2-4 +- Add requires for libX11 to avoid mismatches when updating + * Fri Jan 27 2012 Peter Hutterer 1.5.99.2-3 - Bump libX11-devel requirement up to what configure actually wants From 4b0921653f7fbc597e7e7f59c091f8012476ad2a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Feb 2012 10:50:35 +1000 Subject: [PATCH 37/96] libXi 1.5.99.3 --- .gitignore | 1 + libXi.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4208d1e..f699e66 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.5.0.tar.bz2 /libXi-20111221.tar.bz2 /libXi-20111222.tar.bz2 +/libXi-1.5.99.3.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 2ef7c69..a789b8e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,11 +1,11 @@ %global tarball libXi -%global gitdate 20111222 -%global gitversion ae0187c87 +#global gitdate 20111222 +#global gitversion ae0187c87 Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.5.99.2 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.5.99.3 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -20,7 +20,7 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 2.1.99.3 +BuildRequires: pkgconfig(inputproto) >= 2.1.99.6 BuildRequires: libX11-devel >= 1.4.99.1 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 15 2012 Peter Hutterer 1.5.99.3-1 +- libXi 1.5.99.3 + * Mon Feb 06 2012 Peter Hutterer 1.5.99.2-4 - Add requires for libX11 to avoid mismatches when updating diff --git a/sources b/sources index d903f46..38e9fdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7804e6c12a6e8802eed285c38e267c62 libXi-20111222.tar.bz2 +b2b7685a238806375a45f7684cfda813 libXi-1.5.99.3.tar.bz2 From ade973f9e22ae47fbba8ee746bdd864a43de1ead Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 8 Mar 2012 16:11:02 +1000 Subject: [PATCH 38/96] libXi 1.6 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f699e66..a330c6b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libXi-1.4.0.tar.bz2 /libXi-20111221.tar.bz2 /libXi-20111222.tar.bz2 /libXi-1.5.99.3.tar.bz2 +/libXi-1.6.0.tar.bz2 diff --git a/libXi.spec b/libXi.spec index a789b8e..ede48e3 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.5.99.3 +Version: 1.6.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 08 2012 Peter Hutterer 1.6.0-1 +- libXi 1.6 + * Wed Feb 15 2012 Peter Hutterer 1.5.99.3-1 - libXi 1.5.99.3 diff --git a/sources b/sources index 38e9fdb..c2dc76c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2b7685a238806375a45f7684cfda813 libXi-1.5.99.3.tar.bz2 +2e7f84711035e672c34549eac5660a0f libXi-1.6.0.tar.bz2 From 54773850088404152a5cae69d4f8916191f67d74 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 3 May 2012 16:15:41 +1000 Subject: [PATCH 39/96] libXi 1.6.1 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a330c6b..4715cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libXi-1.4.0.tar.bz2 /libXi-20111222.tar.bz2 /libXi-1.5.99.3.tar.bz2 /libXi-1.6.0.tar.bz2 +/libXi-1.6.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index ede48e3..4504272 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu May 03 2012 Peter Hutterer 1.6.1-1 +- libXi 1.6.1 + * Thu Mar 08 2012 Peter Hutterer 1.6.0-1 - libXi 1.6 diff --git a/sources b/sources index c2dc76c..2215b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e7f84711035e672c34549eac5660a0f libXi-1.6.0.tar.bz2 +78ee882e1ff3b192cf54070bdb19938e libXi-1.6.1.tar.bz2 From 10231a146c51ac6fe45066790b2104db53234b51 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:08:31 -0500 Subject: [PATCH 40/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 4504272..8970adc 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.6.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu May 03 2012 Peter Hutterer 1.6.1-1 - libXi 1.6.1 From ba7d741ac5e924b906a491493f3fa6c5e4ad432a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Jan 2013 16:10:51 -0500 Subject: [PATCH 41/96] libXi 1.6.99.1 --- .gitignore | 1 + libXi.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4715cb5..325daec 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.5.99.3.tar.bz2 /libXi-1.6.0.tar.bz2 /libXi-1.6.1.tar.bz2 +/libXi-1.6.99.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 8970adc..9da012f 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.6.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.6.99.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -20,7 +20,7 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 2.1.99.6 +BuildRequires: pkgconfig(inputproto) >= 2.2.99.1 BuildRequires: libX11-devel >= 1.4.99.1 BuildRequires: libXext-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Jan 08 2013 Adam Jackson 1.6.99.1-1 +- libXi 1.6.99.1 + * Thu Jul 19 2012 Fedora Release Engineering - 1.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 2215b19..44d641a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78ee882e1ff3b192cf54070bdb19938e libXi-1.6.1.tar.bz2 +e8dcd93401e7d9321ce26c1b92ee84d6 libXi-1.6.99.1.tar.bz2 From 643ce8979382fe0cf83ff71d41460c3056354f42 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 21:57:28 -0600 Subject: [PATCH 42/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 9da012f..9824437 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.6.99.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.99.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Jan 08 2013 Adam Jackson 1.6.99.1-1 - libXi 1.6.99.1 From 7f06013cadd6fd7dda27425bfe0cbc61026382b4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 7 Mar 2013 11:23:25 +1000 Subject: [PATCH 43/96] libXi 1.7 --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 325daec..87ebc76 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.6.0.tar.bz2 /libXi-1.6.1.tar.bz2 /libXi-1.6.99.1.tar.bz2 +/libXi-1.7.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 9824437..dcc3854 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.6.99.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.7 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 07 2013 Peter Hutterer 1.7-1 +- libXi 1.7 + * Thu Feb 14 2013 Fedora Release Engineering - 1.6.99.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 44d641a..489a39e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8dcd93401e7d9321ce26c1b92ee84d6 libXi-1.6.99.1.tar.bz2 +d77922d822cb3abdbdfb92cd66440576 libXi-1.7.tar.bz2 From 1cd00fb312fbb3a8d54a8115d4ad722d6532a915 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 5 Apr 2013 10:54:43 +1000 Subject: [PATCH 44/96] libXi 1.7.1 --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 87ebc76..96003b4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.6.1.tar.bz2 /libXi-1.6.99.1.tar.bz2 /libXi-1.7.tar.bz2 +/libXi-1.7.1.tar.bz2 diff --git a/libXi.spec b/libXi.spec index dcc3854..d079f03 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7 +Version: 1.7.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -22,7 +22,7 @@ BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(inputproto) >= 2.2.99.1 BuildRequires: libX11-devel >= 1.4.99.1 -BuildRequires: libXext-devel +BuildRequires: libXext-devel libXfixes-devel BuildRequires: xmlto asciidoc >= 8.4.5 Requires: libX11 >= 1.4.99.1 @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Apr 05 2013 Peter Hutterer 1.7.1-1 +- libXi 1.7.1 + * Thu Mar 07 2013 Peter Hutterer 1.7-1 - libXi 1.7 diff --git a/sources b/sources index 489a39e..d6adad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d77922d822cb3abdbdfb92cd66440576 libXi-1.7.tar.bz2 +24d71afed1b86c60d4eb361628d7f47b libXi-1.7.1.tar.bz2 From f333a6eaa0f559533796b7e5ed24eb71c6f0ea4c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 17 May 2013 10:09:00 +1000 Subject: [PATCH 45/96] copy the sequence number into XI2 events --- ...e-number-into-the-target-event-too-6.patch | 92 +++++++++++++++++++ libXi.spec | 8 +- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch diff --git a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch new file mode 100644 index 0000000..61988bd --- /dev/null +++ b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch @@ -0,0 +1,92 @@ +From 4ee15c55da848c9f3334e9750f28be81bfd6a312 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 17 May 2013 09:07:44 +1000 +Subject: [PATCH libXi] Copy the sequence number into the target event too + (#64687) + +X.Org Bug 64687 + +Signed-off-by: Peter Hutterer +--- + src/XExtInt.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index 507573b..2139c6a 100644 +--- a/src/XExtInt.c ++++ b/src/XExtInt.c +@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, + cookie->type = ev->type; + cookie->evtype = ev->evtype; + cookie->extension = ev->extension; ++ cookie->serial = ev->sequenceNumber; + } + + static Bool +@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) + out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); + out->display = cookie->display; + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->extension = in->extension; + out->evtype = in->evtype; + out->send_event = ((in->type & 0x80) != 0); +@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) + cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); + + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->display = cookie->display; + out->extension = in->extension; + out->evtype = in->evtype; +@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) + out->info = (XIHierarchyInfo*)&out[1]; + out->display = cookie->display; + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->extension = in->extension; + out->evtype = in->evtype; + out->send_event = ((in->type & 0x80) != 0); +@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook + + out = next_block(&ptr, sizeof(XIRawEvent)); + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->display = cookie->display; + out->extension = in->extension; + out->evtype = in->evtype; +@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) + out->buttons.mask = (unsigned char*)&out[1]; + + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->display = cookie->display; + out->extension = in->extension; + out->evtype = in->evtype; +@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) + cookie->data = out; + + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->extension = in->extension; + out->evtype = in->evtype; + out->send_event = ((in->type & 0x80) != 0); +@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, + cookie->data = out; + + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->display = cookie->display; + out->extension = in->extension; + out->evtype = in->evtype; +@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) + + out->display = cookie->display; + out->type = in->type; ++ out->serial = in->sequenceNumber; + out->extension = in->extension; + out->evtype = in->evtype; + out->send_event = ((in->type & 0x80) != 0); +-- +1.8.1.4 + diff --git a/libXi.spec b/libXi.spec index d079f03..c57a396 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,6 +17,8 @@ Source1: make-git-snapshot.sh Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif +Patch01: 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch + BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -43,6 +45,7 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch01 -p1 # Disable static library creation by default. %define with_static 0 @@ -89,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 17 2013 Peter Hutterer 1.7.1-2 +- copy the sequence number into XI2 events + * Fri Apr 05 2013 Peter Hutterer 1.7.1-1 - libXi 1.7.1 From 63bafba8fdf7ff99b5617d02e0bd048126f92cef Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 21 May 2013 12:21:25 +1000 Subject: [PATCH 46/96] fix sequence number copy - the cookie already had (a potentially different) sequence number copied (#965347) --- ...-the-sequence-number-into-the-target-event-too-6.patch | 8 -------- libXi.spec | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch index 61988bd..aa41fc7 100644 --- a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch +++ b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch @@ -15,14 +15,6 @@ diff --git a/src/XExtInt.c b/src/XExtInt.c index 507573b..2139c6a 100644 --- a/src/XExtInt.c +++ b/src/XExtInt.c -@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -+ cookie->serial = ev->sequenceNumber; - } - - static Bool @@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); out->display = cookie->display; diff --git a/libXi.spec b/libXi.spec index c57a396..0fb1d66 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue May 21 2013 Peter Hutterer 1.7.1-3 +- fix sequence number copy - the cookie already had (a potentially + different) sequence number copied (#965347) + * Fri May 17 2013 Peter Hutterer 1.7.1-2 - copy the sequence number into XI2 events From 2854367d941a029399de8a87ded205567dc34d65 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 24 May 2013 11:21:22 +1000 Subject: [PATCH 47/96] Udpate to git snapshot to fix CVEs listed below - CVE-2013-1984 - CVE-2013-1995 - CVE-2013-1998 --- .gitignore | 1 + ...e-number-into-the-target-event-too-6.patch | 84 ------------------- commitid | 2 +- libXi.spec | 15 ++-- sources | 2 +- 5 files changed, 12 insertions(+), 92 deletions(-) delete mode 100644 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch diff --git a/.gitignore b/.gitignore index 96003b4..566c484 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.6.99.1.tar.bz2 /libXi-1.7.tar.bz2 /libXi-1.7.1.tar.bz2 +/libXi-20130524.tar.bz2 diff --git a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch deleted file mode 100644 index aa41fc7..0000000 --- a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4ee15c55da848c9f3334e9750f28be81bfd6a312 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH libXi] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 - -Signed-off-by: Peter Hutterer ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..2139c6a 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.1.4 - diff --git a/commitid b/commitid index 6ebb904..0090725 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -ae0187c8708d2378373889827117911086581fdd +661c45ca17c434dbd342a46fd3fb813852ae0ca9 diff --git a/libXi.spec b/libXi.spec index 0fb1d66..552954e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,11 +1,11 @@ %global tarball libXi -#global gitdate 20111222 -#global gitversion ae0187c87 +%global gitdate 20130524 +%global gitversion 661c45ca1 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,8 +17,6 @@ Source1: make-git-snapshot.sh Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -45,7 +43,6 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch01 -p1 # Disable static library creation by default. %define with_static 0 @@ -92,6 +89,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 24 2013 Peter Hutterer 1.7.1-4.20130524git661c45ca1 +- Udpate to git snapshot to fix CVEs listed below +- CVE-2013-1984 +- CVE-2013-1995 +- CVE-2013-1998 + * Tue May 21 2013 Peter Hutterer 1.7.1-3 - fix sequence number copy - the cookie already had (a potentially different) sequence number copied (#965347) diff --git a/sources b/sources index d6adad4..fdbc6b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24d71afed1b86c60d4eb361628d7f47b libXi-1.7.1.tar.bz2 +d2e9cfd547e8389aebe78dee2b7151c8 libXi-20130524.tar.bz2 From dc251cfaab768f17e4419da4f9a3b6947bc93077 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 28 May 2013 09:42:07 +1000 Subject: [PATCH 48/96] Require libX11 1.6RC2 for _XEatDataWords --- libXi.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libXi.spec b/libXi.spec index 552954e..db692d9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.1 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -21,11 +21,11 @@ BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(inputproto) >= 2.2.99.1 -BuildRequires: libX11-devel >= 1.4.99.1 +BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXext-devel libXfixes-devel BuildRequires: xmlto asciidoc >= 8.4.5 -Requires: libX11 >= 1.4.99.1 +Requires: libX11 >= 1.5.99.902 %description X.Org X11 libXi runtime library @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon May 27 2013 Peter Hutterer - 1.7.1-5.20130524git661c45ca1 +- Require libX11 1.6RC2 for _XEatDataWords + * Fri May 24 2013 Peter Hutterer 1.7.1-4.20130524git661c45ca1 - Udpate to git snapshot to fix CVEs listed below - CVE-2013-1984 From e85befc1385df83a6b7cf4135386f759576ae8eb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Jun 2013 08:55:18 +1000 Subject: [PATCH 49/96] libXi 1.7.1.901 --- .gitignore | 1 + libXi.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 566c484..b72f701 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.tar.bz2 /libXi-1.7.1.tar.bz2 /libXi-20130524.tar.bz2 +/libXi-1.7.1.901.tar.bz2 diff --git a/libXi.spec b/libXi.spec index db692d9..a2558bf 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,11 +1,11 @@ %global tarball libXi -%global gitdate 20130524 +#global gitdate 20130524 %global gitversion 661c45ca1 Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.1 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.7.1.901 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jun 27 2013 Peter Hutterer 1.7.1.901-1 +- libXi 1.7.1.901 + * Mon May 27 2013 Peter Hutterer - 1.7.1-5.20130524git661c45ca1 - Require libX11 1.6RC2 for _XEatDataWords diff --git a/sources b/sources index fdbc6b7..e9f80a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2e9cfd547e8389aebe78dee2b7151c8 libXi-20130524.tar.bz2 +8a775d5368c9fb64aa484fb320b0c82d libXi-1.7.1.901.tar.bz2 From 56f8638c7562ae58b180cd36fadb028af6639200 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 3 Jul 2013 11:07:37 +1000 Subject: [PATCH 50/96] libXi 1.7.2 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b72f701..388dd59 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.1.tar.bz2 /libXi-20130524.tar.bz2 /libXi-1.7.1.901.tar.bz2 +/libXi-1.7.2.tar.bz2 diff --git a/libXi.spec b/libXi.spec index a2558bf..7ff9bb3 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.1.901 +Version: 1.7.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jul 03 2013 Peter Hutterer 1.7.2-1 +- libXi 1.7.2 + * Thu Jun 27 2013 Peter Hutterer 1.7.1.901-1 - libXi 1.7.1.901 diff --git a/sources b/sources index e9f80a5..c7c5acf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a775d5368c9fb64aa484fb320b0c82d libXi-1.7.1.901.tar.bz2 +f4df3532b1af1dcc905d804f55b30b4a libXi-1.7.2.tar.bz2 From d40f04ff187b70a11fa7155255e21f050ffa15d0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:41:24 -0500 Subject: [PATCH 51/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 7ff9bb3..f667529 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.2 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 03 2013 Peter Hutterer 1.7.2-1 - libXi 1.7.2 From 6568e4bb614d010b8352a737aa02af81055d99f1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:28:52 -0500 Subject: [PATCH 52/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index f667529..ac1f671 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From cdb7cf1f32a1e2e575b31eb607580a2209191ec4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 Jul 2014 09:01:25 +1000 Subject: [PATCH 53/96] libXi 1.7.3 --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 388dd59..bcf8d33 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ libXi-1.4.0.tar.bz2 /libXi-20130524.tar.bz2 /libXi-1.7.1.901.tar.bz2 /libXi-1.7.2.tar.bz2 +/libXi-1.7.3.tar.bz2 diff --git a/libXi.spec b/libXi.spec index ac1f671..d2ba8b8 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.2 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.7.3 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 10 2014 Peter Hutterer 1.7.3-1 +- libXi 1.7.3 + * Sat Jun 07 2014 Fedora Release Engineering - 1.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index c7c5acf..b14f4fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4df3532b1af1dcc905d804f55b30b4a libXi-1.7.2.tar.bz2 +664166b93853692bc582540a9bb4e590 libXi-1.7.3.tar.bz2 From d90fe7095ca34d26b394ac4fb9deae42de109f58 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Jul 2014 16:48:50 +1000 Subject: [PATCH 54/96] libXi 1.7.4 --- .gitignore | 1 + libXi.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bcf8d33..d245f10 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.1.901.tar.bz2 /libXi-1.7.2.tar.bz2 /libXi-1.7.3.tar.bz2 +/libXi-1.7.4.tar.bz2 diff --git a/libXi.spec b/libXi.spec index d2ba8b8..bd4205e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jul 18 2014 Peter Hutterer 1.7.4-1 +- libXi 1.7.4 + * Thu Jul 10 2014 Peter Hutterer 1.7.3-1 - libXi 1.7.3 diff --git a/sources b/sources index b14f4fd..2a88387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -664166b93853692bc582540a9bb4e590 libXi-1.7.3.tar.bz2 +9c4a69c34b19ec1e4212e849549544cb libXi-1.7.4.tar.bz2 From 4fa4465a83cadc848a1c51aea29e24a31554fb50 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:06:13 +0000 Subject: [PATCH 55/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index bd4205e..22584c2 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.4 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 18 2014 Peter Hutterer 1.7.4-1 - libXi 1.7.4 From 0a062cd1b036db8d7d9b86f797556f84ffaf629c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 14:10:29 +0000 Subject: [PATCH 56/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 22584c2..ba00ebc 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.4 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6a28bd14fe66f5948e76634f0ac154cededd0a82 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 Sep 2015 01:28:00 +1000 Subject: [PATCH 57/96] libXi 1.7.5 --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d245f10..86dc01b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.2.tar.bz2 /libXi-1.7.3.tar.bz2 /libXi-1.7.4.tar.bz2 +/libXi-1.7.5.tar.bz2 diff --git a/libXi.spec b/libXi.spec index ba00ebc..61f4247 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.4 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 1.7.5 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Sep 10 2015 Peter Hutterer 1.7.5-1 +- libXi 1.7.5 + * Wed Jun 17 2015 Fedora Release Engineering - 1.7.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 2a88387..5520ec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c4a69c34b19ec1e4212e849549544cb libXi-1.7.4.tar.bz2 +9f02462855c598a0cd0ddfd98c6e25f5 libXi-1.7.5.tar.bz2 From 8277c5234fe2295957a1c8adeb5131f4848bee32 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 22 Dec 2015 11:22:21 +1000 Subject: [PATCH 58/96] libXi 1.7.6 drop unused mandir creation --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 86dc01b..72b6362 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.3.tar.bz2 /libXi-1.7.4.tar.bz2 /libXi-1.7.5.tar.bz2 +/libXi-1.7.6.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 61f4247..b78b2d5 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.5 +Version: 1.7.6 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries @@ -85,10 +85,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/extensions/XInput2.h %{_libdir}/libXi.so %{_libdir}/pkgconfig/xi.pc -#%dir %{_mandir}/man3x %{_mandir}/man3/*.3* %changelog +* Tue Dec 22 2015 Peter Hutterer 1.7.6-1 +- libXi 1.7.6 +- drop unused mandir creation + * Thu Sep 10 2015 Peter Hutterer 1.7.5-1 - libXi 1.7.5 diff --git a/sources b/sources index 5520ec9..c814410 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f02462855c598a0cd0ddfd98c6e25f5 libXi-1.7.5.tar.bz2 +510e555ecfffa8d2298a0f42b725e563 libXi-1.7.6.tar.bz2 From b1b371fffa6386a12497ebab967c76d63d75813b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Jan 2016 07:36:34 +1000 Subject: [PATCH 59/96] Drop the optional disable-static, it's been disabled for years now. --- libXi.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libXi.spec b/libXi.spec index b78b2d5..285355b 100644 --- a/libXi.spec +++ b/libXi.spec @@ -44,15 +44,10 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -# Disable static library creation by default. -%define with_static 0 - %build autoreconf -v --install || exit 1 %configure --disable-specs \ -%if ! %{with_static} - --disable-static -%endif + --disable-static make %{?_smp_mflags} @@ -78,9 +73,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%if %{with_static} -%{_libdir}/libXi.a -%endif %{_includedir}/X11/extensions/XInput.h %{_includedir}/X11/extensions/XInput2.h %{_libdir}/libXi.so @@ -88,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Jan 05 2016 Peter Hutterer +- Drop the optional disable-static, it's been disabled for years now. + * Tue Dec 22 2015 Peter Hutterer 1.7.6-1 - libXi 1.7.6 - drop unused mandir creation From 64a8246c391fe4d80b35c284ea7af9939cfe548e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Jan 2016 17:12:01 +1000 Subject: [PATCH 60/96] Remove unnecessary defattr --- libXi.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 285355b..e578b2e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -66,13 +66,11 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING %{_libdir}/libXi.so.6 %{_libdir}/libXi.so.6.1.0 %files devel -%defattr(-,root,root,-) %{_includedir}/X11/extensions/XInput.h %{_includedir}/X11/extensions/XInput2.h %{_libdir}/libXi.so @@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jan 28 2016 Peter Hutterer +- Remove unnecessary defattr + * Tue Jan 05 2016 Peter Hutterer - Drop the optional disable-static, it's been disabled for years now. From d9b4136509c0da11cd656dcf12d586a3ae8a81c7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:50:55 +0000 Subject: [PATCH 61/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index e578b2e..12ef1e8 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.6 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 28 2016 Peter Hutterer - Remove unnecessary defattr From 491dac47f39c535532055cca0f55b4a2249ee58d Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Fri, 25 Mar 2016 10:47:56 +0100 Subject: [PATCH 62/96] Fix release string: %{dist} -> %{?dist} --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 12ef1e8..c70a4ae 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.6 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Mar 25 2016 Benjamin Tissoires +- Fix release string: %{dist} -> %{?dist} + * Thu Feb 04 2016 Fedora Release Engineering - 1.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4c3a6bbf3c8e2f687e48d33210209069ae93c3b7 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 5 Oct 2016 11:36:23 +0200 Subject: [PATCH 63/96] libXi 1.7.7 - fixes CVE-2016-7945, CVE-2016-7946 --- .gitignore | 1 + libXi.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 72b6362..db0e5b0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.4.tar.bz2 /libXi-1.7.5.tar.bz2 /libXi-1.7.6.tar.bz2 +/libXi-1.7.7.tar.bz2 diff --git a/libXi.spec b/libXi.spec index c70a4ae..49d25c8 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.6 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.7.7 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Oct 05 2016 Benjamin Tissoires 1.7.7-1 +- libXi 1.7.7 +- fixes CVE-2016-7945, CVE-2016-7946 + * Fri Mar 25 2016 Benjamin Tissoires - Fix release string: %{dist} -> %{?dist} diff --git a/sources b/sources index c814410..94f2830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -510e555ecfffa8d2298a0f42b725e563 libXi-1.7.6.tar.bz2 +cc0883a898222d50ff79af3f83595823 libXi-1.7.7.tar.bz2 From 0d388fb26ad5eb414906e98f3c2399c4b591f41c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 13 Oct 2016 14:09:31 +1000 Subject: [PATCH 64/96] Fix crash when calling XListInputDevices on devices without classes --- ...o-can-return-0-even-without-an-error.patch | 98 +++++++++++++ ...s-don-t-touch-ndevices-in-case-of-er.patch | 132 ++++++++++++++++++ libXi.spec | 10 +- 3 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 0001-SizeClassInfo-can-return-0-even-without-an-error.patch create mode 100644 0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch diff --git a/0001-SizeClassInfo-can-return-0-even-without-an-error.patch b/0001-SizeClassInfo-can-return-0-even-without-an-error.patch new file mode 100644 index 0000000..b1dc325 --- /dev/null +++ b/0001-SizeClassInfo-can-return-0-even-without-an-error.patch @@ -0,0 +1,98 @@ +From 5010fe92202e98f3117be319aae268c5ab82c8ef Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider +Date: Fri, 7 Oct 2016 21:46:44 +0200 +Subject: [PATCH v2 libXi 1/2] SizeClassInfo can return 0 even without an error + +Catch the error case separately. Commit 19a9cd607d added length checking to +SizeClassInfo but re-used the return value of 0 for an error. A device without +classes (as is initialized by xf86-input-libinput for tablets) can +legitimately return 0 and erroneously triggers an error. +Fix this by using a separate value for the error. + +Reproducible by calling XListInputDevices() with a tablet attached. + +This fixes a regression introduced in commit 19a9cd607d. + +Signed-off-by: Niels Ole Salscheider +Signed-off-by: Peter Hutterer +--- +Changes to v1: +- don't touch *size until we're sure. +- expand commit message + +Niels: +I left you as author and your signed-off-by since it's essentially your +patch with a minor change. + + src/XListDev.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/src/XListDev.c b/src/XListDev.c +index f850cd0..e4bd3d5 100644 +--- a/src/XListDev.c ++++ b/src/XListDev.c +@@ -73,27 +73,28 @@ static int pad_to_xid(int base_size) + return ((base_size + padsize - 1)/padsize) * padsize; + } + +-static size_t +-SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes) ++static int ++SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes, size_t *size) + { +- int size = 0; + int j; ++ size_t sz = 0; ++ + for (j = 0; j < num_classes; j++) { + switch ((*any)->class) { + case KeyClass: +- size += pad_to_xid(sizeof(XKeyInfo)); ++ sz += pad_to_xid(sizeof(XKeyInfo)); + break; + case ButtonClass: +- size += pad_to_xid(sizeof(XButtonInfo)); ++ sz += pad_to_xid(sizeof(XButtonInfo)); + break; + case ValuatorClass: + { + xValuatorInfoPtr v; + + if (len < sizeof(v)) +- return 0; ++ return 1; + v = (xValuatorInfoPtr) *any; +- size += pad_to_xid(sizeof(XValuatorInfo) + ++ sz += pad_to_xid(sizeof(XValuatorInfo) + + (v->num_axes * sizeof(XAxisInfo))); + break; + } +@@ -101,11 +102,13 @@ SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes) + break; + } + if ((*any)->length > len) +- return 0; ++ return 1; + *any = (xAnyClassPtr) ((char *)(*any) + (*any)->length); + } + +- return size; ++ *size = sz; ++ ++ return 0; + } + + static void +@@ -220,8 +223,7 @@ XListInputDevices( + sav_any = any; + end = (char *)list + rlen; + for (i = 0; i < *ndevices; i++, list++) { +- s = SizeClassInfo(&any, end - (char *)any, (int)list->num_classes); +- if (!s) ++ if(SizeClassInfo(&any, end - (char *)any, (int)list->num_classes, &s)) + goto out; + size += s; + } +-- +2.7.4 + diff --git a/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch b/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch new file mode 100644 index 0000000..9b92cc4 --- /dev/null +++ b/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch @@ -0,0 +1,132 @@ +From e821996b443e926a2cbab0eae38b33bad73e6060 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 13 Oct 2016 13:33:11 +1000 +Subject: [PATCH v2 libXi 2/2] XListInputDevices: don't touch ndevices in case of + error + +We used to always set *ndevices to the number of devices returned by the +server. This magically worked because we pretty much never returned an error +except on faulty server or library implementations. With 19a9cd60 we now have +more chances of getting an error, so the polite thing is to just leave *ndevices +alone when we error out. + +Document it as such in the man page, just in case someone accidentally reads +it. + +Signed-off-by: Peter Hutterer +CC: Niels Ole Salscheider +--- +Changes to v1: +- Niels' first patch set ndevices to 0, this one leaves it untouched + + man/XListInputDevices.txt | 12 ++++++++++-- + src/XListDev.c | 21 ++++++++++++--------- + 2 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/man/XListInputDevices.txt b/man/XListInputDevices.txt +index 276660d..450f377 100644 +--- a/man/XListInputDevices.txt ++++ b/man/XListInputDevices.txt +@@ -220,5 +220,13 @@ DESCRIPTION + Floating. If the device is a master device, attached specifies + the device ID of the master device this device is paired with. + +- To free the XDeviceInfo array created by XListInputDevices, use +- XFreeDeviceList. ++RETURN VALUE ++------------ ++ ++ XListInputDevices returns a pointer to an array of XDeviceInfo ++ structs and sets ndevices_return to the number of elements in ++ that array. To free the XDeviceInfo array created by ++ XListInputDevices, use XFreeDeviceList. ++ ++ On error, XListInputDevices returns NULL and ndevices_return is ++ left unmodified. +diff --git a/src/XListDev.c b/src/XListDev.c +index e4bd3d5..dda6011 100644 +--- a/src/XListDev.c ++++ b/src/XListDev.c +@@ -175,7 +175,7 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) + XDeviceInfo * + XListInputDevices( + register Display *dpy, +- int *ndevices) ++ int *ndevices_return) + { + size_t s, size; + xListInputDevicesReq *req; +@@ -190,6 +190,7 @@ XListInputDevices( + int i; + unsigned long rlen; + XExtDisplayInfo *info = XInput_find_display(dpy); ++ int ndevices; + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) +@@ -205,8 +206,8 @@ XListInputDevices( + return (XDeviceInfo *) NULL; + } + +- if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ +- size = *ndevices * sizeof(XDeviceInfo); ++ if ((ndevices = rep.ndevices)) { /* at least 1 input device */ ++ size = ndevices * sizeof(XDeviceInfo); + if (rep.length < (INT_MAX >> 2)) { + rlen = rep.length << 2; /* multiply length by 4 */ + slist = list = Xmalloc(rlen); +@@ -219,17 +220,17 @@ XListInputDevices( + } + _XRead(dpy, (char *)list, rlen); + +- any = (xAnyClassPtr) ((char *)list + (*ndevices * sizeof(xDeviceInfo))); ++ any = (xAnyClassPtr) ((char *)list + (ndevices * sizeof(xDeviceInfo))); + sav_any = any; + end = (char *)list + rlen; +- for (i = 0; i < *ndevices; i++, list++) { ++ for (i = 0; i < ndevices; i++, list++) { + if(SizeClassInfo(&any, end - (char *)any, (int)list->num_classes, &s)) + goto out; + size += s; + } + + Nptr = ((unsigned char *)list) + rlen; +- for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { ++ for (i = 0, nptr = (unsigned char *)any; i < ndevices; i++) { + if (nptr >= Nptr) + goto out; + size += *nptr + 1; +@@ -245,10 +246,10 @@ XListInputDevices( + } + sclist = clist; + Any = (XAnyClassPtr) ((char *)clist + +- (*ndevices * sizeof(XDeviceInfo))); ++ (ndevices * sizeof(XDeviceInfo))); + list = slist; + any = sav_any; +- for (i = 0; i < *ndevices; i++, list++, clist++) { ++ for (i = 0; i < ndevices; i++, list++, clist++) { + clist->type = list->type; + clist->id = list->id; + clist->use = list->use; +@@ -261,7 +262,7 @@ XListInputDevices( + clist = sclist; + nptr = (unsigned char *)any; + Nptr = (unsigned char *)Any; +- for (i = 0; i < *ndevices; i++, clist++) { ++ for (i = 0; i < ndevices; i++, clist++) { + clist->name = (char *)Nptr; + memcpy(Nptr, nptr + 1, *nptr); + Nptr += (*nptr); +@@ -270,6 +271,8 @@ XListInputDevices( + } + } + ++ *ndevices_return = ndevices; ++ + out: + XFree((char *)slist); + UnlockDisplay(dpy); +-- +2.7.4 + diff --git a/libXi.spec b/libXi.spec index 49d25c8..397195a 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.7 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,6 +17,9 @@ Source1: make-git-snapshot.sh Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif +Patch01: 0001-SizeClassInfo-can-return-0-even-without-an-error.patch +Patch02: 0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch + BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -43,6 +46,8 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch01 -p1 +%patch02 -p1 %build autoreconf -v --install || exit 1 @@ -78,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Oct 13 2016 Peter Hutterer 1.7.7-2 +- Fix crash when calling XListInputDevices on devices without classes + * Wed Oct 05 2016 Benjamin Tissoires 1.7.7-1 - libXi 1.7.7 - fixes CVE-2016-7945, CVE-2016-7946 From 51d3c5993f98faa9180a87fbe1347a2f6942f491 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Oct 2016 12:44:23 +1000 Subject: [PATCH 65/96] libXi 1.7.8 --- .gitignore | 1 + ...o-can-return-0-even-without-an-error.patch | 98 ------------- ...s-don-t-touch-ndevices-in-case-of-er.patch | 132 ------------------ libXi.spec | 10 +- sources | 2 +- 5 files changed, 6 insertions(+), 237 deletions(-) delete mode 100644 0001-SizeClassInfo-can-return-0-even-without-an-error.patch delete mode 100644 0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch diff --git a/.gitignore b/.gitignore index db0e5b0..27f6a47 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.5.tar.bz2 /libXi-1.7.6.tar.bz2 /libXi-1.7.7.tar.bz2 +/libXi-1.7.8.tar.bz2 diff --git a/0001-SizeClassInfo-can-return-0-even-without-an-error.patch b/0001-SizeClassInfo-can-return-0-even-without-an-error.patch deleted file mode 100644 index b1dc325..0000000 --- a/0001-SizeClassInfo-can-return-0-even-without-an-error.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 5010fe92202e98f3117be319aae268c5ab82c8ef Mon Sep 17 00:00:00 2001 -From: Niels Ole Salscheider -Date: Fri, 7 Oct 2016 21:46:44 +0200 -Subject: [PATCH v2 libXi 1/2] SizeClassInfo can return 0 even without an error - -Catch the error case separately. Commit 19a9cd607d added length checking to -SizeClassInfo but re-used the return value of 0 for an error. A device without -classes (as is initialized by xf86-input-libinput for tablets) can -legitimately return 0 and erroneously triggers an error. -Fix this by using a separate value for the error. - -Reproducible by calling XListInputDevices() with a tablet attached. - -This fixes a regression introduced in commit 19a9cd607d. - -Signed-off-by: Niels Ole Salscheider -Signed-off-by: Peter Hutterer ---- -Changes to v1: -- don't touch *size until we're sure. -- expand commit message - -Niels: -I left you as author and your signed-off-by since it's essentially your -patch with a minor change. - - src/XListDev.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index f850cd0..e4bd3d5 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -73,27 +73,28 @@ static int pad_to_xid(int base_size) - return ((base_size + padsize - 1)/padsize) * padsize; - } - --static size_t --SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes) -+static int -+SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes, size_t *size) - { -- int size = 0; - int j; -+ size_t sz = 0; -+ - for (j = 0; j < num_classes; j++) { - switch ((*any)->class) { - case KeyClass: -- size += pad_to_xid(sizeof(XKeyInfo)); -+ sz += pad_to_xid(sizeof(XKeyInfo)); - break; - case ButtonClass: -- size += pad_to_xid(sizeof(XButtonInfo)); -+ sz += pad_to_xid(sizeof(XButtonInfo)); - break; - case ValuatorClass: - { - xValuatorInfoPtr v; - - if (len < sizeof(v)) -- return 0; -+ return 1; - v = (xValuatorInfoPtr) *any; -- size += pad_to_xid(sizeof(XValuatorInfo) + -+ sz += pad_to_xid(sizeof(XValuatorInfo) + - (v->num_axes * sizeof(XAxisInfo))); - break; - } -@@ -101,11 +102,13 @@ SizeClassInfo(xAnyClassPtr *any, size_t len, int num_classes) - break; - } - if ((*any)->length > len) -- return 0; -+ return 1; - *any = (xAnyClassPtr) ((char *)(*any) + (*any)->length); - } - -- return size; -+ *size = sz; -+ -+ return 0; - } - - static void -@@ -220,8 +223,7 @@ XListInputDevices( - sav_any = any; - end = (char *)list + rlen; - for (i = 0; i < *ndevices; i++, list++) { -- s = SizeClassInfo(&any, end - (char *)any, (int)list->num_classes); -- if (!s) -+ if(SizeClassInfo(&any, end - (char *)any, (int)list->num_classes, &s)) - goto out; - size += s; - } --- -2.7.4 - diff --git a/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch b/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch deleted file mode 100644 index 9b92cc4..0000000 --- a/0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e821996b443e926a2cbab0eae38b33bad73e6060 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 13 Oct 2016 13:33:11 +1000 -Subject: [PATCH v2 libXi 2/2] XListInputDevices: don't touch ndevices in case of - error - -We used to always set *ndevices to the number of devices returned by the -server. This magically worked because we pretty much never returned an error -except on faulty server or library implementations. With 19a9cd60 we now have -more chances of getting an error, so the polite thing is to just leave *ndevices -alone when we error out. - -Document it as such in the man page, just in case someone accidentally reads -it. - -Signed-off-by: Peter Hutterer -CC: Niels Ole Salscheider ---- -Changes to v1: -- Niels' first patch set ndevices to 0, this one leaves it untouched - - man/XListInputDevices.txt | 12 ++++++++++-- - src/XListDev.c | 21 ++++++++++++--------- - 2 files changed, 22 insertions(+), 11 deletions(-) - -diff --git a/man/XListInputDevices.txt b/man/XListInputDevices.txt -index 276660d..450f377 100644 ---- a/man/XListInputDevices.txt -+++ b/man/XListInputDevices.txt -@@ -220,5 +220,13 @@ DESCRIPTION - Floating. If the device is a master device, attached specifies - the device ID of the master device this device is paired with. - -- To free the XDeviceInfo array created by XListInputDevices, use -- XFreeDeviceList. -+RETURN VALUE -+------------ -+ -+ XListInputDevices returns a pointer to an array of XDeviceInfo -+ structs and sets ndevices_return to the number of elements in -+ that array. To free the XDeviceInfo array created by -+ XListInputDevices, use XFreeDeviceList. -+ -+ On error, XListInputDevices returns NULL and ndevices_return is -+ left unmodified. -diff --git a/src/XListDev.c b/src/XListDev.c -index e4bd3d5..dda6011 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -175,7 +175,7 @@ ParseClassInfo(xAnyClassPtr *any, XAnyClassPtr *Any, int num_classes) - XDeviceInfo * - XListInputDevices( - register Display *dpy, -- int *ndevices) -+ int *ndevices_return) - { - size_t s, size; - xListInputDevicesReq *req; -@@ -190,6 +190,7 @@ XListInputDevices( - int i; - unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); -+ int ndevices; - - LockDisplay(dpy); - if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) -@@ -205,8 +206,8 @@ XListInputDevices( - return (XDeviceInfo *) NULL; - } - -- if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ -- size = *ndevices * sizeof(XDeviceInfo); -+ if ((ndevices = rep.ndevices)) { /* at least 1 input device */ -+ size = ndevices * sizeof(XDeviceInfo); - if (rep.length < (INT_MAX >> 2)) { - rlen = rep.length << 2; /* multiply length by 4 */ - slist = list = Xmalloc(rlen); -@@ -219,17 +220,17 @@ XListInputDevices( - } - _XRead(dpy, (char *)list, rlen); - -- any = (xAnyClassPtr) ((char *)list + (*ndevices * sizeof(xDeviceInfo))); -+ any = (xAnyClassPtr) ((char *)list + (ndevices * sizeof(xDeviceInfo))); - sav_any = any; - end = (char *)list + rlen; -- for (i = 0; i < *ndevices; i++, list++) { -+ for (i = 0; i < ndevices; i++, list++) { - if(SizeClassInfo(&any, end - (char *)any, (int)list->num_classes, &s)) - goto out; - size += s; - } - - Nptr = ((unsigned char *)list) + rlen; -- for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { -+ for (i = 0, nptr = (unsigned char *)any; i < ndevices; i++) { - if (nptr >= Nptr) - goto out; - size += *nptr + 1; -@@ -245,10 +246,10 @@ XListInputDevices( - } - sclist = clist; - Any = (XAnyClassPtr) ((char *)clist + -- (*ndevices * sizeof(XDeviceInfo))); -+ (ndevices * sizeof(XDeviceInfo))); - list = slist; - any = sav_any; -- for (i = 0; i < *ndevices; i++, list++, clist++) { -+ for (i = 0; i < ndevices; i++, list++, clist++) { - clist->type = list->type; - clist->id = list->id; - clist->use = list->use; -@@ -261,7 +262,7 @@ XListInputDevices( - clist = sclist; - nptr = (unsigned char *)any; - Nptr = (unsigned char *)Any; -- for (i = 0; i < *ndevices; i++, clist++) { -+ for (i = 0; i < ndevices; i++, clist++) { - clist->name = (char *)Nptr; - memcpy(Nptr, nptr + 1, *nptr); - Nptr += (*nptr); -@@ -270,6 +271,8 @@ XListInputDevices( - } - } - -+ *ndevices_return = ndevices; -+ - out: - XFree((char *)slist); - UnlockDisplay(dpy); --- -2.7.4 - diff --git a/libXi.spec b/libXi.spec index 397195a..448b4d4 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.7 +Version: 1.7.8 Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries @@ -17,9 +17,6 @@ Source1: make-git-snapshot.sh Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-SizeClassInfo-can-return-0-even-without-an-error.patch -Patch02: 0002-XListInputDevices-don-t-touch-ndevices-in-case-of-er.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -46,8 +43,6 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch01 -p1 -%patch02 -p1 %build autoreconf -v --install || exit 1 @@ -83,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 25 2016 Peter Hutterer 1.7.8-2 +- libXi 1.7.8 + * Thu Oct 13 2016 Peter Hutterer 1.7.7-2 - Fix crash when calling XListInputDevices on devices without classes diff --git a/sources b/sources index 94f2830..4cd075a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc0883a898222d50ff79af3f83595823 libXi-1.7.7.tar.bz2 +94afc83e553d3c38a153f8f60301fd62 libXi-1.7.8.tar.bz2 From fe71444d5dc466fb6a5a179de576eb22d110f746 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 23 Jan 2017 14:06:17 +1000 Subject: [PATCH 66/96] libXi 1.7.9 --- .gitignore | 1 + libXi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 27f6a47..e4f61f1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.6.tar.bz2 /libXi-1.7.7.tar.bz2 /libXi-1.7.8.tar.bz2 +/libXi-1.7.9.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 448b4d4..589921e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.8 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.7.9 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Jan 23 2017 Peter Hutterer 1.7.9-1 +- libXi 1.7.9 + * Tue Oct 25 2016 Peter Hutterer 1.7.8-2 - libXi 1.7.8 diff --git a/sources b/sources index 4cd075a..922c551 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94afc83e553d3c38a153f8f60301fd62 libXi-1.7.8.tar.bz2 +SHA512 (libXi-1.7.9.tar.bz2) = 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5 From c1a657b7765f8a9c24de6321b4cb579ccb089b3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:19:23 +0000 Subject: [PATCH 67/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 589921e..266034a 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 23 2017 Peter Hutterer 1.7.9-1 - libXi 1.7.9 From f8912e95ac4c8ed603bc090e8ba9a90393be1e0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:28:08 +0000 Subject: [PATCH 68/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 266034a..1736f52 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.7.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 7438720cb338a248896140a2dcc75d5934de4a45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:07:54 +0000 Subject: [PATCH 69/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 1736f52..a484eb6 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.7.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 94dab1d55251856834d31b647d40bfbb2101646d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:07:07 +0000 Subject: [PATCH 70/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index a484eb6..202eaa6 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.7.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.7.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 23f65b8b37bd55e21cc50f03692b3365b8f17d64 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:05:01 +0100 Subject: [PATCH 71/96] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- libXi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 202eaa6..f0fa2d5 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Feb 09 2018 Igor Gnatenko - 1.7.9-6 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 1.7.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -104,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT - fixes CVE-2016-7945, CVE-2016-7946 * Fri Mar 25 2016 Benjamin Tissoires -- Fix release string: %{dist} -> %{?dist} +- Fix release string: %%{dist} -> %%{?dist} * Thu Feb 04 2016 Fedora Release Engineering - 1.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 22823f9ae9b74495a9b48bd3d305bd672d693239 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:18:40 +0100 Subject: [PATCH 72/96] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libXi.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libXi.spec b/libXi.spec index f0fa2d5..d09c4b9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -59,9 +59,6 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From e7b280c646663a6e2f5a834722c69b92fbb96f0f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 29 Jun 2018 17:26:01 -0400 Subject: [PATCH 73/96] Use ldconfig scriptlet macros --- libXi.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libXi.spec b/libXi.spec index d09c4b9..e39a444 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -59,8 +59,8 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files %doc COPYING @@ -75,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Fri Jun 29 2018 Adam Jackson - 1.7.9-7 +- Use ldconfig scriptlet macros + * Fri Feb 09 2018 Igor Gnatenko - 1.7.9-6 - Escape macros in %%changelog From 5ca92f976c0678ffac6c923fc1ad10cf353a58c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:45:45 +0000 Subject: [PATCH 74/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index e39a444..3f10372 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -75,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.7.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Adam Jackson - 1.7.9-7 - Use ldconfig scriptlet macros From 233ca159e1590ec1bd270895d1399677f8b00639 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 75/96] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libXi.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 3f10372..caa6db2 100644 --- a/libXi.spec +++ b/libXi.spec @@ -7,7 +7,6 @@ Name: libXi Version: 1.7.9 Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT -Group: System Environment/Libraries URL: http://www.x.org %if 0%{?gitdate} @@ -32,7 +31,6 @@ X.Org X11 libXi runtime library %package devel Summary: X.Org X11 libXi development package -Group: Development/Libraries Requires: %{name} = %{version}-%{release} # required by xi.pc Requires: xorg-x11-proto-devel From 1693e41c7ecb563de4aa11fbdc8a5638e225fb61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:36:10 +0000 Subject: [PATCH 76/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index caa6db2..acf7244 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.9 -Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -73,6 +73,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.7.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.7.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f0903af3ce385e29f5cbfc68e676c8eb0180b0a1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 19 Jun 2019 13:28:46 -0400 Subject: [PATCH 77/96] libXi 1.7.10 --- .gitignore | 1 + libXi.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e4f61f1..4734ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.7.7.tar.bz2 /libXi-1.7.8.tar.bz2 /libXi-1.7.9.tar.bz2 +/libXi-1.7.10.tar.bz2 diff --git a/libXi.spec b/libXi.spec index acf7244..e010d50 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.9 -Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.7.10 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -13,7 +13,7 @@ URL: http://www.x.org Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh %else -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif BuildRequires: autoconf automake libtool @@ -73,6 +73,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Wed Jun 19 2019 Adam Jackson - 1.7.10-1 +- libXi 1.7.10 + * Fri Feb 01 2019 Fedora Release Engineering - 1.7.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 922c551..7e837df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXi-1.7.9.tar.bz2) = 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5 +SHA512 (libXi-1.7.10.tar.bz2) = 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 From 8afe9ef7930759ced37ad49b67aa804ca9601ff5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:43:10 +0000 Subject: [PATCH 78/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index e010d50..99c4f08 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -73,6 +73,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.7.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 19 2019 Adam Jackson - 1.7.10-1 - libXi 1.7.10 From 703fee13bb75035f9d3c802385584c44798415e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:28:47 +0000 Subject: [PATCH 79/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 99c4f08..2be2ee9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -73,6 +73,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.7.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.7.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7318ea9dcf1efa15f7d580cb191e7266c5728146 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:10:02 +0000 Subject: [PATCH 80/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 2be2ee9..937c5b9 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -73,6 +73,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.7.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2b854983428caae290a9434445cb3896e141a2ff Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Nov 2020 11:25:49 +1000 Subject: [PATCH 81/96] Add BuildRequires for make --- libXi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 937c5b9..b235596 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -16,6 +16,7 @@ Source1: make-git-snapshot.sh Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif +BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -73,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Nov 5 11:25:48 AEST 2020 Peter Hutterer - 1.7.10-5 +- Add BuildRequires for make + * Tue Jul 28 2020 Fedora Release Engineering - 1.7.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f8247cfa3c88cea107f983fe66a1614238dc28eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:35:19 +0000 Subject: [PATCH 82/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index b235596..11ff570 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 5 11:25:48 AEST 2020 Peter Hutterer - 1.7.10-5 - Add BuildRequires for make From 7020a618058033cd77be5066f9e4718615d0bf98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:53:05 +0000 Subject: [PATCH 83/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 11ff570..888b0cf 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.10 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.7.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 70da9c37587f3c2d824fd83b3bc9964857ad4831 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 16 Sep 2021 08:42:56 +1000 Subject: [PATCH 84/96] libXi 1.8 --- .gitignore | 26 +------------------------- libXi.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 4734ba0..222564e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1 @@ -libXi-1.4.0.tar.bz2 -/libXi-1.4.1.tar.bz2 -/libXi-1.4.2.tar.bz2 -/libXi-1.4.3.tar.bz2 -/libXi-1.4.99.1.tar.bz2 -/libXi-1.5.0.tar.bz2 -/libXi-20111221.tar.bz2 -/libXi-20111222.tar.bz2 -/libXi-1.5.99.3.tar.bz2 -/libXi-1.6.0.tar.bz2 -/libXi-1.6.1.tar.bz2 -/libXi-1.6.99.1.tar.bz2 -/libXi-1.7.tar.bz2 -/libXi-1.7.1.tar.bz2 -/libXi-20130524.tar.bz2 -/libXi-1.7.1.901.tar.bz2 -/libXi-1.7.2.tar.bz2 -/libXi-1.7.3.tar.bz2 -/libXi-1.7.4.tar.bz2 -/libXi-1.7.5.tar.bz2 -/libXi-1.7.6.tar.bz2 -/libXi-1.7.7.tar.bz2 -/libXi-1.7.8.tar.bz2 -/libXi-1.7.9.tar.bz2 -/libXi-1.7.10.tar.bz2 +/libXi-1.*.tar.bz2 diff --git a/libXi.spec b/libXi.spec index 888b0cf..9b12fcc 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.7.10 -Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.8 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -20,7 +20,7 @@ BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 2.2.99.1 +BuildRequires: pkgconfig(inputproto) >= 2.3.99.1 BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXext-devel libXfixes-devel BuildRequires: xmlto asciidoc >= 8.4.5 @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Sep 16 2021 Peter Hutterer - 1.8-1 +- libXi 1.8 + * Thu Jul 22 2021 Fedora Release Engineering - 1.7.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -307,7 +310,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - Update to today's git master * Thu Feb 26 2009 Peter Hutterer - 1.2.1-1 -- libXi 1.2.1 +- libXi 1.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 7e837df..16e0b7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXi-1.7.10.tar.bz2) = 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 +SHA512 (libXi-1.8.tar.bz2) = 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba From ef77b80a986e068b974ad9fe1b8881b3b720b3ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:41:00 +0000 Subject: [PATCH 85/96] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 9b12fcc..708c02f 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Sep 16 2021 Peter Hutterer - 1.8-1 - libXi 1.8 From 60edba2850864a418fc26bad25f959a313d5092d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:13:48 +0000 Subject: [PATCH 86/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 708c02f..0bbb8f7 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c83261fbd3ca6f4176787c9a5417cf808ac1fcef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:44:58 +0000 Subject: [PATCH 87/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 0bbb8f7..e103bd5 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 03136b8594137d567654ee70fd6eba2d4a71358d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 4 May 2023 15:10:59 +1000 Subject: [PATCH 88/96] libXi 1.8.1 --- .gitignore | 2 +- libXi.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 222564e..d7b37f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libXi-1.*.tar.bz2 +/libXi-1.*.tar.xz diff --git a/libXi.spec b/libXi.spec index e103bd5..cca5953 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.8 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.8.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -13,7 +13,7 @@ URL: http://www.x.org Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh %else -Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz %endif BuildRequires: make @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu May 04 2023 Peter Hutterer - 1.8.1-1 +- libXi 1.8.1 + * Thu Jan 19 2023 Fedora Release Engineering - 1.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 16e0b7b..b4d0ebe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXi-1.8.tar.bz2) = 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba +SHA512 (libXi-1.8.1.tar.xz) = a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 From 70a4d1ced22a646f3674a13feac55d66d2e8b916 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:11:35 +0000 Subject: [PATCH 89/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index cca5953..731fe97 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 04 2023 Peter Hutterer - 1.8.1-1 - libXi 1.8.1 From 9e10205ed80931e281fa67233874a2fd3b796818 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 6 Sep 2023 17:39:25 +0200 Subject: [PATCH 90/96] SPDX migration --- libXi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index 731fe97..dcbbbe0 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,8 +5,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org %if 0%{?gitdate} @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Wed Sep 06 2023 Benjamin Tissoires - 1.8.1-3 +- SPDX migration + * Thu Jul 20 2023 Fedora Release Engineering - 1.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 36b07e318a1a00e54e9c5189f69deaaf2091ed19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:30:24 +0000 Subject: [PATCH 91/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index dcbbbe0..9a9c835 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 06 2023 Benjamin Tissoires - 1.8.1-3 - SPDX migration From 7694c421f5521e5aef8a311e2b23651da1d8f953 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:27:52 +0000 Subject: [PATCH 92/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 9a9c835..f810bce 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.1 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 53dcedb415a41c1bb6a8be8765c3d037f109b5b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:15:00 +0000 Subject: [PATCH 93/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index f810bce..cd6db0d 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.1 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 009d19a69a010031c6e76a4877096de99c7a19ac Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Sep 2024 11:27:57 +1000 Subject: [PATCH 94/96] libXi 1.8.2 --- libXi.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libXi.spec b/libXi.spec index cd6db0d..8412d51 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.8.1 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.8.2 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Sep 05 2024 Peter Hutterer - 1.8.2-1 +- libXi 1.8.2 + * Thu Jul 18 2024 Fedora Release Engineering - 1.8.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index b4d0ebe..4f3bb54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXi-1.8.1.tar.xz) = a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 +SHA512 (libXi-1.8.2.tar.xz) = 6348aae8f595217e26f348184dd594d83af800949f649bfd11b6aef7387faa5624ed18551fe2c3a38c8deab9d7473f72fd7e3e8472cff3ff30d4bb3fb2e6dc31 From 2e97de1ba831d8260a5fdbeeb0d8e1af9672cca8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:30:21 +0000 Subject: [PATCH 95/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index 8412d51..a34c07a 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.2 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Sep 05 2024 Peter Hutterer - 1.8.2-1 - libXi 1.8.2 From 7d1f50d83cae1be650d3be41aacba8ec3446d85b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:18:23 +0000 Subject: [PATCH 96/96] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libXi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXi.spec b/libXi.spec index a34c07a..2b472ea 100644 --- a/libXi.spec +++ b/libXi.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.8.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT-open-group AND SMLNJ AND MIT URL: http://www.x.org @@ -74,6 +74,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild