import freerdp-2.2.0-8.el8

SOURCES/Fix-monitor-list-flag-being-ignored-on-X11-Wayland.patch

@@ -0,0 +1,49 @@
+From bf9bce2c3e6c716cc708716484124c1fb47cb531 Mon Sep 17 00:00:00 2001
+From: Max Roncace <me@caseif.net>
+Date: Wed, 24 Feb 2021 17:44:28 -0500
+Subject: [PATCH] Fix /monitor-list flag being ignored on X11/Wayland
+
+---
+ client/Wayland/wlfreerdp.c | 4 +++-
+ client/X11/cli/xfreerdp.c  | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c
+index aca734211..26c5452a5 100644
+--- a/client/Wayland/wlfreerdp.c
++++ b/client/Wayland/wlfreerdp.c
+@@ -651,10 +651,12 @@ int main(int argc, char* argv[])
+ 	status = freerdp_client_settings_parse_command_line(settings, argc, argv, FALSE);
+ 	if (status)
+ 	{
+-		BOOL list = settings->ListMonitors;
++		BOOL list;
+ 
+ 		rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
+ 
++		list = settings->ListMonitors;
++
+ 		if (list)
+ 			wlf_list_monitors(wlc);
+ 
+diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
+index 5b7021944..786a7eb5d 100644
+--- a/client/X11/cli/xfreerdp.c
++++ b/client/X11/cli/xfreerdp.c
+@@ -59,10 +59,12 @@ int main(int argc, char* argv[])
+ 	status = freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE);
+ 	if (status)
+ 	{
+-		BOOL list = settings->ListMonitors;
++		BOOL list;
+ 
+ 		rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
+ 
++		list = settings->ListMonitors;
++
+ 		if (list)
+ 			xf_list_monitors(xfc);
+ 
+-- 
+2.37.1
+

SPECS/freerdp.spec

@@ -22,7 +22,7 @@
 
 Name:           freerdp
 Version:        2.2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          2
 Summary:        Free implementation of the Remote Desktop Protocol (RDP)
 License:        ASL 2.0
@@ -35,11 +35,14 @@ Patch0:         6741.patch
 
 # CVE-2021-41160 freerdp: improper region checks in all clients allow out of bound write to memory
 Patch1:         Add-checks-for-bitmap-and-glyph-width-heigth-values.patch
+
 # CVE-2021-41159 freerdp: improper client input validation for gateway connections allows to overwrite memory
-# FIXME: enable once we are sure this is correct
 Patch2:         Implement-missing-TSG-debug-functions.patch
 Patch3:         Refactored-RPC-gateway-parser.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2108866
+Patch4:         Fix-monitor-list-flag-being-ignored-on-X11-Wayland.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  alsa-lib-devel
@@ -310,21 +313,14 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/pkgconfig/winpr-tools2.pc
 
 %changelog
-* Tue Nov 09 2021 Jan Grulich <jgrulich@redhat.com> - 2:2.2.0-7
+* Thu Aug 11 2022 Ondrej Holy <oholy@redhat.com> - 2:2.2.0-8
-- Updated: Refactored RPC gateway parser (rhbz#2017948)
+- Fix /monitor-list output (rhbz#2108866)
-  + fixed issues discovered by Covscan
 
-* Mon Nov 08 2021 Jan Grulich <jgrulich@redhat.com> - 2:2.2.0-6
+* Wed Nov 10 2021 Ondrej Holy <oholy@redhat.com> - 2:2.2.0-4
-- Refactored RPC gateway parser (rhbz#2017948)
+- Refactored RPC gateway parser (rhbz#2017949)
-
-* Fri Nov 05 2021 Jan Grulich <jgrulich@redhat.com> - 2:2.2.0-5
-- Revert: Refactored RPC gateway parser (rhbz#2017948)
-
-* Fri Nov 05 2021 Jan Grulich <jgrulich@redhat.com> - 2:2.2.0-4
-- Refactored RPC gateway parser (rhbz#2017948)
 
 * Fri Nov 05 2021 Felipe Borges <feborges@redhat.com> - 2:2.2.0-3
-- Add checks for bitmap and glyph width/heigth values (rhbz#2017955)
+- Add checks for bitmap and glyph width and heigth values (rhbz#2017956)
 
 * Wed Apr 28 2021 Ondrej Holy <oholy@redhat.com> - 2:2.2.0-2
 - Fix exit codes for /help and similar options (rhbz#1910029)