diff --git a/.gitignore b/.gitignore index 2fcea58..067d29c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /gnome-remote-desktop-41.1.tar.xz /gnome-remote-desktop-41.2.tar.xz /gnome-remote-desktop-42.beta.tar.xz +/gnome-remote-desktop-42.rc.tar.xz diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec index 37f7c82..41aafc7 100644 --- a/gnome-remote-desktop.spec +++ b/gnome-remote-desktop.spec @@ -3,7 +3,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-remote-desktop -Version: 42~beta +Version: 42~rc Release: 1%{?dist} Summary: GNOME Remote Desktop screen share service @@ -87,6 +87,9 @@ GNOME desktop environment. %changelog +* Mon Mar 14 2022 Jonas Ådahl - 42~rc-1 +- Update to 42.rc + * Wed Feb 16 2022 Jonas Ådahl - 42~beta-1 - Update to 42.beta diff --git a/gnutls-anontls.patch b/gnutls-anontls.patch index daba810..98a9a49 100644 --- a/gnutls-anontls.patch +++ b/gnutls-anontls.patch @@ -1,4 +1,4 @@ -From 0fb8045a40412a472db93131df899b94e626886f Mon Sep 17 00:00:00 2001 +From 6ca82648e9b6791fbfbbbc9b05f15ec07a992e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 14 Jun 2018 12:21:37 +0200 Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support @@ -25,10 +25,10 @@ VNC connection. create mode 100644 src/grd-vnc-tls.h diff --git a/meson.build b/meson.build -index 4ac9093..a7d3bb0 100644 +index 6bd2420..d6c5d9b 100644 --- a/meson.build +++ b/meson.build -@@ -57,6 +57,7 @@ endif +@@ -50,6 +50,7 @@ endif if have_vnc libvncserver_dep = dependency('libvncserver') libvncclient_dep = dependency('libvncclient') @@ -37,10 +37,10 @@ index 4ac9093..a7d3bb0 100644 prefix = get_option('prefix') diff --git a/src/grd-enums.h b/src/grd-enums.h -index ffab821..4333863 100644 +index e3ecc40..fa8dfb7 100644 --- a/src/grd-enums.h +++ b/src/grd-enums.h -@@ -27,4 +27,10 @@ typedef enum +@@ -33,4 +33,10 @@ typedef enum GRD_VNC_AUTH_METHOD_PASSWORD } GrdVncAuthMethod; @@ -276,10 +276,10 @@ index fcc508d..092d9dc 100644 + #endif /* GRD_SESSION_VNC_H */ diff --git a/src/grd-settings.c b/src/grd-settings.c -index 4560a37..744ff89 100644 +index c8f28fb..502d956 100644 --- a/src/grd-settings.c +++ b/src/grd-settings.c -@@ -60,6 +60,7 @@ struct _GrdSettings +@@ -69,6 +69,7 @@ struct _GrdSettings gboolean view_only; GrdVncAuthMethod auth_method; int port; @@ -287,7 +287,7 @@ index 4560a37..744ff89 100644 } vnc; }; -@@ -248,6 +249,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings) +@@ -245,6 +246,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings) return settings->vnc.auth_method; } @@ -298,9 +298,9 @@ index 4560a37..744ff89 100644 +} + static void - update_rdp_tls_cert (GrdSettings *settings) + update_screen_share_mode (GrdSettings *settings) { -@@ -285,6 +292,13 @@ update_vnc_auth_method (GrdSettings *settings) +@@ -303,6 +310,13 @@ update_vnc_auth_method (GrdSettings *settings) "auth-method"); } @@ -314,7 +314,7 @@ index 4560a37..744ff89 100644 static void on_rdp_settings_changed (GSettings *rdp_settings, const char *key, -@@ -322,6 +336,11 @@ on_vnc_settings_changed (GSettings *vnc_settings, +@@ -355,6 +369,11 @@ on_vnc_settings_changed (GSettings *vnc_settings, update_vnc_auth_method (settings); g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0); } @@ -326,7 +326,7 @@ index 4560a37..744ff89 100644 } static void -@@ -356,6 +375,8 @@ grd_settings_init (GrdSettings *settings) +@@ -392,6 +411,8 @@ grd_settings_init (GrdSettings *settings) settings->rdp.port = GRD_RDP_SERVER_PORT; settings->vnc.port = GRD_VNC_SERVER_PORT; @@ -335,7 +335,7 @@ index 4560a37..744ff89 100644 } static void -@@ -400,4 +421,11 @@ grd_settings_class_init (GrdSettingsClass *klass) +@@ -457,4 +478,11 @@ grd_settings_class_init (GrdSettingsClass *klass) 0, NULL, NULL, NULL, G_TYPE_NONE, 0); @@ -348,10 +348,10 @@ index 4560a37..744ff89 100644 + G_TYPE_NONE, 0); } diff --git a/src/grd-settings.h b/src/grd-settings.h -index e12e47e..b940fdb 100644 +index 449894a..900d81e 100644 --- a/src/grd-settings.h +++ b/src/grd-settings.h -@@ -64,4 +64,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings); +@@ -65,4 +65,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings); GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings); @@ -359,7 +359,7 @@ index e12e47e..b940fdb 100644 + #endif /* GRD_SETTINGS_H */ diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c -index aae1029..3e43391 100644 +index 0b4322d..e8833f1 100644 --- a/src/grd-vnc-server.c +++ b/src/grd-vnc-server.c @@ -24,11 +24,13 @@ @@ -376,7 +376,7 @@ index aae1029..3e43391 100644 enum -@@ -130,6 +132,43 @@ on_incoming (GSocketService *service, +@@ -129,6 +131,43 @@ on_incoming (GSocketService *service, return TRUE; } @@ -420,7 +420,7 @@ index aae1029..3e43391 100644 gboolean grd_vnc_server_start (GrdVncServer *vnc_server, GError **error) -@@ -220,12 +259,18 @@ static void +@@ -217,12 +256,18 @@ static void grd_vnc_server_constructed (GObject *object) { GrdVncServer *vnc_server = GRD_VNC_SERVER (object); @@ -924,10 +924,10 @@ index 0000000..135ef8c + +#endif /* GRD_VNC_TLS_H */ diff --git a/src/meson.build b/src/meson.build -index 9723d4a..326bef6 100644 +index 1d671d7..ab675ff 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -105,10 +105,13 @@ if have_vnc +@@ -115,10 +115,13 @@ if have_vnc 'grd-vnc-pipewire-stream.h', 'grd-vnc-server.c', 'grd-vnc-server.h', @@ -942,10 +942,10 @@ index 9723d4a..326bef6 100644 endif diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml.in b/src/org.gnome.desktop.remote-desktop.gschema.xml.in -index 0779c8c..b8e3b0a 100644 +index 939b9a6..e57affb 100644 --- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in +++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in -@@ -49,5 +49,15 @@ +@@ -90,5 +90,15 @@ * password - by requiring the remote client to provide a known password @@ -965,7 +965,7 @@ index 0779c8c..b8e3b0a 100644 2.34.1 -From 3f7df606d5eed6d5b8444fef801c2bbc2a710b52 Mon Sep 17 00:00:00 2001 +From 212fa98088cb4a754bac8cdb3a69d2a3e6b4dff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:02:09 +0100 Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals @@ -1133,7 +1133,7 @@ index c2e29b4..4be4c49 100644 2.34.1 -From 30b795a086db2afaba5a6089567550aaabf66a78 Mon Sep 17 00:00:00 2001 +From db1ce3962bbe49491b87cb0a4a90de41614e118b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:03:46 +0100 Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper @@ -1206,7 +1206,7 @@ index 092d9dc..e9eced0 100644 2.34.1 -From 808f23c5e083f872b9b4343fc06efc76f8a8b9c1 Mon Sep 17 00:00:00 2001 +From d6115fc524886ba716ba22464743c1a72472ff75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:05:13 +0100 Subject: [PATCH 4/7] vnc/tls: Add some logging @@ -1283,7 +1283,7 @@ index ec4758e..ac6c35f 100644 2.34.1 -From c571ae4d81b77684d19c844435915f6403b5130a Mon Sep 17 00:00:00 2001 +From c71c9d295a2921014d55820042fc8bdad02df19c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:07:40 +0100 Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of @@ -1453,7 +1453,7 @@ index ac6c35f..312b6b9 100644 2.34.1 -From 8a7cef31e9b22ef3e98fa5b54ac0756083b581e2 Mon Sep 17 00:00:00 2001 +From edc2380304d19e1bea58b079b943bad42cac5d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 16:48:00 +0100 Subject: [PATCH 6/7] session-vnc: Set our own password handling function up @@ -1508,7 +1508,7 @@ index 9708de0..bc60285 100644 2.34.1 -From 99cf5c5df74b71e5c8ad99ab10cff2f09ee7e677 Mon Sep 17 00:00:00 2001 +From 539d2c562b8068f1f698468cb87b36b4968c1517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 12 Oct 2020 17:34:30 +0200 Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride diff --git a/sources b/sources index a01d0b7..9f8f626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-remote-desktop-42.beta.tar.xz) = 24d0ab9091f2fb88a975a07493039be3280cd39b698558c4b6cc6901e89bcb56fab88eeec184206647e0f4ac9786c5aeaf94a6feb35fb28b67e54162fab74193 +SHA512 (gnome-remote-desktop-42.rc.tar.xz) = b37f058f623cef85b046115c26411fb85a6c633b13f70bbfc5c943f091dc51621ef9d783193cf777eb2999a714c7e461d71e1999674ae6006ef6ecb98cea1c39