12 changed files with 719 additions and 670 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,35 +1 @@
-/gnome-remote-desktop-0.1.*.tar.xz
+SOURCES/gnome-remote-desktop-0.1.8.tar.xz
 /gnome-remote-desktop-40.beta.tar.xz
 /gnome-remote-desktop-40.rc.tar.xz
 /gnome-remote-desktop-40.0.tar.xz
 /gnome-remote-desktop-40.1.tar.xz
 /gnome-remote-desktop-41.rc.tar.xz
 /gnome-remote-desktop-41.0.tar.xz
 /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
 /gnome-remote-desktop-42.0.tar.xz
 /gnome-remote-desktop-42.1.tar.xz
 /gnome-remote-desktop-42.1.1.tar.xz
 /gnome-remote-desktop-42.2.tar.xz
 /gnome-remote-desktop-42.3.tar.xz
 /gnome-remote-desktop-43.alpha.tar.xz
 /gnome-remote-desktop-43.beta.tar.xz
 /gnome-remote-desktop-43.0.tar.xz
 /gnome-remote-desktop-43.1.tar.xz
 /gnome-remote-desktop-43.2.tar.xz
 /gnome-remote-desktop-44.alpha.tar.xz
 /gnome-remote-desktop-44.rc.tar.xz
 /gnome-remote-desktop-44.0.tar.xz
 /gnome-remote-desktop-44.1.tar.xz
 /gnome-remote-desktop-44.2.tar.xz
 /gnome-remote-desktop-45.alpha.tar.xz
 /gnome-remote-desktop-45.beta.tar.xz
 /gnome-remote-desktop-45.rc.tar.xz
 /gnome-remote-desktop-45.0.tar.xz
 /gnome-remote-desktop-45.1.tar.xz
 /gnome-remote-desktop-46.0.tar.xz
 /gnome-remote-desktop-46.1.tar.xz
 /gnome-remote-desktop-46.2.tar.xz
 /gnome-remote-desktop-47.alpha.tar.xz
--- a/.gnome-remote-desktop.metadata
+++ b/.gnome-remote-desktop.metadata
@ -0,0 +1 @@
 3347257bd906cd0ca86887c692befd8d412afab1 SOURCES/gnome-remote-desktop-0.1.8.tar.xz
--- a/SOURCES/0001-stream-log-a-warning-on-error.patch
+++ b/SOURCES/0001-stream-log-a-warning-on-error.patch
@ -0,0 +1,52 @@
 From 7670167e578eb5c6e032cff38112edf85df142ee Mon Sep 17 00:00:00 2001
 From: Wim Taymans <wtaymans@redhat.com>
 Date: Tue, 16 Jun 2020 11:44:52 +0200
 Subject: [PATCH 1/2] stream: log a warning on error
 When we get an invalid buffer or we can't mmap() it, log a warning
 and exit instead of carying on with invalid pointers and segfault.
 ---
 src/grd-vnc-pipewire-stream.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index 261292a..91fb0a1 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -323,14 +323,18 @@ process_buffer (GrdVncPipeWireStream *stream,
   if (buffer->datas[0].chunk->size == 0)
     {
 -      size = 0;
 -      map = NULL;
 -      src_data = NULL;
 +      g_warning ("Received empty buffer");
 +      return NULL;
     }
   else if (buffer->datas[0].type == SPA_DATA_MemFd)
     {
       size = buffer->datas[0].maxsize + buffer->datas[0].mapoffset;
       map = mmap (NULL, size, PROT_READ, MAP_PRIVATE, buffer->datas[0].fd, 0);
 +      if (map == MAP_FAILED)
 +        {
 +          g_warning ("Failed to mmap buffer: %s", g_strerror (errno));
 +          return NULL;
 +	}
       src_data = SPA_MEMBER (map, buffer->datas[0].mapoffset, uint8_t);
     }
   else if (buffer->datas[0].type == SPA_DATA_DmaBuf)
@@ -341,6 +345,11 @@ process_buffer (GrdVncPipeWireStream *stream,
       size = buffer->datas[0].maxsize + buffer->datas[0].mapoffset;
       map = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
 +      if (map == MAP_FAILED)
 +        {
 +          g_warning ("Failed to mmap DMA buffer: %s", g_strerror (errno));
 +          return NULL;
 +	}
       sync_dma_buf (fd, DMA_BUF_SYNC_START);
       src_data = SPA_MEMBER (map, buffer->datas[0].mapoffset, uint8_t);
 -- 
 2.26.2
--- a/SOURCES/0001-vnc-pipewire-stream-Handle-stride-mismatch.patch
+++ b/SOURCES/0001-vnc-pipewire-stream-Handle-stride-mismatch.patch
@ -0,0 +1,73 @@
 From 78c5bcb181fe2b0b9fc17eea696feac8b504df54 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Thu, 7 May 2020 15:48:22 +0200
 Subject: [PATCH] vnc/pipewire-stream: Handle stride mismatch
 The VNC server framebuffer assumes a particular stride; but there is no
 guarantee that we'll get the same from PipeWire. Handle this gracefully
 by coping row by row instead of the whole buffer.
 ---
 src/grd-vnc-pipewire-stream.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index 88c07be..261292a 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -187,8 +187,6 @@ on_stream_param_changed (void                 *user_data,
   struct spa_pod_builder pod_builder;
   int width;
   int height;
 -  int stride;
 -  int size;
   const struct spa_pod *params[3];
   if (!format || id != SPA_PARAM_Format)
@@ -203,14 +201,9 @@ on_stream_param_changed (void                 *user_data,
   grd_session_vnc_queue_resize_framebuffer (stream->session, width, height);
 -  stride = grd_session_vnc_get_framebuffer_stride (stream->session);
 -  size = stride * height;
 -
   params[0] = spa_pod_builder_add_object (
     &pod_builder,
     SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
 -    SPA_PARAM_BUFFERS_size, SPA_POD_Int (size),
 -    SPA_PARAM_BUFFERS_stride, SPA_POD_Int (stride),
     SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int (8, 1, 8),
     0);
@@ -319,6 +312,10 @@ process_buffer (GrdVncPipeWireStream *stream,
   size_t size;
   uint8_t *map;
   void *src_data;
 +  int src_stride;
 +  int dst_stride;
 +  int height;
 +  int y;
   struct spa_meta_cursor *spa_meta_cursor;
   g_autofree GrdVncFrame *frame = NULL;
@@ -359,7 +356,17 @@ process_buffer (GrdVncPipeWireStream *stream,
       return NULL;
     }
 -  frame->data = g_memdup (src_data, buffer->datas[0].maxsize);
 +  src_stride = buffer->datas[0].chunk->stride;
 +  dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
 +  height = stream->spa_format.size.height;
 +
 +  frame->data = g_malloc (height * dst_stride);
 +  for (y = 0; y < height; y++)
 +    {
 +      memcpy (((uint8_t *) frame->data) + y * dst_stride,
 +              ((uint8_t *) src_data) + y * src_stride,
 +              dst_stride);
 +    }
   if (map)
     {
 -- 
 2.26.2
--- a/SOURCES/0001-vnc-pipewire-stream-Remove-assert.patch
+++ b/SOURCES/0001-vnc-pipewire-stream-Remove-assert.patch
@ -0,0 +1,25 @@
 From 240d8694fbcdeb020e7f9c0f8f292a4679b88b30 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Thu, 18 Jun 2020 13:14:04 +0200
 Subject: [PATCH] vnc/pipewire-stream: Remove assert
 Handle lack of frames gracefully.
 ---
 src/grd-vnc-pipewire-stream.c | 1 -
 1 file changed, 1 deletion(-)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index ee8ad5d..a3f5fb6 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -463,7 +463,6 @@ on_stream_process (void *user_data)
   frame = process_buffer (stream, buffer->buffer);
 -  g_assert (frame);
   g_mutex_lock (&stream->frame_mutex);
   if (stream->pending_frame)
     {
 -- 
 2.26.2
--- a/SOURCES/0002-vnc-pipewire-stream-Only-try-to-copy-frame-pixels-if.patch
+++ b/SOURCES/0002-vnc-pipewire-stream-Only-try-to-copy-frame-pixels-if.patch
@ -0,0 +1,62 @@
 From f3efe25a5cb173bc63b380619b8673cd5ba99f6f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Thu, 18 Jun 2020 11:35:44 +0200
 Subject: [PATCH 2/2] vnc/pipewire-stream: Only try to copy frame pixels if
 there are any
 The producer might send empty frames with only cursor metadata, and in
 this case we shouldn't try to copy any pixels, as there are no.
 ---
 src/grd-vnc-pipewire-stream.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index 91fb0a1..ee8ad5d 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -312,9 +312,6 @@ process_buffer (GrdVncPipeWireStream *stream,
   size_t size;
   uint8_t *map;
   void *src_data;
 -  int src_stride;
 -  int dst_stride;
 -  int height;
   int y;
   struct spa_meta_cursor *spa_meta_cursor;
   g_autofree GrdVncFrame *frame = NULL;
@@ -365,16 +362,23 @@ process_buffer (GrdVncPipeWireStream *stream,
       return NULL;
     }
 -  src_stride = buffer->datas[0].chunk->stride;
 -  dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
 -  height = stream->spa_format.size.height;
 -
 -  frame->data = g_malloc (height * dst_stride);
 -  for (y = 0; y < height; y++)
 +  if (src_data)
     {
 -      memcpy (((uint8_t *) frame->data) + y * dst_stride,
 -              ((uint8_t *) src_data) + y * src_stride,
 -              dst_stride);
 +      int src_stride;
 +      int dst_stride;
 +      int height;
 +
 +      src_stride = buffer->datas[0].chunk->stride;
 +      dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
 +      height = stream->spa_format.size.height;
 +
 +      frame->data = g_malloc (height * dst_stride);
 +      for (y = 0; y < height; y++)
 +        {
 +          memcpy (((uint8_t *) frame->data) + y * dst_stride,
 +                  ((uint8_t *) src_data) + y * src_stride,
 +                  dst_stride);
 +        }
     }
   if (map)
 -- 
 2.26.2
--- a/SOURCES/anon-tls-support.patch
+++ b/SOURCES/anon-tls-support.patch
@ -1,4 +1,4 @@
-From 0e754e3a90f486c031da535656584673016107a3 Mon Sep 17 00:00:00 2001
+From 10843a1f3edffbb475c01835451d39ebe6153e44 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Thu, 14 Jun 2018 12:21:37 +0200
 Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support
@ -11,36 +11,36 @@ VNC connection.
 ---
 meson.build                                   |   1 +
 src/grd-enums.h                               |   6 +
- src/grd-session-vnc.c                         | 120 ++++-
+ src/grd-session-vnc.c                         |  98 +++-
- src/grd-session-vnc.h                         |  17 +
+ src/grd-session-vnc.h                         |  15 +
- src/grd-settings-user.c                       |   3 +
+ src/grd-settings.c                            |  28 ++
- src/grd-settings.c                            |  18 +
+ src/grd-settings.h                            |   2 +
- src/grd-vnc-server.c                          |  49 ++
+ src/grd-vnc-server.c                          |  45 ++
 src/grd-vnc-tls.c                             | 444 ++++++++++++++++++
 src/grd-vnc-tls.h                             |  28 ++
- src/meson.build                               |   3 +
+ src/meson.build                               |   5 +-
 ...nome.desktop.remote-desktop.gschema.xml.in |  10 +
- 11 files changed, 673 insertions(+), 26 deletions(-)
+ 11 files changed, 666 insertions(+), 16 deletions(-)
 create mode 100644 src/grd-vnc-tls.c
 create mode 100644 src/grd-vnc-tls.h
 diff --git a/meson.build b/meson.build
-index 995863ce..40733a6e 100644
+index 1c96849..a24acfd 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -62,6 +62,7 @@ endif
+@@ -15,6 +15,7 @@ libvncserver_dep = dependency('libvncserver')
- if have_vnc
+ libvncclient_dep = dependency('libvncclient')
-   libvncclient_dep = dependency('libvncclient')
+ libsecret_dep = dependency('libsecret-1')
-   libvncserver_dep = dependency('libvncserver')
+ libnotify_dep = dependency('libnotify')
-+  gnutls_dep = dependency('gnutls')
+gnutls_dep = dependency('gnutls')
 endif
- prefix = get_option('prefix')
+ cdata = configuration_data()
 cdata.set_quoted('GETTEXT_PACKAGE', 'gnome-remote-desktop')
 diff --git a/src/grd-enums.h b/src/grd-enums.h
-index 028bdf9a..47a1d921 100644
+index ffab821..4333863 100644
 --- a/src/grd-enums.h
 +++ b/src/grd-enums.h
-@@ -33,6 +33,12 @@ typedef enum
+@@ -27,4 +27,10 @@ typedef enum
   GRD_VNC_AUTH_METHOD_PASSWORD
 } GrdVncAuthMethod;
@ -50,14 +50,12 @@ index 028bdf9a..47a1d921 100644
 +  GRD_VNC_ENCRYPTION_TLS_ANON = 1 << 1,
 +} GrdVncEncryption;
 +
- typedef enum
+ #endif /* GRD_ENUMS_H */
 {
   GRD_VNC_SCREEN_SHARE_MODE_MIRROR_PRIMARY,
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 0ca76e89..e13ac013 100644
+index 1f3f0e2..0cc2ea2 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -46,7 +46,9 @@ struct _GrdSessionVnc
+@@ -44,7 +44,9 @@ struct _GrdSessionVnc
 {
   GrdSession parent;
@ -67,7 +65,7 @@ index 0ca76e89..e13ac013 100644
   GSource *source;
   rfbScreenInfoPtr rfb_screen;
   rfbClientPtr rfb_client;
-@@ -608,6 +610,12 @@ check_rfb_password (rfbClientPtr  rfb_client,
+@@ -505,12 +507,30 @@ check_rfb_password (rfbClientPtr  rfb_client,
     }
 }
@ -78,10 +76,9 @@ index 0ca76e89..e13ac013 100644
 +}
 +
 int
- grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+ grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc)
-                                       int            width)
+ {
-@@ -615,6 +623,18 @@ grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+   return session_vnc->rfb_screen->paddedWidthInBytes;
   return width * BGRX_BYTES_PER_PIXEL;
 }
 +rfbClientPtr
@ -99,7 +96,7 @@ index 0ca76e89..e13ac013 100644
 static void
 init_vnc_session (GrdSessionVnc *session_vnc)
 {
-@@ -689,44 +709,85 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+@@ -551,33 +571,74 @@ init_vnc_session (GrdSessionVnc *session_vnc)
   rfbProcessEvents (rfb_screen, 0);
 }
@ -134,17 +131,6 @@ index 0ca76e89..e13ac013 100644
 +                                  session_vnc->pending_framebuffer_width,
 +                                  session_vnc->pending_framebuffer_height);
 +          session_vnc->pending_framebuffer_resize = FALSE;
 +
 +          /**
 +           * This is a workaround. libvncserver is unable to handle clipboard
 +           * changes early and either disconnects the client or crashes g-r-d
 +           * if it receives rfbSendServerCutText too early altough the
 +           * authentification process is already done.
 +           * Doing this after resizing the framebuffer, seems to work fine,
 +           * so enable the clipboard here and not when the remote desktop
 +           * session proxy is acquired.
 +           */
 +          grd_clipboard_vnc_maybe_enable_clipboard (session_vnc->clipboard_vnc);
 +        }
 +    }
 +
@ -186,17 +172,6 @@ index 0ca76e89..e13ac013 100644
 -                                      session_vnc->pending_framebuffer_width,
 -                                      session_vnc->pending_framebuffer_height);
 -              session_vnc->pending_framebuffer_resize = FALSE;
 -
 -              /**
 -               * This is a workaround. libvncserver is unable to handle clipboard
 -               * changes early and either disconnects the client or crashes g-r-d
 -               * if it receives rfbSendServerCutText too early altough the
 -               * authentification process is already done.
 -               * Doing this after resizing the framebuffer, seems to work fine,
 -               * so enable the clipboard here and not when the remote desktop
 -               * session proxy is acquired.
 -               */
 -              grd_clipboard_vnc_maybe_enable_clipboard (session_vnc->clipboard_vnc);
 -            }
 +          grd_session_stop (session);
         }
@ -210,7 +185,7 @@ index 0ca76e89..e13ac013 100644
     }
   return G_SOURCE_CONTINUE;
-@@ -739,7 +800,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
+@@ -590,7 +651,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
   socket = g_socket_connection_get_socket (session_vnc->connection);
   session_vnc->source = g_socket_create_source (socket,
@ -222,23 +197,18 @@ index 0ca76e89..e13ac013 100644
                                                 NULL);
   g_source_set_callback (session_vnc->source,
                          (GSourceFunc) handle_socket_data,
-@@ -780,6 +844,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+@@ -616,8 +680,10 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
                               "context", context,
                               NULL);
 +  session_vnc->vnc_server = vnc_server;
   session_vnc->connection = g_object_ref (connection);
   settings = grd_context_get_settings (context);
@@ -792,6 +857,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
                     G_CALLBACK (on_view_only_changed),
                     session_vnc);
 +  grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
   grd_session_vnc_attach_source (session_vnc);
   init_vnc_session (session_vnc);
-@@ -806,6 +872,8 @@ grd_session_vnc_dispose (GObject *object)
+@@ -632,6 +698,8 @@ grd_session_vnc_dispose (GObject *object)
   g_assert (!session_vnc->rfb_screen);
@ -248,12 +218,12 @@ index 0ca76e89..e13ac013 100644
   G_OBJECT_CLASS (grd_session_vnc_parent_class)->dispose (object);
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index be79cf4a..ffc8d27a 100644
+index 14b5d12..46a8579 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
-@@ -37,6 +37,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
+@@ -36,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
                       GRD, SESSION_VNC,
-                       GrdSession)
+                       GrdSession);
 +typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc  *session_vnc,
 +                                           GError        **error);
@ -261,15 +231,13 @@ index be79cf4a..ffc8d27a 100644
 GrdSessionVnc *grd_session_vnc_new (GrdVncServer      *vnc_server,
                                     GSocketConnection *connection);
-@@ -63,6 +66,20 @@ void grd_session_vnc_set_client_clipboard_text (GrdSessionVnc *session_vnc,
+@@ -53,6 +56,18 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
- int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+                                   int            x,
-                                           int            width);
+                                   int            y);
 +int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
 +
-+int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+ int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
 +
 gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
 +rfbClientPtr grd_session_vnc_get_rfb_client (GrdSessionVnc *session_vnc);
 +
@ -282,80 +250,94 @@ index be79cf4a..ffc8d27a 100644
 +GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
 +
 #endif /* GRD_SESSION_VNC_H */
 diff --git a/src/grd-settings-user.c b/src/grd-settings-user.c
 index 20b81a94..34115078 100644
 --- a/src/grd-settings-user.c
 +++ b/src/grd-settings-user.c
@@ -79,6 +79,9 @@ grd_settings_user_constructed (GObject *object)
   g_settings_bind (settings->vnc_settings, "auth-method",
                    settings, "vnc-auth-method",
                    G_SETTINGS_BIND_DEFAULT);
 +  g_settings_bind (settings->vnc_settings, "encryption",
 +                   settings, "vnc-encryption",
 +                   G_SETTINGS_BIND_DEFAULT);
   switch (grd_settings_get_runtime_mode (GRD_SETTINGS (settings)))
     {
 diff --git a/src/grd-settings.c b/src/grd-settings.c
-index fba1d714..f3475010 100644
+index bdf8211..7324310 100644
 --- a/src/grd-settings.c
 +++ b/src/grd-settings.c
-@@ -58,6 +58,7 @@ enum
+@@ -48,6 +48,7 @@ struct _GrdSettings
   PROP_RDP_SERVER_CERT_PATH,
   PROP_RDP_SERVER_KEY_PATH,
   PROP_VNC_AUTH_METHOD,
 +  PROP_VNC_ENCRYPTION,
 };
 typedef struct _GrdSettingsPrivate
@@ -84,6 +85,7 @@ typedef struct _GrdSettingsPrivate
     gboolean view_only;
     GrdVncScreenShareMode screen_share_mode;
     GrdVncAuthMethod auth_method;
     int port;
 +    GrdVncEncryption encryption;
   } vnc;
- } GrdSettingsPrivate;
+ };
-@@ -425,6 +427,9 @@ grd_settings_get_property (GObject    *object,
+@@ -120,6 +121,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
-       else
+     return settings->vnc.auth_method;
         g_value_set_enum (value, priv->vnc.auth_method);
       break;
 +    case PROP_VNC_ENCRYPTION:
 +      g_value_set_flags (value, priv->vnc.encryption);
 +      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -562,6 +567,9 @@ grd_settings_set_property (GObject      *object,
     case PROP_VNC_AUTH_METHOD:
       priv->vnc.auth_method = g_value_get_enum (value);
       break;
 +    case PROP_VNC_ENCRYPTION:
 +      priv->vnc.encryption = g_value_get_flags (value);
 +      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -743,4 +751,14 @@ grd_settings_class_init (GrdSettingsClass *klass)
                                                       G_PARAM_READWRITE |
                                                       G_PARAM_CONSTRUCT |
                                                       G_PARAM_STATIC_STRINGS));
 +  g_object_class_install_property (object_class,
 +                                   PROP_VNC_ENCRYPTION,
 +                                   g_param_spec_flags ("vnc-encryption",
 +                                                       "vnc encryption",
 +                                                       "vnc encryption",
 +                                                       GRD_TYPE_VNC_ENCRYPTION,
 +                                                       GRD_VNC_ENCRYPTION_TLS_ANON,
 +                                                       G_PARAM_READWRITE |
 +                                                       G_PARAM_CONSTRUCT |
 +                                                       G_PARAM_STATIC_STRINGS));
 }
 +GrdVncEncryption
 +grd_settings_get_vnc_encryption (GrdSettings *settings)
 +{
 +  return settings->vnc.encryption;
 +}
 +
 static void
 update_vnc_view_only (GrdSettings *settings)
 {
@@ -134,6 +141,13 @@ update_vnc_auth_method (GrdSettings *settings)
                                                    "auth-method");
 }
 +static void
 +update_vnc_encryption (GrdSettings *settings)
 +{
 +  settings->vnc.encryption = g_settings_get_flags (settings->vnc.settings,
 +                                                   "encryption");
 +}
 +
 static void
 on_vnc_settings_changed (GSettings   *vnc_settings,
                          const char  *key,
@@ -149,6 +163,11 @@ on_vnc_settings_changed (GSettings   *vnc_settings,
       update_vnc_auth_method (settings);
       g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0);
     }
 +  else if (strcmp (key, "encryption") == 0)
 +    {
 +      update_vnc_encryption (settings);
 +      g_signal_emit (settings, signals[VNC_ENCRYPTION_CHANGED], 0);
 +    }
 }
 static void
@@ -172,6 +191,8 @@ grd_settings_init (GrdSettings *settings)
   update_vnc_auth_method (settings);
   settings->vnc.port = GRD_VNC_SERVER_PORT;
 +
 +  update_vnc_encryption (settings);
 }
 static void
@@ -195,4 +216,11 @@ grd_settings_class_init (GrdSettingsClass *klass)
                   0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 +  signals[VNC_ENCRYPTION_CHANGED] =
 +    g_signal_new ("vnc-encryption-changed",
 +                  G_TYPE_FROM_CLASS (klass),
 +                  G_SIGNAL_RUN_LAST,
 +                  0,
 +                  NULL, NULL, NULL,
 +                  G_TYPE_NONE, 0);
 }
 diff --git a/src/grd-settings.h b/src/grd-settings.h
 index e4e0c09..0575ec1 100644
 --- a/src/grd-settings.h
 +++ b/src/grd-settings.h
@@ -45,4 +45,6 @@ gboolean grd_settings_get_vnc_view_only (GrdSettings *settings);
 GrdVncAuthMethod grd_settings_get_vnc_auth_method (GrdSettings *settings);
 +GrdVncEncryption grd_settings_get_vnc_encryption (GrdSettings *settings);
 +
 #endif /* GRD_SETTINGS_H */
 diff --git a/src/grd-vnc-server.c b/src/grd-vnc-server.c
-index 877272d2..59a13db5 100644
+index a6d95cb..f9c68db 100644
 --- a/src/grd-vnc-server.c
 +++ b/src/grd-vnc-server.c
-@@ -24,6 +24,7 @@
+@@ -24,11 +24,13 @@
 #include "grd-vnc-server.h"
@ -363,15 +345,13 @@ index 877272d2..59a13db5 100644
 #include <gio/gio.h>
 #include <rfb/rfb.h>
-@@ -31,6 +32,7 @@
+ #include "grd-context.h"
 #include "grd-debug.h"
 #include "grd-session-vnc.h"
 #include "grd-utils.h"
 +#include "grd-vnc-tls.h"
 enum
- {
+@@ -130,6 +132,43 @@ on_incoming (GSocketService    *service,
@@ -130,6 +132,45 @@ on_incoming (GSocketService    *service,
   return TRUE;
 }
@ -383,9 +363,7 @@ index 877272d2..59a13db5 100644
 +  GrdVncEncryption encryption;
 +
 +  tls_security_handler = grd_vnc_tls_get_security_handler ();
-+  g_object_get (G_OBJECT (settings),
+  encryption = grd_settings_get_vnc_encryption (settings);
 +                "vnc-encryption", &encryption,
 +                NULL);
 +
 +  if (encryption == (GRD_VNC_ENCRYPTION_NONE | GRD_VNC_ENCRYPTION_TLS_ANON))
 +    {
@ -417,19 +395,18 @@ index 877272d2..59a13db5 100644
 gboolean
 grd_vnc_server_start (GrdVncServer  *vnc_server,
                       GError       **error)
-@@ -241,11 +282,19 @@ grd_vnc_server_dispose (GObject *object)
+@@ -220,12 +259,18 @@ static void
 static void
 grd_vnc_server_constructed (GObject *object)
 {
-+  GrdVncServer *vnc_server = GRD_VNC_SERVER (object);
+   GrdVncServer *vnc_server = GRD_VNC_SERVER (object);
 +  GrdSettings *settings = grd_context_get_settings (vnc_server->context);
-+
+ 
-   if (grd_get_debug_flags () & GRD_DEBUG_VNC)
+   if (grd_context_get_debug_flags (vnc_server->context) & GRD_DEBUG_VNC)
     rfbLogEnable (1);
   else
     rfbLogEnable (0);
-+  g_signal_connect (settings, "notify::vnc-encryption",
+  g_signal_connect (settings, "vnc-encryption-changed",
 +                    G_CALLBACK (on_vnc_encryption_changed),
 +                    vnc_server);
 +  sync_encryption_settings (vnc_server);
@ -439,7 +416,7 @@ index 877272d2..59a13db5 100644
 diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
 new file mode 100644
-index 00000000..ec4758e0
+index 0000000..ec4758e
 --- /dev/null
 +++ b/src/grd-vnc-tls.c
@@ -0,0 +1,444 @@
@ -889,7 +866,7 @@ index 00000000..ec4758e0
 +}
 diff --git a/src/grd-vnc-tls.h b/src/grd-vnc-tls.h
 new file mode 100644
-index 00000000..135ef8c7
+index 0000000..135ef8c
 --- /dev/null
 +++ b/src/grd-vnc-tls.h
@@ -0,0 +1,28 @@
@ -922,29 +899,34 @@ index 00000000..135ef8c7
 +
 +#endif /* GRD_VNC_TLS_H */
 diff --git a/src/meson.build b/src/meson.build
-index 914e2cc1..4e820c59 100644
+index 0f76fab..9d2f1ce 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -188,10 +188,13 @@ if have_vnc
+@@ -21,6 +21,8 @@ daemon_sources = files([
-     'grd-vnc-pipewire-stream.h',
+   'grd-vnc-pipewire-stream.h',
-     'grd-vnc-server.c',
+   'grd-vnc-server.c',
-     'grd-vnc-server.h',
+   'grd-vnc-server.h',
-+    'grd-vnc-tls.c',
+  'grd-vnc-tls.c',
-+    'grd-vnc-tls.h',
+  'grd-vnc-tls.h',
-   ])
+ ])
   deps += [
     libvncserver_dep,
 +    gnutls_dep,
   ]
 endif
 gen_daemon_sources = []
@@ -51,7 +53,8 @@ executable('gnome-remote-desktop-daemon',
                           pipewire_dep,
                           libvncserver_dep,
                           libsecret_dep,
 -                          libnotify_dep],
 +                          libnotify_dep,
 +                          gnutls_dep],
            include_directories: [configinc],
            install: true,
            install_dir: libexecdir)
 diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml.in b/src/org.gnome.desktop.remote-desktop.gschema.xml.in
-index c3d583c1..8a736c82 100644
+index a5c2022..846e65b 100644
 --- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in
 +++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in
-@@ -148,5 +148,15 @@
+@@ -23,5 +23,15 @@
-                     configuration updates.
+ 	 * password - by requiring the remote client to provide a known password
       </description>
     </key>
 +    <key name='encryption' flags='org.gnome.desktop.remote-desktop.GrdVncEncryption'>
@ -960,10 +942,10 @@ index c3d583c1..8a736c82 100644
   </schema>
 </schemalist>
 -- 
-2.44.0
+2.26.2
-From 6e5f6deab459acdd1e7785ab6975932f2815548f Mon Sep 17 00:00:00 2001
+From aa54aeb43938250a4d27a99e62eb5628d3b55076 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 27 Nov 2019 11:02:09 +0100
 Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals
@ -976,10 +958,10 @@ out-of-socket source.
 1 file changed, 65 insertions(+), 7 deletions(-)
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index e13ac013..30820d7d 100644
+index 0cc2ea2..076e25f 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -42,14 +42,27 @@
+@@ -40,14 +40,27 @@
 #define BGRX_SAMPLES_PER_PIXEL 3
 #define BGRX_BYTES_PER_PIXEL 4
@ -1007,8 +989,8 @@ index e13ac013..30820d7d 100644
   rfbScreenInfoPtr rfb_screen;
   rfbClientPtr rfb_client;
-@@ -81,7 +94,7 @@ struct _GrdSessionVnc
+@@ -73,7 +86,7 @@ struct _GrdSessionVnc
- G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION)
+ G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION);
 static void
 -grd_session_vnc_detach_source (GrdSessionVnc *session_vnc);
@ -1016,7 +998,7 @@ index e13ac013..30820d7d 100644
 static gboolean
 close_session_idle (gpointer user_data);
-@@ -248,7 +261,8 @@ handle_client_gone (rfbClientPtr rfb_client)
+@@ -212,7 +225,8 @@ handle_client_gone (rfbClientPtr rfb_client)
   g_debug ("VNC client gone");
@ -1024,18 +1006,18 @@ index e13ac013..30820d7d 100644
 +  grd_session_vnc_pause (session_vnc);
 +
   maybe_queue_close_session_idle (session_vnc);
   session_vnc->rfb_client = NULL;
 }
-@@ -338,7 +352,7 @@ handle_new_client (rfbClientPtr rfb_client)
+ 
-     {
+@@ -280,7 +294,7 @@ handle_new_client (rfbClientPtr rfb_client)
-     case GRD_VNC_AUTH_METHOD_PROMPT:
+                               session_vnc->prompt_cancellable,
-       show_sharing_desktop_prompt (session_vnc, rfb_client->host);
+                               prompt_response_callback,
                               session_vnc);
 -      grd_session_vnc_detach_source (session_vnc);
 +      grd_session_vnc_pause (session_vnc);
       return RFB_CLIENT_ON_HOLD;
     case GRD_VNC_AUTH_METHOD_PASSWORD:
       session_vnc->rfb_screen->passwordCheck = check_rfb_password;
-@@ -601,7 +615,7 @@ check_rfb_password (rfbClientPtr  rfb_client,
+@@ -498,7 +512,7 @@ check_rfb_password (rfbClientPtr  rfb_client,
   if (memcmp (challenge_encrypted, response_encrypted, len) == 0)
     {
       grd_session_start (GRD_SESSION (session_vnc));
@ -1044,8 +1026,8 @@ index e13ac013..30820d7d 100644
       return TRUE;
     }
   else
-@@ -821,6 +835,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
+@@ -668,6 +682,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
-   g_clear_pointer (&session_vnc->source, g_source_unref);
+   g_clear_pointer (&session_vnc->source, g_source_destroy);
 }
 +gboolean
@ -1078,10 +1060,10 @@ index e13ac013..30820d7d 100644
 +  g_signal_emit (session_vnc, signals[RESUMED], 0);
 +}
 +
- static void
+ GrdSessionVnc *
- on_view_only_changed (GrdSettings   *settings,
+ grd_session_vnc_new (GrdVncServer      *vnc_server,
-                       GParamSpec    *pspec,
+                      GSocketConnection *connection)
-@@ -859,6 +903,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+@@ -685,6 +729,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
   grd_session_vnc_grab_socket (session_vnc, vnc_socket_grab_func);
   grd_session_vnc_attach_source (session_vnc);
@ -1089,17 +1071,17 @@ index e13ac013..30820d7d 100644
   init_vnc_session (session_vnc);
-@@ -893,7 +938,7 @@ grd_session_vnc_stop (GrdSession *session)
+@@ -714,7 +759,7 @@ grd_session_vnc_stop (GrdSession *session)
-       g_clear_object (&session_vnc->stream);
+ 
-     }
+   g_clear_object (&session_vnc->pipewire_stream);
 -  grd_session_vnc_detach_source (session_vnc);
 +  grd_session_vnc_pause (session_vnc);
   g_clear_object (&session_vnc->connection);
-   g_clear_object (&session_vnc->clipboard_vnc);
+   g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free);
-@@ -984,8 +1029,8 @@ on_stream_ready (GrdStream     *stream,
+@@ -770,8 +815,8 @@ grd_session_vnc_stream_ready (GrdSession *session,
-                     G_CALLBACK (on_pipewire_stream_closed),
+                     G_CALLBACK (on_pipwire_stream_closed),
                     session_vnc);
 -  if (!session_vnc->source)
@ -1109,10 +1091,10 @@ index e13ac013..30820d7d 100644
 }
 static void
-@@ -1020,4 +1065,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
+@@ -790,4 +835,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
-   session_class->remote_desktop_session_started =
+ 
-     grd_session_vnc_remote_desktop_session_started;
+   session_class->stop = grd_session_vnc_stop;
-   session_class->on_stream_created = grd_session_vnc_on_stream_created;
+   session_class->stream_ready = grd_session_vnc_stream_ready;
 +
 +  signals[PAUSED] = g_signal_new ("paused",
 +                                  G_TYPE_FROM_CLASS (klass),
@ -1128,10 +1110,10 @@ index e13ac013..30820d7d 100644
 +                                   G_TYPE_NONE, 0);
 }
 -- 
-2.44.0
+2.26.2
-From 00f4fdfc676361f5f71e6f6b346c11cb7088b836 Mon Sep 17 00:00:00 2001
+From ed3d72cb8d08192831397903f0ba92f439751988 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 27 Nov 2019 11:03:46 +0100
 Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper
@ -1144,10 +1126,10 @@ available that is not visible to the socket source.
 2 files changed, 18 insertions(+), 10 deletions(-)
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 30820d7d..3ee06f79 100644
+index 076e25f..8b8ce1b 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -771,6 +771,21 @@ vnc_socket_grab_func (GrdSessionVnc  *session_vnc,
+@@ -622,6 +622,21 @@ vnc_socket_grab_func (GrdSessionVnc  *session_vnc,
   return TRUE;
 }
@ -1169,7 +1151,7 @@ index 30820d7d..3ee06f79 100644
 static gboolean
 handle_socket_data (GSocket *socket,
                     GIOCondition condition,
-@@ -787,16 +802,7 @@ handle_socket_data (GSocket *socket,
+@@ -638,16 +653,7 @@ handle_socket_data (GSocket *socket,
     }
   else if (condition & G_IO_IN)
     {
@ -1188,10 +1170,10 @@ index 30820d7d..3ee06f79 100644
   else
     {
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index ffc8d27a..a86d61d2 100644
+index 46a8579..910b00c 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
-@@ -80,6 +80,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
+@@ -68,6 +68,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
 void grd_session_vnc_ungrab_socket (GrdSessionVnc        *session_vnc,
                                     GrdVncSocketGrabFunc  grab_func);
@ -1201,10 +1183,10 @@ index ffc8d27a..a86d61d2 100644
 #endif /* GRD_SESSION_VNC_H */
 -- 
-2.44.0
+2.26.2
-From 69efe6df5e9e8548c0241a612980af31f1dc5c5a Mon Sep 17 00:00:00 2001
+From 44e6bec84a86064a7b3abbcbbcd07ebb525aca9f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 27 Nov 2019 11:05:13 +0100
 Subject: [PATCH 4/7] vnc/tls: Add some logging
@ -1216,7 +1198,7 @@ protocol rather than the session itself.
 1 file changed, 9 insertions(+)
 diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
-index ec4758e0..ac6c35f6 100644
+index ec4758e..ac6c35f 100644
 --- a/src/grd-vnc-tls.c
 +++ b/src/grd-vnc-tls.c
@@ -67,6 +67,7 @@ grd_vnc_tls_context_new (void)
@ -1278,10 +1260,10 @@ index ec4758e0..ac6c35f6 100644
     {
       g_warning ("TLS handshake failed: %s", error->message);
 -- 
-2.44.0
+2.26.2
-From 2a11c4f47165b62409f4428b9de1bda59c6ebb2f Mon Sep 17 00:00:00 2001
+From fc07db3b6fafec47e02ff81f0f893dcaf64ba988 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 27 Nov 2019 11:07:40 +0100
 Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of
@ -1294,14 +1276,14 @@ epoll(). Deal with this by adding a custom source that dispatches as
 long as there is data to read in those buffers.
 ---
 src/grd-session-vnc.h |  2 +
- src/grd-vnc-tls.c     | 90 ++++++++++++++++++++++++++++++++++++++++---
+ src/grd-vnc-tls.c     | 92 ++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 86 insertions(+), 6 deletions(-)
+ 2 files changed, 88 insertions(+), 6 deletions(-)
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index a86d61d2..5db388b0 100644
+index 910b00c..294860e 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
-@@ -80,6 +80,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
+@@ -68,6 +68,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
 void grd_session_vnc_ungrab_socket (GrdSessionVnc        *session_vnc,
                                     GrdVncSocketGrabFunc  grab_func);
@ -1311,7 +1293,7 @@ index a86d61d2..5db388b0 100644
 GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
 diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
-index ac6c35f6..312b6b92 100644
+index ac6c35f..8f65225 100644
 --- a/src/grd-vnc-tls.c
 +++ b/src/grd-vnc-tls.c
@@ -41,6 +41,12 @@ typedef enum _GrdTlsHandshakeState
@ -1336,7 +1318,12 @@ index ac6c35f6..312b6b92 100644
 } GrdVncTlsSession;
 static gboolean
-@@ -299,13 +307,9 @@ grd_vnc_tls_peek_at_socket (rfbClientPtr  rfb_client,
+@@ -296,16 +304,14 @@ grd_vnc_tls_peek_at_socket (rfbClientPtr  rfb_client,
   peekable_len = MIN (len, tls_session->peek_buffer_len);
   memcpy (buf, tls_session->peek_buffer, peekable_len);
 +  fprintf(stderr, ":::: %s:%d %s() - peeked %d bytes, can peek %d bytes\n", __FILE__, __LINE__, __func__,
 +          peekable_len, tls_session->peek_buffer_len);
   return peekable_len;
 }
@ -1352,7 +1339,7 @@ index ac6c35f6..312b6b92 100644
   if (tls_session->peek_buffer_len > 0)
     return TRUE;
-@@ -315,6 +319,16 @@ grd_vnc_tls_has_pending_on_socket (rfbClientPtr rfb_client)
+@@ -315,6 +321,16 @@ grd_vnc_tls_has_pending_on_socket (rfbClientPtr rfb_client)
   return FALSE;
 }
@ -1369,7 +1356,7 @@ index ac6c35f6..312b6b92 100644
 static int
 grd_vnc_tls_write_to_socket (rfbClientPtr  rfb_client,
                              const char   *buf,
-@@ -403,6 +417,62 @@ tls_handshake_grab_func (GrdSessionVnc  *session_vnc,
+@@ -403,6 +419,62 @@ tls_handshake_grab_func (GrdSessionVnc  *session_vnc,
   return TRUE;
 }
@ -1432,7 +1419,7 @@ index ac6c35f6..312b6b92 100644
 static void
 rfb_tls_security_handler (rfbClientPtr rfb_client)
 {
-@@ -429,6 +499,14 @@ rfb_tls_security_handler (rfbClientPtr rfb_client)
+@@ -429,6 +501,14 @@ rfb_tls_security_handler (rfbClientPtr rfb_client)
       rfb_client->hasPendingOnSocket = grd_vnc_tls_has_pending_on_socket;
       rfb_client->writeToSocket = grd_vnc_tls_write_to_socket;
@ -1448,10 +1435,10 @@ index ac6c35f6..312b6b92 100644
     }
 -- 
-2.44.0
+2.26.2
-From 1ed580b541ab5c3b815d8e29cf3aa71f1de0b649 Mon Sep 17 00:00:00 2001
+From c582baab12c1e2dd2b512329da42880c40993df6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 27 Nov 2019 16:48:00 +0100
 Subject: [PATCH 6/7] session-vnc: Set our own password handling function up
@ -1470,10 +1457,10 @@ password prompt.
 1 file changed, 2 insertions(+), 6 deletions(-)
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 3ee06f79..6e118d88 100644
+index 8b8ce1b..a93a2e3 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -99,11 +99,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
+@@ -91,11 +91,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
 static gboolean
 close_session_idle (gpointer user_data);
@ -1485,7 +1472,7 @@ index 3ee06f79..6e118d88 100644
 static void
 swap_uint8 (uint8_t *a,
             uint8_t *b)
-@@ -355,7 +350,6 @@ handle_new_client (rfbClientPtr rfb_client)
+@@ -297,7 +292,6 @@ handle_new_client (rfbClientPtr rfb_client)
       grd_session_vnc_pause (session_vnc);
       return RFB_CLIENT_ON_HOLD;
     case GRD_VNC_AUTH_METHOD_PASSWORD:
@ -1493,9 +1480,9 @@ index 3ee06f79..6e118d88 100644
       /*
        * authPasswdData needs to be non NULL in libvncserver to trigger
        * password authentication.
-@@ -719,6 +713,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+@@ -581,6 +575,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
-       session_vnc->monitor_config->connectors = connectors;
+   rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4);
-     }
+   memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4);
 +  rfb_screen->passwordCheck = check_rfb_password;
 +
@ -1503,40 +1490,43 @@ index 3ee06f79..6e118d88 100644
   rfbProcessEvents (rfb_screen, 0);
 }
 -- 
-2.44.0
+2.26.2
-From 9b7b729d9f945fcb2942c74d8ab7a9b62d6cf4bd Mon Sep 17 00:00:00 2001
+From b7fc232ee5272b430f28c33ebaacd501ff63a4dc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Mon, 12 Oct 2020 17:34:30 +0200
+Date: Wed, 27 Nov 2019 16:53:42 +0100
-Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride
+Subject: [PATCH 7/7] vnc: Unregister previously set security handlers on init
-We're copying the pixels in a separate thread managed by PipeWire, and
+When we're starting a session, we're going to handle a new client
-in this thread, accessing the VNC framebuffer dimension and stride is
+connection. However, any previous client that was ever run on in a
-racy. Instead of fetching the dimension directly, pass the expected
+previous session would still have their "security handler" registered,
-width and get the stride it will eventually have.
+as such is a global permanent change in libvncserver right now.
-Already before this patch, when the copied pixel end up on the main
+To work around this, unregister all primary security handler (i.e.
-thread and the dimension still doesn't match up, the frame will be
+'none' and 'password') when initializing the RFB screen. We'll set up
-dropped.
+the preferred one when handling the new client.
 ---
- src/grd-session-vnc.h | 3 ++-
+ src/grd-session-vnc.c | 6 ++++++
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 6 insertions(+)
-diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 5db388b0..c4f4e8d4 100644
+index a93a2e3..9fcbb69 100644
--- a/src/grd-session-vnc.h
+--- a/src/grd-session-vnc.c
-+++ b/src/grd-session-vnc.h
+++ b/src/grd-session-vnc.c
-@@ -68,7 +68,8 @@ int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+@@ -555,6 +555,12 @@ init_vnc_session (GrdSessionVnc *session_vnc)
                              8, 3, 4);
   session_vnc->rfb_screen = rfb_screen;
- int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
+  /*
- 
+   * Unregister whatever security handler was used the last time; we'll set
-int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+   * up new ones when authorizing the new client anyway.
-+int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+   */
-+                                          int            width);
+  rfbUnregisterPrimarySecurityHandlers ();
- 
+
- gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
+   update_server_format (session_vnc);
   socket = g_socket_connection_get_socket (session_vnc->connection);
 -- 
-2.44.0
+2.26.2
--- a/SOURCES/cursor-only-frame-fixes.patch
+++ b/SOURCES/cursor-only-frame-fixes.patch
@ -0,0 +1,127 @@
 From f97b689c5c67cee36025a7b0a9210deb8b373b03 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Fri, 3 Jul 2020 17:03:52 +0200
 Subject: [PATCH 1/3] session-vnc: Add API to flush
 When no damage is to be reported, but e.g. cursor moved, we need to
 flush, so add API to make this possible.
 (cherry picked from commit 25e61a7ed3631687aed4310824e7810088e63b37)
 ---
 src/grd-session-vnc.c | 6 ++++++
 src/grd-session-vnc.h | 2 ++
 2 files changed, 8 insertions(+)
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
 index 9fcbb69..7950d1e 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
@@ -179,6 +179,12 @@ grd_session_vnc_take_buffer (GrdSessionVnc *session_vnc,
   rfbProcessEvents (session_vnc->rfb_screen, 0);
 }
 +void
 +grd_session_vnc_flush (GrdSessionVnc *session_vnc)
 +{
 +  rfbProcessEvents (session_vnc->rfb_screen, 0);
 +}
 +
 void
 grd_session_vnc_set_cursor (GrdSessionVnc *session_vnc,
                             rfbCursorPtr   rfb_cursor)
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
 index 294860e..a065857 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
@@ -49,6 +49,8 @@ void grd_session_vnc_queue_resize_framebuffer (GrdSessionVnc *session_vnc,
 void grd_session_vnc_take_buffer (GrdSessionVnc *session_vnc,
                                   void          *data);
 +void grd_session_vnc_flush (GrdSessionVnc *session_vnc);
 +
 void grd_session_vnc_set_cursor (GrdSessionVnc *session_vnc,
                                  rfbCursorPtr   rfb_cursor);
 -- 
 2.26.2
 From 8a050b66be76d73725ac7665295160ab6c40b0f5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Fri, 3 Jul 2020 17:12:58 +0200
 Subject: [PATCH 2/3] vnc-pipewire-stream: Properly process cursor-change-only
 frames
 Such frames will have the buffer data size set to 0, as it is empty, but
 may contain metadata carrying the cursor update.
 (cherry picked from commit c04762a450ea9a21730db26c296c1283e121dc08)
 ---
 src/grd-vnc-pipewire-stream.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index a3f5fb6..7519377 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -312,7 +312,6 @@ process_buffer (GrdVncPipeWireStream *stream,
   size_t size;
   uint8_t *map;
   void *src_data;
 -  int y;
   struct spa_meta_cursor *spa_meta_cursor;
   g_autofree GrdVncFrame *frame = NULL;
@@ -320,8 +319,8 @@ process_buffer (GrdVncPipeWireStream *stream,
   if (buffer->datas[0].chunk->size == 0)
     {
 -      g_warning ("Received empty buffer");
 -      return NULL;
 +      map = NULL;
 +      src_data = NULL;
     }
   else if (buffer->datas[0].type == SPA_DATA_MemFd)
     {
@@ -367,6 +366,7 @@ process_buffer (GrdVncPipeWireStream *stream,
       int src_stride;
       int dst_stride;
       int height;
 +      int y;
       src_stride = buffer->datas[0].chunk->stride;
       dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
 -- 
 2.26.2
 From eac6368d8411c586007df8b1a2d85df3da1b55c5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Fri, 3 Jul 2020 17:13:58 +0200
 Subject: [PATCH 3/3] vnc-pipewire-stream: Flush connection if no new pixel
 buffer
 Otherwise we'll wait on input until we flush out our new cursor move
 only output.
 (cherry picked from commit 3394e34c3c502d63636bb852c062855c46736a6f)
 ---
 src/grd-vnc-pipewire-stream.c | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
 index 7519377..791b71d 100644
 --- a/src/grd-vnc-pipewire-stream.c
 +++ b/src/grd-vnc-pipewire-stream.c
@@ -299,6 +299,8 @@ do_render (struct spa_loop *loop,
   if (frame->data)
     grd_session_vnc_take_buffer (stream->session, frame->data);
 +  else
 +    grd_session_vnc_flush (stream->session);
   g_free (frame);
 -- 
 2.26.2
--- a/SPECS/gnome-remote-desktop.spec
+++ b/SPECS/gnome-remote-desktop.spec
@ -0,0 +1,141 @@
 %global systemd_unit gnome-remote-desktop.service
 Name:           gnome-remote-desktop
 Version:        0.1.8
 Release:        3%{?dist}
 Summary:        GNOME Remote Desktop screen share service
 License:        GPLv2+
 URL:            https://gitlab.gnome.org/jadahl/gnome-remote-desktop
 Source0:        https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/20e4965351cdbd8dc32ff9801e884b91/gnome-remote-desktop-0.1.8.tar.xz
 # Fix black screen on Wayland
 Patch1:         0001-vnc-pipewire-stream-Handle-stride-mismatch.patch
 # Anon TLS encryption support
 Patch2:         anon-tls-support.patch
 # Don't crash on metadata only buffers (#1847062)
 Patch3:         0001-stream-log-a-warning-on-error.patch
 Patch4:         0002-vnc-pipewire-stream-Only-try-to-copy-frame-pixels-if.patch
 Patch5:         0001-vnc-pipewire-stream-Remove-assert.patch
 # Cursor only frame fixes (#1837406)
 Patch6:         cursor-only-frame-fixes.patch
 BuildRequires:  git
 BuildRequires:  gcc
 BuildRequires:  meson >= 0.36.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.32
 BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.4
 BuildRequires:  pkgconfig(libvncserver) >= 0.9.11-7
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  python3-devel
 %{?systemd_requires}
 BuildRequires:  systemd
 Requires:       pipewire >= 0.3.4
 %description
 GNOME Remote Desktop is a remote desktop and screen sharing service for the
 GNOME desktop environment.
 %prep
 %autosetup -S git
 %build
 %meson
 %meson_build
 %install
 %meson_install
 %post
 %systemd_user_post %{systemd_unit}
 %preun
 %systemd_user_preun %{systemd_unit}
 %postun
 %systemd_user_postun_with_restart %{systemd_unit}
 %files
 %license COPYING
 %doc README
 %{_libexecdir}/gnome-remote-desktop-daemon
 %{_userunitdir}/gnome-remote-desktop.service
 %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.enums.xml
 %changelog
 * Wed Jul 15 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.8-3
 - Backport cursor only frame fixes
  Related: #1837406
 * Thu Jun 18 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.8-2
 - Don't crash on metadata only buffers
  Resolves: #1847062
 * Wed May 20 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.8-1
 - Rebase to 0.1.8
  Resolves: #1837406
 * Wed Nov 27 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-8
 - Update patch to handle older libvncserver at build time
  Resolves: #1684729
 * Wed Nov 27 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-7
 - Handle auth settings changes
  Resolves: #1684729
 * Wed Nov 27 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-6
 - Fix initial black content issue
  Resolves: #1765448
 * Thu May 30 2019 Tomáš Popela <tpopela@redhat.com> - 0.1.6-5
 - Bump the version to make gating happy - that's bug 1681618
 - Resolves: rhbz#1713330
 * Fri May 24 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-4
 - Backport password override test helper (rhbz#1713330)
 * Thu Jan 3 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-3
 - Backport various fixes (rhbz#1659118)
 * Mon Oct 1 2018 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-2
 - Don't crash when PipeWire disconnects (rhbz#1627469)
 * Tue Aug 7 2018 Jonas Ådahl <jadahl@redhat.com> - 0.1.6
 - Update to 0.1.6
 - Apply ANON-TLS patch
 - Depend on pipewire 0.2.2
 * Tue Aug 29 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-3
 - Use %%autosetup
 - Install licence file
 * Tue Aug 22 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-2
 - Remove gschema compilation step as that had been deprecated
 * Mon Aug 21 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-1
 - Update to 0.1.2
 - Changed tabs to spaces
 - Added systemd user macros
 - Install to correct systemd user unit directory
 - Compile gsettings schemas after install and uninstall
 * Mon Aug 21 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.1-1
 - First packaged version
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
 --- !Policy
 product_versions:
  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@ -1,381 +0,0 @@
 %global systemd_unit_handover gnome-remote-desktop-handover.service
 %global systemd_unit_headless gnome-remote-desktop-headless.service
 %global systemd_unit_system gnome-remote-desktop.service
 %global systemd_unit_user gnome-remote-desktop.service
 %global tarball_version %%(echo %{version} | tr '~' '.')
 %bcond rdp %[0%{?fedora} || 0%{?rhel} >= 10]
 %bcond vnc %[0%{?fedora} || 0%{?rhel} < 10]
 %global libei_version 1.0.901
 %global pipewire_version 0.3.49
 Name:           gnome-remote-desktop
 Version:        47.alpha
 Release:        2%{?dist}
 Summary:        GNOME Remote Desktop screen share service
 License:        GPL-2.0-or-later
 URL:            https://gitlab.gnome.org/GNOME/gnome-remote-desktop
 Source0:        https://download.gnome.org/sources/%{name}/47/%{name}-%{tarball_version}.tar.xz
 # Adds encryption support (requires patched LibVNCServer)
 Patch0:         gnutls-anontls.patch
 BuildRequires:  asciidoc
 BuildRequires:  gcc
 BuildRequires:  meson >= 0.47.0
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(epoxy)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(ffnvcodec)
 %if %{with rdp}
 BuildRequires:  pkgconfig(fdk-aac)
 BuildRequires:  pkgconfig(freerdp3)
 BuildRequires:  pkgconfig(fuse3)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(winpr3)
 %endif
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.68
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libei-1.0) >= %{libei_version}
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpipewire-0.3)
 BuildRequires:  pkgconfig(libsecret-1)
 %if %{with vnc}
 BuildRequires:  pkgconfig(libvncserver) >= 0.9.11-7
 %endif
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(tss2-esys)
 BuildRequires:  pkgconfig(tss2-mu)
 BuildRequires:  pkgconfig(tss2-rc)
 BuildRequires:  pkgconfig(tss2-tctildr)
 Requires:       libei%{?_isa} >= %{libei_version}
 Requires:       pipewire%{?_isa} >= %{pipewire_version}
 Obsoletes:      vino < 3.22.0-21
 %description
 GNOME Remote Desktop is a remote desktop and screen sharing service for the
 GNOME desktop environment.
 %prep
 %autosetup -p1 -n %{name}-%{tarball_version}
 %build
 %meson \
 %if %{with rdp}
    -Drdp=true \
 %else
    -Drdp=false \
 %endif
 %if %{with vnc}
    -Dvnc=true \
 %else
    -Dvnc=false \
 %endif
    -Dsystemd=true \
    -Dtests=false
 %meson_build
 %install
 %meson_install
 %find_lang %{name}
 %post
 %systemd_post %{systemd_unit_system}
 %systemd_user_post %{systemd_unit_handover}
 %systemd_user_post %{systemd_unit_headless}
 %systemd_user_post %{systemd_unit_user}
 %preun
 %systemd_preun %{systemd_unit_system}
 %systemd_user_preun %{systemd_unit_handover}
 %systemd_user_preun %{systemd_unit_headless}
 %systemd_user_preun %{systemd_unit_user}
 %postun
 %systemd_postun_with_restart %{systemd_unit_system}
 %systemd_user_postun_with_restart %{systemd_unit_handover}
 %systemd_user_postun_with_restart %{systemd_unit_headless}
 %systemd_user_postun_with_restart %{systemd_unit_user}
 %files -f %{name}.lang
 %license COPYING
 %doc README.md
 %{_bindir}/grdctl
 %{_libexecdir}/gnome-remote-desktop-daemon
 %{_libexecdir}/gnome-remote-desktop-enable-service
 %{_userunitdir}/%{systemd_unit_user}
 %{_userunitdir}/%{systemd_unit_headless}
 %{_userunitdir}/%{systemd_unit_handover}
 %{_unitdir}/%{systemd_unit_system}
 %{_datadir}/applications/org.gnome.RemoteDesktop.Handover.desktop
 %{_datadir}/dbus-1/system-services/org.gnome.RemoteDesktop.service
 %{_datadir}/dbus-1/system.d/org.gnome.RemoteDesktop.conf
 %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.enums.xml
 %{_datadir}/polkit-1/actions/org.gnome.remotedesktop.configure-system-daemon.policy
 %{_datadir}/polkit-1/actions/org.gnome.remotedesktop.enable-system-daemon.policy
 %{_datadir}/polkit-1/rules.d/20-gnome-remote-desktop.rules
 %{_sysusersdir}/gnome-remote-desktop-sysusers.conf
 %{_tmpfilesdir}/gnome-remote-desktop-tmpfiles.conf
 %if %{with rdp}
 %{_datadir}/gnome-remote-desktop/
 %endif
 %{_mandir}/man1/grdctl.1*
 %changelog
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 47.alpha-2
 - Bump release for October 2024 mass rebuild:
  Resolves: RHEL-64018
 * Mon Jul 22 2024 Jonas Ådahl <jadahl@redhat.com> - 47~alpha-1
 - Update to 47.alpha
  Resolves: RHEL-50079
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.2-2
 - Bump release for June 2024 mass rebuild
 * Thu May 23 2024 Nieves Montero <nmontero@redhat.com> - 46.2-1
 - Update to 46.2
 * Thu Apr 18 2024 David King <amigadave@amigadave.com> - 46.1-1
 - Update to 46.1
 * Thu Mar 28 2024 Adam Williamson <awilliam@redhat.com> - 46.0-2
 - Correct systemd macros
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 * Fri Nov 24 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 45.1-2
 - Disable VNC in RHEL 10+
 * Sun Oct 22 2023 Kalev Lember <klember@redhat.com> - 45.1-1
 - Update to 45.1
 * Sat Oct 21 2023 Kalev Lember <klember@redhat.com> - 45.0-1
 - Update to 45.0
 * Tue Sep 05 2023 Kalev Lember <klember@redhat.com> - 45.rc-1
 - Update to 45.rc
 * Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 45.beta-1
 - Update to 45.beta
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45.alpha-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 * Wed Jul 05 2023 Jonas Ådahl <jadahl@redhat.com> - 45~alpha-1
 - Update to 45.alpha
 * Wed May 31 2023 Kalev Lember <klember@redhat.com> - 44.2-1
 - Update to 44.2
 * Mon Apr 24 2023 David King <amigadave@amigadave.com> - 44.1-1
 - Update to 44.1
 * Sun Mar 19 2023 David King <amigadave@amigadave.com> - 44.0-1
 - Update to 44.0
 * Thu Mar 16 2023 Jonas Ådahl <jadahl@redhat.com> - 44~rc-2
 - Enable RDP in ELN
 * Sun Mar 05 2023 David King <amigadave@amigadave.com> - 44~rc-1
 - Update to 44.rc
 * Mon Feb 06 2023 David King <amigadave@amigadave.com> - 44~alpha-1
 - Update to 44.alpha
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 * Thu Dec 08 2022 David King <amigadave@amigadave.com> - 43.2-1
 - Update to 43.2
 * Tue Nov 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 43.1-2
 - Fix build on RHEL 9+/ELN
 * Thu Oct 27 2022 David King <amigadave@amigadave.com> - 43.1-1
 - Update to 43.1
 * Tue Sep 20 2022 Jonas Ådahl <jadahl@redhat.com> - 43.0
 - Update to 43.0
 * Thu Aug 18 2022 Jonas Ådahl <jadahl@redhat.com> - 43~beta-4
 - Drop dependency on tpm2-abrmd
 * Tue Aug 16 2022 Kalev Lember <klember@redhat.com> - 43~beta-3
 - Avoid manual requires on tss2* and rely on automatic soname deps instead
 * Mon Aug 15 2022 Simone Caronni <negativo17@gmail.com> - 43~beta-2
 - Rebuild for updated FreeRDP.
 * Thu Aug 11 2022 Jonas Ådahl <jadahl@redhat.com> - 43~beta
 - Update to 43.beta
 * Fri Jul 29 2022 Tomas Popela <tpopela@redhat.com> - 43~alpha-2
 - FreeRDP is built without server support in RHEL and ELN so we should disable
  the RDP there
 * Thu Jul 28 2022 Jonas Ådahl <jadahl@redhat.com> - 43~alpha
 - Update to 43.alpha
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 * Thu Jul 07 2022 David King <amigadave@amigadave.com> - 42.3-1
 - Update to 43.3 (#2091415)
 * Sun May 29 2022 David King <amigadave@amigadave.com> - 42.2-1
 - Update to 42.2
 * Wed May 11 2022 David King <amigadave@amigadave.com> - 42.1.1-1
 - Update to 42.1.1 (#2061546)
 * Wed Apr 27 2022 David King <amigadave@amigadave.com> - 42.1-2
 - Fix isa macro in Requires
 * Tue Apr 26 2022 David King <amigadave@amigadave.com> - 42.1-1
 - Update to 42.1 (#2061546)
 * Mon Mar 21 2022 Jonas Ådahl <jadahl@redhat.com> - 42.0
 - Update to 42.0
 * Mon Mar 14 2022 Jonas Ådahl <jadahl@redhat.com> - 42~rc-1
 - Update to 42.rc
 * Wed Feb 16 2022 Jonas Ådahl <jadahl@redhat.com> - 42~beta-1
 - Update to 42.beta
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 41.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 * Wed Dec 08 2021 Jonas Ådahl <jadahl@redhat.com> - 41.2-1
 - Update to 41.2
 * Mon Nov 01 2021 Kalev Lember <klember@redhat.com> - 41.1-1
 - Update to 41.1
 * Mon Sep 20 2021 Kalev Lember <klember@redhat.com> - 41.0-1
 - Update to 41.0
 * Tue Sep 07 2021 Jonas Ådahl <jadahl@redhat.com> - 41~rc-1
 - Bump to 41.rc
 * Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 40.1-3
 - Avoid systemd_requires as per updated packaging guidelines
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 * Mon May 03 2021 Jonas Ådahl <jadahl@redhat.com> - 40.1-1
 - Bump to 40.1
 * Thu Apr 15 2021 Simone Caronni <negativo17@gmail.com> - 40.0-2
 - Rebuild for updated FreeRDP.
 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
 - Update to 40.0
 * Thu Mar 18 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0~rc-2
 - Add Obsoletes: vino
 * Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40.0~rc-1
 - Update to 40.rc
 * Thu Mar 04 2021 Jonas Ådahl <jadahl@redhat.com> - 40.0~beta-1
 - Bump to 40.beta
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 * Mon Sep 14 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.9-2
 - Copy using the right destination stride
 * Mon Sep 14 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.9-1
 - Update to 0.1.9
 - Backport race condition crash fix
 - Rebase anon-tls patches
 * Thu Aug 27 2020 Ray Strode <rstrode@redhat.com> - 0.1.8-3
 - Fix crash
  Related: #1844993
 * Mon Jun 1 2020 Felipe Borges <feborges@redhat.com> - 0.1.8-2
 - Fix black screen issue in remote connections on Wayland
 * Wed Mar 11 2020 Jonas Ådahl <jadahl@redhat.com> - 0.1.8-1
 - Update to 0.1.8
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 * Mon Mar 4 2019 Jonas Ådahl <jadahl@redhat.com> - 0.1.7-1
 - Update to 0.1.7
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 * Tue Oct 2 2018 Jonas Ådahl <jadahl@redhat.com> - 0.1.6-2
 - Don't crash when PipeWire disconnects (rhbz#1632781)
 * Tue Aug 7 2018 Jonas Ådahl <jadahl@redhat.com> - 0.1.6
 - Update to 0.1.6
 - Apply ANON-TLS patch
 - Depend on pipewire 0.2.2
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 * Wed May 30 2018 Jonas Ådahl <jadahl@redhat.com> - 0.1.4-1
 - Update to new version
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.2-5
 - Escape macros in %%changelog
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 * Tue Aug 29 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-3
 - Use %%autosetup
 - Install licence file
 * Tue Aug 22 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-2
 - Remove gschema compilation step as that had been deprecated
 * Mon Aug 21 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.2-1
 - Update to 0.1.2
 - Changed tabs to spaces
 - Added systemd user macros
 - Install to correct systemd user unit directory
 - Compile gsettings schemas after install and uninstall
 * Mon Aug 21 2017 Jonas Ådahl <jadahl@redhat.com> - 0.1.1-1
 - First packaged version
--- a/1
+++ b/1
@ -1 +0,0 @@
 SHA512 (gnome-remote-desktop-47.alpha.tar.xz) = d7e128d7c54c7e7bbb8f0b59574fa84711667150411ce79fa93eb710cfe1fa38df6ab59436347f62249a365da0e0cbe2791d0d98244ed35d03a4982a5f7fd37d
		`@ -0,0 +1 @@`
							`3347257bd906cd0ca86887c692befd8d412afab1 SOURCES/gnome-remote-desktop-0.1.8.tar.xz`
		`@ -1 +0,0 @@`
			`SHA512 (gnome-remote-desktop-47.alpha.tar.xz) = d7e128d7c54c7e7bbb8f0b59574fa84711667150411ce79fa93eb710cfe1fa38df6ab59436347f62249a365da0e0cbe2791d0d98244ed35d03a4982a5f7fd37d`