From 4fa4465a83cadc848a1c51aea29e24a31554fb50 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:06:13 +0000 Subject: [PATCH 01/42] - 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 02/42] - 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 03/42] 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 04/42] 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 05/42] 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 06/42] 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 07/42] - 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 08/42] 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 09/42] 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 10/42] 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 11/42] 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 12/42] 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 13/42] - 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 14/42] - 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 15/42] - 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 16/42] - 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 17/42] 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 18/42] 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 19/42] 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 20/42] - 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 21/42] 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 22/42] - 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 23/42] 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 24/42] - 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 25/42] - 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 26/42] - 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 27/42] 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 28/42] - 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 29/42] - 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 30/42] 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 31/42] - 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 32/42] 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 33/42] 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 34/42] 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 35/42] 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 36/42] 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 37/42] 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 38/42] 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 39/42] 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 40/42] 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 41/42] 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 42/42] 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