libXres 1.2.1

This commit is contained in:
Benjamin Tissoires 2021-09-21 12:15:52 +02:00
parent f9de4475b3
commit ae36bd26a3
4 changed files with 7 additions and 38 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ libXres-1.0.4.tar.bz2
/libXres-20130524.tar.bz2 /libXres-20130524.tar.bz2
/libXres-1.0.7.tar.bz2 /libXres-1.0.7.tar.bz2
/libXres-1.2.0.tar.bz2 /libXres-1.2.0.tar.bz2
/libXres-1.2.1.tar.bz2

View File

@ -1,33 +0,0 @@
From 3e6bdd90c604e061c71715865eb403ffdd0dd7f0 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 21 Oct 2020 10:03:23 -0400
Subject: [PATCH] XRes: Use _XRead instead of _XRead32 for reading pid
_XRead32 requires the output variable to be a long, but
`ReadClientValues` feeds it client->value which is a
32-bit allocation.
This commit changes the code to use _XRead instead, which
properly handles 32-bit output variables.
https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3
---
src/XRes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/XRes.c b/src/XRes.c
index 2bee277..90e72c9 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -256,7 +256,7 @@ static Bool ReadClientValues(
_XRead32 (dpy, &value, 4);
client->length = value;
client->value = malloc(client->length);
- _XRead32 (dpy, client->value, client->length);
+ _XRead (dpy, client->value, client->length);
}
return True;
}
--
2.28.0

View File

@ -4,8 +4,8 @@
Summary: X-Resource extension client library Summary: X-Resource extension client library
Name: libXres Name: libXres
Version: 1.2.0 Version: 1.2.1
Release: 13%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT License: MIT
URL: http://www.x.org URL: http://www.x.org
@ -20,7 +20,6 @@ Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
# https://bugzilla.redhat.com/show_bug.cgi?id=1888993 # https://bugzilla.redhat.com/show_bug.cgi?id=1888993
# https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3 # https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3
# https://gitlab.freedesktop.org/xorg/lib/libxres/-/merge_requests/1 # https://gitlab.freedesktop.org/xorg/lib/libxres/-/merge_requests/1
Patch0: 0001-XRes-Use-_XRead-instead-of-_XRead32-for-reading-pid.patch
Requires: libX11 >= 1.5.99.902 Requires: libX11 >= 1.5.99.902
@ -43,7 +42,6 @@ X.Org X11 libXres development package
%prep %prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch0 -p1
%build %build
autoreconf -v --install --force autoreconf -v --install --force
@ -73,6 +71,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Tue Sep 21 2021 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.2.1-1
- libXres 1.2.1
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-13 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libXres-1.2.0.tar.bz2) = 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 SHA512 (libXres-1.2.1.tar.bz2) = c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1