Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,2 +1,5 @@
|
|||||||
SOURCES/libICE-1.0.9.tar.bz2
|
libICE-1.0.6.tar.bz2
|
||||||
|
/libICE-1.0.7.tar.bz2
|
||||||
|
/libICE-1.0.8.tar.bz2
|
||||||
/libICE-1.0.9.tar.bz2
|
/libICE-1.0.9.tar.bz2
|
||||||
|
/libICE-1.0.10.tar.bz2
|
||||||
|
1
.libICE.metadata
Normal file
1
.libICE.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
5b5eb125d4f43a3ab8153b0f850963ee6c982c24 libICE-1.0.10.tar.bz2
|
@ -1,28 +0,0 @@
|
|||||||
From 6fed0334c99d3c088752b462d106a84266fb1114 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
Date: Wed, 10 Apr 2019 11:01:31 +0200
|
|
||||||
Subject: [PATCH libICE 1/3] IceListenForWellKnownConnections: Fix memleak
|
|
||||||
|
|
||||||
The function `_IceTransMakeAllCOTSServerListeners` allocates memory for
|
|
||||||
`transConns` which is leaked in case of error.
|
|
||||||
|
|
||||||
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
---
|
|
||||||
src/listenwk.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/listenwk.c b/src/listenwk.c
|
|
||||||
index 7517ea8..9ff26da 100644
|
|
||||||
--- a/src/listenwk.c
|
|
||||||
+++ b/src/listenwk.c
|
|
||||||
@@ -61,6 +61,7 @@ IceListenForWellKnownConnections (
|
|
||||||
strncpy (errorStringRet,
|
|
||||||
"Cannot establish any listening sockets", errorLength);
|
|
||||||
|
|
||||||
+ free (transConns);
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
|||||||
From 32a9acc48463931e598188e3277c88925a48d7b5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
Date: Wed, 10 Apr 2019 11:15:11 +0200
|
|
||||||
Subject: [PATCH libICE 2/3] _IceRead: Avoid possible use-after-free
|
|
||||||
|
|
||||||
`_IceRead()` gets called from multiple places which do not expect the
|
|
||||||
connection to be freed.
|
|
||||||
|
|
||||||
Do not free the connection data in `_IceRead()` to avoid potential
|
|
||||||
use-after-free issue in the various callers.
|
|
||||||
|
|
||||||
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
---
|
|
||||||
src/misc.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/misc.c b/src/misc.c
|
|
||||||
index d2e9150..54b179d 100644
|
|
||||||
--- a/src/misc.c
|
|
||||||
+++ b/src/misc.c
|
|
||||||
@@ -242,7 +242,6 @@ _IceRead (
|
|
||||||
*/
|
|
||||||
|
|
||||||
_IceConnectionClosed (iceConn); /* invoke watch procs */
|
|
||||||
- _IceFreeConnection (iceConn);
|
|
||||||
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
From c4fcd360d060d50673a4a35ed39c4fe7e4bc3561 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
Date: Thu, 11 Apr 2019 09:05:15 +0200
|
|
||||||
Subject: [PATCH libICE 3/3] cleanup: Separate variable assignment and test
|
|
||||||
|
|
||||||
Assigning and testing a value in a single statement hinders code clarity
|
|
||||||
and may confuses static code analyzers.
|
|
||||||
|
|
||||||
Separate the assignment and the test for clarity.
|
|
||||||
|
|
||||||
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
||||||
---
|
|
||||||
src/process.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/process.c b/src/process.c
|
|
||||||
index f0c3369..e3e0a35 100644
|
|
||||||
--- a/src/process.c
|
|
||||||
+++ b/src/process.c
|
|
||||||
@@ -919,7 +919,8 @@ ProcessConnectionSetup (
|
|
||||||
EXTRACT_STRING (pData, swap, vendor);
|
|
||||||
EXTRACT_STRING (pData, swap, release);
|
|
||||||
|
|
||||||
- if ((hisAuthCount = message->authCount) > 0)
|
|
||||||
+ hisAuthCount = message->authCount;
|
|
||||||
+ if (hisAuthCount > 0)
|
|
||||||
{
|
|
||||||
hisAuthNames = malloc (hisAuthCount * sizeof (char *));
|
|
||||||
EXTRACT_LISTOF_STRING (pData, swap, hisAuthCount, hisAuthNames);
|
|
||||||
@@ -1965,7 +1966,8 @@ ProcessProtocolSetup (
|
|
||||||
EXTRACT_STRING (pData, swap, vendor);
|
|
||||||
EXTRACT_STRING (pData, swap, release);
|
|
||||||
|
|
||||||
- if ((hisAuthCount = message->authCount) > 0)
|
|
||||||
+ hisAuthCount = message->authCount;
|
|
||||||
+ if (hisAuthCount > 0)
|
|
||||||
{
|
|
||||||
hisAuthNames = malloc (hisAuthCount * sizeof (char *));
|
|
||||||
EXTRACT_LISTOF_STRING (pData, swap, hisAuthCount, hisAuthNames);
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-8
|
- rhel-9
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||||
|
58
libICE.spec
58
libICE.spec
@ -1,21 +1,17 @@
|
|||||||
Summary: X.Org X11 ICE runtime library
|
Summary: X.Org X11 ICE runtime library
|
||||||
Name: libICE
|
Name: libICE
|
||||||
Version: 1.0.9
|
Version: 1.0.10
|
||||||
Release: 15%{?dist}
|
Release: 8%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
|
|
||||||
Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
|
Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch0: 0001-Use-getentropy-if-arc4random_buf-is-not-available.patch
|
# Needed for pre-glibc-2.25, which at this point would mean RHEL7 but not 8
|
||||||
Patch1: 0002-Add-getentropy-emulation-through-syscall.patch
|
# Patch1: 0002-Add-getentropy-emulation-through-syscall.patch
|
||||||
Patch2: 0001-IceListenForWellKnownConnections-Fix-memleak.patch
|
|
||||||
Patch3: 0002-_IceRead-Avoid-possible-use-after-free.patch
|
|
||||||
Patch4: 0003-cleanup-Separate-variable-assignment-and-test.patch
|
|
||||||
|
|
||||||
BuildRequires: xorg-x11-util-macros
|
BuildRequires: xorg-x11-util-macros
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool make
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-5
|
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-5
|
||||||
@ -25,7 +21,6 @@ The X.Org X11 ICE (Inter-Client Exchange) runtime library.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: X.Org X11 ICE development package
|
Summary: X.Org X11 ICE development package
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -33,12 +28,7 @@ The X.Org X11 ICE (Inter-Client Exchange) development package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
#patch1 -p1 -b .cve-2017-2626
|
||||||
%patch0 -p1 -b .cve-2017-2626
|
|
||||||
%patch1 -p1 -b .cve-2017-2626
|
|
||||||
%patch2 -p1 -b .IceListenForWellKnownConnections-memleak
|
|
||||||
%patch3 -p1 -b .IceRead-use-after-free
|
|
||||||
%patch4 -p1 -b .var-assignment-and-test
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install --force
|
autoreconf -v --install --force
|
||||||
@ -78,11 +68,39 @@ done
|
|||||||
%{_libdir}/pkgconfig/ice.pc
|
%{_libdir}/pkgconfig/ice.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 4 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.0.9-15
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.10-8
|
||||||
- Bump version for gating
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Thu Apr 11 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.0.9-14
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.10-7
|
||||||
- covscan issues (rhbz#1602581)
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Dec 01 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.0.10-5
|
||||||
|
- Add make to BuildRequires
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 16 2019 Adam Jackson <ajax@redhat.com> - 1.0.10-1
|
||||||
|
- libICE 1.0.10
|
||||||
|
|
||||||
|
* Thu Mar 21 2019 Adam Jackson <ajax@redhat.com> - 1.0.9-16
|
||||||
|
- Rebuild for xtrans 1.4.0
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.0.9-13
|
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.0.9-13
|
||||||
- Use ldconfig scriptlet macros
|
- Use ldconfig scriptlet macros
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (libICE-1.0.9.tar.bz2) = daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7
|
SHA512 (libICE-1.0.10.tar.bz2) = 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
|
||||||
|
Loading…
Reference in New Issue
Block a user