Update to 49.2

rebuild for new fuse3
Update to 49.1
2025-12-09 19:54:54 -05:00 · 2025-11-04 15:35:31 -05:00 · 2025-10-16 11:25:51 +02:00 · 2025-09-16 23:01:02 +02:00 · 2025-09-16 19:29:56 +00:00 · 2025-08-29 14:30:16 -05:00
13 changed files with 334 additions and 542 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,2 @@
-/gnome-remote-desktop-0.1.*.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-*.tar.xz
+/gnome-remote-desktop-*-build
--- a/0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
+++ b/0001-vnc-Copy-pixels-using-the-right-destination-stride.patch
@ -1,71 +0,0 @@
-From 81172effba7c70d3b2932c67be79a2924eae9d73 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
-Subject: [PATCH] vnc: Copy pixels using the right destination stride
-
-We're copying the pixels in a separate thread managed by PipeWire, and
-in this thread, accessing the VNC framebuffer dimension and stride is
-racy. Instead of fetching the dimension directly, pass the expected
-width and get the stride it will eventually have.
-
-Already before this patch, when the copied pixel end up on the main
-thread and the dimension still doesn't match up, the frame will be
-dropped.
---
- src/grd-session-vnc.c         | 5 +++--
- src/grd-session-vnc.h         | 3 ++-
- src/grd-vnc-pipewire-stream.c | 5 +++--
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 69fb33d..f4835aa 100644
--- a/src/grd-session-vnc.c
-+++ b/src/grd-session-vnc.c
-@@ -535,9 +535,10 @@ grd_session_vnc_get_fd (GrdSessionVnc *session_vnc)
- }
- 
- int
-grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc)
-+grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
-+                                      int            width)
- {
-  return session_vnc->rfb_screen->paddedWidthInBytes;
-+  return width * BGRX_BYTES_PER_PIXEL;
- }
- 
- rfbClientPtr
-diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index 0d01ad3..ccd046c 100644
--- a/src/grd-session-vnc.h
-+++ b/src/grd-session-vnc.h
-@@ -60,7 +60,8 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
- 
- int grd_session_vnc_get_fd (GrdSessionVnc *session_vnc);
- 
-int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
-+int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
-+                                          int            width);
- 
- gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
- 
-diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
-index 96dd7c9..82ceb9b 100644
--- a/src/grd-vnc-pipewire-stream.c
-+++ b/src/grd-vnc-pipewire-stream.c
-@@ -326,10 +326,11 @@ process_buffer (GrdVncPipeWireStream *stream,
-       int height;
-       int y;
- 
-      src_stride = buffer->datas[0].chunk->stride;
-      dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
-       height = stream->spa_format.size.height;
-       width = stream->spa_format.size.width;
-+      src_stride = buffer->datas[0].chunk->stride;
-+      dst_stride = grd_session_vnc_get_stride_for_width (stream->session,
-+                                                         width);
- 
-       frame->data = g_malloc (height * dst_stride);
-       for (y = 0; y < height; y++)
-- 
-2.28.0
-
--- a/0001-vnc-Drop-frames-if-client-is-gone.patch
+++ b/0001-vnc-Drop-frames-if-client-is-gone.patch
@ -1,80 +0,0 @@
-From ab97841629f5f3f4fab9993b6255b6ae04828b9c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Wed, 9 Sep 2020 10:14:20 +0200
-Subject: [PATCH] vnc: Drop frames if client is gone
-
-Frames from PipeWire are posted asynchronously from a I/O thread to the
-main thread where they are turned into VNC frame updates and cursor
-movements. On the other hand, sessions are closed asynchronously when
-the VNC client disappears. If a frame ended up on the main thread after
-a client disappeared but before the session and stream was closed, we'd
-try to turn the new frames into VNC updates without a client being
-available, causing use after free.
-
-Fix this by dropping frames that happens during this time frame.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/issues/43
---
- src/grd-session-vnc.c         | 7 +++++++
- src/grd-session-vnc.h         | 2 ++
- src/grd-vnc-pipewire-stream.c | 8 ++++++++
- 3 files changed, 17 insertions(+)
-
-diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 813838a..a06d34d 100644
--- a/src/grd-session-vnc.c
-+++ b/src/grd-session-vnc.c
-@@ -209,6 +209,12 @@ maybe_queue_close_session_idle (GrdSessionVnc *session_vnc)
-     g_idle_add (close_session_idle, session_vnc);
- }
- 
-+gboolean
-+grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc)
-+{
-+  return !session_vnc->rfb_client;
-+}
-+
- static void
- handle_client_gone (rfbClientPtr rfb_client)
- {
-@@ -218,6 +224,7 @@ handle_client_gone (rfbClientPtr rfb_client)
- 
-   grd_session_vnc_detach_source (session_vnc);
-   maybe_queue_close_session_idle (session_vnc);
-+  session_vnc->rfb_client = NULL;
- }
- 
- static void
-diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index 579a12a..07678c8 100644
--- a/src/grd-session-vnc.h
-+++ b/src/grd-session-vnc.h
-@@ -57,4 +57,6 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
- 
- int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
- 
-+gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
-+
- #endif /* GRD_SESSION_VNC_H */
-diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
-index 78793c4..96dd7c9 100644
--- a/src/grd-vnc-pipewire-stream.c
-+++ b/src/grd-vnc-pipewire-stream.c
-@@ -234,6 +234,14 @@ do_render (struct spa_loop *loop,
-   if (!frame)
-     return 0;
- 
-+  if (grd_session_vnc_is_client_gone (stream->session))
-+    {
-+      g_free (frame->data);
-+      g_clear_pointer (&frame->rfb_cursor, rfbFreeCursor);
-+      g_free (frame);
-+      return 0;
-+    }
-+
-   if (frame->rfb_cursor)
-     grd_session_vnc_set_cursor (stream->session, frame->rfb_cursor);
- 
-- 
-2.26.2
-
--- a/0001-vnc-pipewire-stream-Handle-stride-mismatch.patch
+++ b/0001-vnc-pipewire-stream-Handle-stride-mismatch.patch
@ -1,73 +0,0 @@
-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,
-+              stream->spa_format.size.width * 4);
-+    }
- 
-   if (map)
-     {
-- 
-2.26.2
-
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@ -1,39 +1,70 @@
-%global systemd_unit gnome-remote-desktop.service
+%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:        41.2
-Release:        2%{?dist}
+Version:        49.2
+Release:        %autorelease
 Summary:        GNOME Remote Desktop screen share service

-License:        GPLv2+
-URL:            https://gitlab.gnome.org/jadahl/gnome-remote-desktop
-Source0:        https://download.gnome.org/sources/gnome-remote-desktop/40/%{name}-%{tarball_version}.tar.xz
+License:        GPL-2.0-or-later
+URL:            https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+Source0:        https://download.gnome.org/sources/%{name}/49/%{name}-%{tarball_version}.tar.xz

 # Adds encryption support (requires patched LibVNCServer)
 Patch0:         gnutls-anontls.patch

-BuildRequires:  git
+BuildRequires:  asciidoc
 BuildRequires:  gcc
-BuildRequires:  meson >= 0.36.0
-BuildRequires:  pkgconfig
+BuildRequires:  meson >= 0.47.0
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.32
-BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.32
-BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.0
-BuildRequires:  pkgconfig(libvncserver) >= 0.9.11-7
-BuildRequires:  pkgconfig(freerdp2)
-BuildRequires:  pkgconfig(winpr2)
-BuildRequires:  pkgconfig(fuse3)
+BuildRequires:  pkgconfig(epoxy)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(ffnvcodec)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(libsecret-1)
-BuildRequires:  pkgconfig(libnotify)
+%if %{with rdp}
+BuildRequires:  glslc
+BuildRequires:  spirv-tools
+BuildRequires:  pkgconfig(fdk-aac)
+BuildRequires:  pkgconfig(freerdp3)
+BuildRequires:  pkgconfig(fuse3)
+BuildRequires:  pkgconfig(libva)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(winpr3)
+%endif
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.68
+BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  systemd
+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:       pipewire >= 0.3.0
+Requires:       libei%{?_isa} >= %{libei_version}
+Requires:       pipewire%{?_isa} >= %{pipewire_version}

 Obsoletes:      vino < 3.22.0-21

@ -43,148 +74,81 @@ GNOME desktop environment.


 %prep
-%autosetup -S git -n %{name}-%{tarball_version}
+%autosetup -p1 -n %{name}-%{tarball_version}


 %build
-%meson
+%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 gnome-remote-desktop
+%find_lang %{name}


 %post
-%systemd_user_post %{systemd_unit}
+%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_user_preun %{systemd_unit}
+%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_user_postun_with_restart %{systemd_unit}
+%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 gnome-remote-desktop.lang
+%files -f %{name}.lang
 %license COPYING
-%doc README
+%doc README.md
+%{_bindir}/grdctl
 %{_libexecdir}/gnome-remote-desktop-daemon
-%{_userunitdir}/gnome-remote-desktop.service
+%{_libexecdir}/gnome-remote-desktop-enable-service
+%{_libexecdir}/gnome-remote-desktop-configuration-daemon
+%{_userunitdir}/%{systemd_unit_user}
+%{_userunitdir}/%{systemd_unit_headless}
+%{_userunitdir}/%{systemd_unit_handover}
+%{_unitdir}/%{systemd_unit_system}
+%{_unitdir}/gnome-remote-desktop-configuration.service
+%{_datadir}/applications/org.gnome.RemoteDesktop.Handover.desktop
+%{_datadir}/dbus-1/system-services/org.gnome.RemoteDesktop.Configuration.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
-* 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
+%autochangelog
--- a/gnutls-anontls.patch
+++ b/gnutls-anontls.patch
@ -1,4 +1,4 @@
-From 06f99dc1aaef90275547d8c93ddf18e9d0c88257 Mon Sep 17 00:00:00 2001
+From 005617f3e2cb59241dc02c2db714c2b934553acb 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
@ -13,34 +13,34 @@ VNC connection.
 src/grd-enums.h                               |   6 +
 src/grd-session-vnc.c                         | 120 ++++-
 src/grd-session-vnc.h                         |  17 +
- src/grd-settings.c                            |  28 ++
- src/grd-settings.h                            |   2 +
- src/grd-vnc-server.c                          |  45 ++
+ src/grd-settings-user.c                       |   4 +
+ src/grd-settings.c                            |  18 +
+ src/grd-vnc-server.c                          |  49 ++
 src/grd-vnc-tls.c                             | 444 ++++++++++++++++++
 src/grd-vnc-tls.h                             |  28 ++
 src/meson.build                               |   3 +
 ...nome.desktop.remote-desktop.gschema.xml.in |  10 +
- 11 files changed, 678 insertions(+), 26 deletions(-)
+ 11 files changed, 674 insertions(+), 26 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 c8c957c..536e94a 100644
+index 5dcb77c3..269238c0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -54,6 +54,7 @@ endif
+@@ -70,6 +70,7 @@ endif
 if have_vnc
-   libvncserver_dep = dependency('libvncserver')
   libvncclient_dep = dependency('libvncclient')
+   libvncserver_dep = dependency('libvncserver')
 +  gnutls_dep = dependency('gnutls')
 endif
 
 prefix = get_option('prefix')
 diff --git a/src/grd-enums.h b/src/grd-enums.h
-index ffab821..4333863 100644
+index 25b42661..f4438764 100644
 --- a/src/grd-enums.h
 +++ b/src/grd-enums.h
-@@ -27,4 +27,10 @@ typedef enum
+@@ -32,6 +32,12 @@ typedef enum
   GRD_VNC_AUTH_METHOD_PASSWORD
 } GrdVncAuthMethod;
 
@ -50,12 +50,14 @@ index ffab821..4333863 100644
 +  GRD_VNC_ENCRYPTION_TLS_ANON = 1 << 1,
 +} GrdVncEncryption;
 +
- #endif /* GRD_ENUMS_H */
+ typedef enum
+ {
+   GRD_VNC_SCREEN_SHARE_MODE_MIRROR_PRIMARY,
 diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
-index 0e520dc..0c189fd 100644
+index f7e14080..b5e4fe13 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -45,7 +45,9 @@ struct _GrdSessionVnc
+@@ -46,7 +46,9 @@ struct _GrdSessionVnc
 {
   GrdSession parent;
 
@ -65,7 +67,7 @@ index 0e520dc..0c189fd 100644
   GSource *source;
   rfbScreenInfoPtr rfb_screen;
   rfbClientPtr rfb_client;
-@@ -540,6 +542,12 @@ check_rfb_password (rfbClientPtr  rfb_client,
+@@ -608,6 +610,12 @@ check_rfb_password (rfbClientPtr  rfb_client,
     }
 }
 
@ -78,7 +80,7 @@ index 0e520dc..0c189fd 100644
 int
 grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
                                       int            width)
-@@ -547,6 +555,18 @@ grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
+@@ -615,6 +623,18 @@ grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
   return width * BGRX_BYTES_PER_PIXEL;
 }
 
@ -97,7 +99,7 @@ index 0e520dc..0c189fd 100644
 static void
 init_vnc_session (GrdSessionVnc *session_vnc)
 {
-@@ -590,44 +610,85 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+@@ -689,44 +709,85 @@ init_vnc_session (GrdSessionVnc *session_vnc)
   rfbProcessEvents (rfb_screen, 0);
 }
 
@ -208,7 +210,7 @@ index 0e520dc..0c189fd 100644
     }
 
   return G_SOURCE_CONTINUE;
-@@ -640,7 +701,10 @@ grd_session_vnc_attach_source (GrdSessionVnc *session_vnc)
+@@ -739,7 +800,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,
@ -220,18 +222,23 @@ index 0e520dc..0c189fd 100644
                                                 NULL);
   g_source_set_callback (session_vnc->source,
                          (GSourceFunc) handle_socket_data,
-@@ -666,8 +730,10 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+@@ -780,6 +844,7 @@ 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);
-@@ -682,6 +748,8 @@ grd_session_vnc_dispose (GObject *object)
+@@ -806,6 +872,8 @@ grd_session_vnc_dispose (GObject *object)
 
   g_assert (!session_vnc->rfb_screen);
 
@ -241,12 +248,12 @@ index 0e520dc..0c189fd 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 a532567..4e7b33d 100644
+index 8fc71850..3c08f812 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
@@ -36,6 +36,9 @@ G_DECLARE_FINAL_TYPE (GrdSessionVnc,
                       GRD, SESSION_VNC,
-                       GrdSession);
+                       GrdSession)
 
 +typedef gboolean (* GrdVncSocketGrabFunc) (GrdSessionVnc  *session_vnc,
 +                                           GError        **error);
@ -254,7 +261,7 @@ index a532567..4e7b33d 100644
 GrdSessionVnc *grd_session_vnc_new (GrdVncServer      *vnc_server,
                                     GSocketConnection *connection);
 
-@@ -62,6 +65,20 @@ void grd_session_vnc_set_client_clipboard_text (GrdSessionVnc *session_vnc,
+@@ -62,4 +65,18 @@ void grd_session_vnc_set_client_clipboard_text (GrdSessionVnc *session_vnc,
 int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
                                           int            width);
 
@ -263,7 +270,7 @@ index a532567..4e7b33d 100644
 +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);
 +
 +void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
@ -273,96 +280,81 @@ index a532567..4e7b33d 100644
 +                                    GrdVncSocketGrabFunc  grab_func);
 +
 +GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
+diff --git a/src/grd-settings-user.c b/src/grd-settings-user.c
+index 1bd679e4..c54e0b80 100644
+--- a/src/grd-settings-user.c
+++ b/src/grd-settings-user.c
+@@ -91,6 +91,10 @@ grd_settings_user_constructed (GObject *object)
+   g_settings_bind (settings->vnc_settings, "screen-share-mode",
+                    settings, "vnc-screen-share-mode",
+                    G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (settings->vnc_settings, "encryption",
+                   settings, "vnc-encryption",
+                   G_SETTINGS_BIND_DEFAULT);
 +
- #endif /* GRD_SESSION_VNC_H */
+ 
+   G_OBJECT_CLASS (grd_settings_user_parent_class)->constructed (object);
+ }
 diff --git a/src/grd-settings.c b/src/grd-settings.c
-index d2f31d2..12d8693 100644
+index 8393ace5..a65385ef 100644
 --- a/src/grd-settings.c
 +++ b/src/grd-settings.c
-@@ -60,6 +60,7 @@ struct _GrdSettings
-     gboolean view_only;
-     GrdVncAuthMethod auth_method;
-     int port;
-+    GrdVncEncryption encryption;
-   } vnc;
+@@ -58,6 +58,7 @@ enum
+   PROP_RDP_SERVER_CERT_PATH,
+   PROP_RDP_SERVER_KEY_PATH,
+   PROP_VNC_AUTH_METHOD,
+  PROP_VNC_ENCRYPTION,
 };
 
-@@ -242,6 +243,12 @@ grd_settings_get_vnc_auth_method (GrdSettings *settings)
-     return settings->vnc.auth_method;
- }
+ typedef struct _GrdSettingsPrivate
+@@ -84,6 +85,7 @@ typedef struct _GrdSettingsPrivate
+     gboolean view_only;
+     GrdVncScreenShareMode screen_share_mode;
+     GrdVncAuthMethod auth_method;
+    GrdVncEncryption encryption;
+   } vnc;
+ } GrdSettingsPrivate;
 
-+GrdVncEncryption
-+grd_settings_get_vnc_encryption (GrdSettings *settings)
-+{
-+  return settings->vnc.encryption;
-+}
-+
- static void
- update_rdp_tls_cert (GrdSettings *settings)
- {
-@@ -277,6 +284,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_rdp_settings_changed (GSettings   *rdp_settings,
-                          const char  *key,
-@@ -314,6 +328,11 @@ on_vnc_settings_changed (GSettings   *vnc_settings,
-       update_vnc_auth_method (settings);
-       g_signal_emit (settings, signals[VNC_AUTH_METHOD_CHANGED], 0);
+@@ -426,6 +428,9 @@ grd_settings_get_property (GObject    *object,
+       else
+         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);
     }
-+  else if (strcmp (key, "encryption") == 0)
-+    {
-+      update_vnc_encryption (settings);
-+      g_signal_emit (settings, signals[VNC_ENCRYPTION_CHANGED], 0);
-+    }
+@@ -563,6 +568,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);
+     }
+@@ -744,4 +752,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));
 }
- 
- static void
-@@ -345,6 +364,8 @@ grd_settings_init (GrdSettings *settings)
- 
-   settings->rdp.port = GRD_RDP_SERVER_PORT;
-   settings->vnc.port = GRD_VNC_SERVER_PORT;
-+
-+  update_vnc_encryption (settings);
- }
- 
- static void
-@@ -389,4 +410,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 e12e47e..b940fdb 100644
--- a/src/grd-settings.h
-+++ b/src/grd-settings.h
-@@ -64,4 +64,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 a6d95cb..f9c68db 100644
+index 83220655..2f8229b2 100644
 --- a/src/grd-vnc-server.c
 +++ b/src/grd-vnc-server.c
-@@ -24,11 +24,13 @@
+@@ -24,6 +24,7 @@
 
 #include "grd-vnc-server.h"
 
@ -370,13 +362,15 @@ index a6d95cb..f9c68db 100644
 #include <gio/gio.h>
 #include <rfb/rfb.h>
 
- #include "grd-context.h"
+@@ -31,6 +32,7 @@
+ #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;
 }
 
@ -388,7 +382,9 @@ index a6d95cb..f9c68db 100644
 +  GrdVncEncryption encryption;
 +
 +  tls_security_handler = grd_vnc_tls_get_security_handler ();
-+  encryption = grd_settings_get_vnc_encryption (settings);
+  g_object_get (G_OBJECT (settings),
+                "vnc-encryption", &encryption,
+                NULL);
 +
 +  if (encryption == (GRD_VNC_ENCRYPTION_NONE | GRD_VNC_ENCRYPTION_TLS_ANON))
 +    {
@ -420,18 +416,19 @@ index a6d95cb..f9c68db 100644
 gboolean
 grd_vnc_server_start (GrdVncServer  *vnc_server,
                       GError       **error)
-@@ -220,12 +259,18 @@ static void
+@@ -242,11 +283,19 @@ grd_vnc_server_dispose (GObject *object)
+ 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_context_get_debug_flags (vnc_server->context) & GRD_DEBUG_VNC)
+
+   if (grd_get_debug_flags () & GRD_DEBUG_VNC)
     rfbLogEnable (1);
   else
     rfbLogEnable (0);
 
-+  g_signal_connect (settings, "vnc-encryption-changed",
+  g_signal_connect (settings, "notify::vnc-encryption",
 +                    G_CALLBACK (on_vnc_encryption_changed),
 +                    vnc_server);
 +  sync_encryption_settings (vnc_server);
@ -441,7 +438,7 @@ index a6d95cb..f9c68db 100644
 
 diff --git a/src/grd-vnc-tls.c b/src/grd-vnc-tls.c
 new file mode 100644
-index 0000000..ec4758e
+index 00000000..ec4758e0
 --- /dev/null
 +++ b/src/grd-vnc-tls.c
@@ -0,0 +1,444 @@
@ -891,7 +888,7 @@ index 0000000..ec4758e
 +}
 diff --git a/src/grd-vnc-tls.h b/src/grd-vnc-tls.h
 new file mode 100644
-index 0000000..135ef8c
+index 00000000..135ef8c7
 --- /dev/null
 +++ b/src/grd-vnc-tls.h
@@ -0,0 +1,28 @@
@ -924,10 +921,10 @@ index 0000000..135ef8c
 +
 +#endif /* GRD_VNC_TLS_H */
 diff --git a/src/meson.build b/src/meson.build
-index 2fe3923..bf8059f 100644
+index 1b2cb93d..6b8b517e 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -97,10 +97,13 @@ if have_vnc
+@@ -274,10 +274,13 @@ if have_vnc
     'grd-vnc-pipewire-stream.h',
     'grd-vnc-server.c',
     'grd-vnc-server.h',
@ -942,11 +939,11 @@ index 2fe3923..bf8059f 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 7633e00..c2c543e 100644
+index 2986a0e5..a0169789 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 @@
- 	 * password - by requiring the remote client to provide a known password
+@@ -173,6 +173,16 @@
+                     configuration updates.
       </description>
     </key>
 +    <key name='encryption' flags='org.gnome.desktop.remote-desktop.GrdVncEncryption'>
@ -960,12 +957,13 @@ index 7633e00..c2c543e 100644
 +      </description>
 +    </key>
   </schema>
- </schemalist>
+   <schema id='org.gnome.desktop.remote-desktop.vnc.headless' path='/org/gnome/desktop/remote-desktop/vnc/headless/'>
+     <key name='port' type='q'>
 -- 
-2.31.1
+2.51.0


-From 9f289a90a167e29cf43e6d0d91c4f7605a131f39 Mon Sep 17 00:00:00 2001
+From bc65e13fb3687b2f79433c880525333810d6ba31 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
@ -978,10 +976,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 0c189fd..596896d 100644
+index b5e4fe13..79de30d4 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -41,14 +41,27 @@
+@@ -42,14 +42,27 @@
 #define BGRX_SAMPLES_PER_PIXEL 3
 #define BGRX_BYTES_PER_PIXEL 4
 
@ -1009,8 +1007,8 @@ index 0c189fd..596896d 100644
   rfbScreenInfoPtr rfb_screen;
   rfbClientPtr rfb_client;
 
-@@ -76,7 +89,7 @@ struct _GrdSessionVnc
- G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION);
+@@ -81,7 +94,7 @@ struct _GrdSessionVnc
+ G_DEFINE_TYPE (GrdSessionVnc, grd_session_vnc, GRD_TYPE_SESSION)
 
 static void
 -grd_session_vnc_detach_source (GrdSessionVnc *session_vnc);
@ -1018,7 +1016,7 @@ index 0c189fd..596896d 100644
 
 static gboolean
 close_session_idle (gpointer user_data);
-@@ -235,7 +248,8 @@ handle_client_gone (rfbClientPtr rfb_client)
+@@ -248,7 +261,8 @@ handle_client_gone (rfbClientPtr rfb_client)
 
   g_debug ("VNC client gone");
 
@ -1028,16 +1026,16 @@ index 0c189fd..596896d 100644
   maybe_queue_close_session_idle (session_vnc);
   session_vnc->rfb_client = NULL;
 }
-@@ -304,7 +318,7 @@ handle_new_client (rfbClientPtr rfb_client)
-                               session_vnc->prompt_cancellable,
-                               prompt_response_callback,
-                               session_vnc);
+@@ -338,7 +352,7 @@ handle_new_client (rfbClientPtr rfb_client)
+     {
+     case GRD_VNC_AUTH_METHOD_PROMPT:
+       show_sharing_desktop_prompt (session_vnc, rfb_client->host);
 -      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;
-@@ -533,7 +547,7 @@ check_rfb_password (rfbClientPtr  rfb_client,
+@@ -601,7 +615,7 @@ check_rfb_password (rfbClientPtr  rfb_client,
   if (memcmp (challenge_encrypted, response_encrypted, len) == 0)
     {
       grd_session_start (GRD_SESSION (session_vnc));
@ -1046,8 +1044,8 @@ index 0c189fd..596896d 100644
       return TRUE;
     }
   else
-@@ -718,6 +732,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
-   g_clear_pointer (&session_vnc->source, g_source_destroy);
+@@ -821,6 +835,36 @@ grd_session_vnc_detach_source (GrdSessionVnc *session_vnc)
+   g_clear_pointer (&session_vnc->source, g_source_unref);
 }
 
 +gboolean
@ -1080,10 +1078,10 @@ index 0c189fd..596896d 100644
 +  g_signal_emit (session_vnc, signals[RESUMED], 0);
 +}
 +
- GrdSessionVnc *
- grd_session_vnc_new (GrdVncServer      *vnc_server,
-                      GSocketConnection *connection)
-@@ -735,6 +779,7 @@ grd_session_vnc_new (GrdVncServer      *vnc_server,
+ static void
+ on_view_only_changed (GrdSettings   *settings,
+                       GParamSpec    *pspec,
+@@ -859,6 +903,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);
@ -1091,16 +1089,16 @@ index 0c189fd..596896d 100644
 
   init_vnc_session (session_vnc);
 
-@@ -764,7 +809,7 @@ grd_session_vnc_stop (GrdSession *session)
- 
-   g_clear_object (&session_vnc->pipewire_stream);
+@@ -893,7 +938,7 @@ grd_session_vnc_stop (GrdSession *session)
+       g_clear_object (&session_vnc->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);
-@@ -817,8 +862,8 @@ grd_session_vnc_stream_ready (GrdSession *session,
+@@ -984,8 +1029,8 @@ on_stream_ready (GrdStream     *stream,
                     G_CALLBACK (on_pipewire_stream_closed),
                     session_vnc);
 
@ -1111,10 +1109,10 @@ index 0c189fd..596896d 100644
 }
 
 static void
-@@ -837,4 +882,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
+@@ -1021,4 +1066,17 @@ grd_session_vnc_class_init (GrdSessionVncClass *klass)
 
   session_class->stop = grd_session_vnc_stop;
-   session_class->stream_ready = grd_session_vnc_stream_ready;
+   session_class->on_stream_created = grd_session_vnc_on_stream_created;
 +
 +  signals[PAUSED] = g_signal_new ("paused",
 +                                  G_TYPE_FROM_CLASS (klass),
@ -1130,10 +1128,10 @@ index 0c189fd..596896d 100644
 +                                   G_TYPE_NONE, 0);
 }
 -- 
-2.31.1
+2.51.0


-From 1d34839781948d8de331641863a589ae4eb46c30 Mon Sep 17 00:00:00 2001
+From aabc0245e247fbffe9ae6b8281cbf2bccc9ab882 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
@ -1146,10 +1144,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 596896d..06b2cf7 100644
+index 79de30d4..b48b9017 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -672,6 +672,21 @@ vnc_socket_grab_func (GrdSessionVnc  *session_vnc,
+@@ -771,6 +771,21 @@ vnc_socket_grab_func (GrdSessionVnc  *session_vnc,
   return TRUE;
 }
 
@ -1171,7 +1169,7 @@ index 596896d..06b2cf7 100644
 static gboolean
 handle_socket_data (GSocket *socket,
                     GIOCondition condition,
-@@ -688,16 +703,7 @@ handle_socket_data (GSocket *socket,
+@@ -787,16 +802,7 @@ handle_socket_data (GSocket *socket,
     }
   else if (condition & G_IO_IN)
     {
@ -1190,23 +1188,21 @@ index 596896d..06b2cf7 100644
   else
     {
 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index 4e7b33d..cf275af 100644
+index 3c08f812..f230887e 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
-@@ -79,6 +79,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
+@@ -79,4 +79,6 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
 void grd_session_vnc_ungrab_socket (GrdSessionVnc        *session_vnc,
                                     GrdVncSocketGrabFunc  grab_func);
 
 +void grd_session_vnc_dispatch (GrdSessionVnc *session_vnc);
 +
 GrdVncServer * grd_session_vnc_get_vnc_server (GrdSessionVnc *session_vnc);
- 
- #endif /* GRD_SESSION_VNC_H */
 -- 
-2.31.1
+2.51.0


-From 9cdf72aa277782906a4b979773a7025a61994785 Mon Sep 17 00:00:00 2001
+From 2d43f0586ae24b202beda4d283b25fec3e722af7 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
@ -1218,7 +1214,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 ec4758e..ac6c35f 100644
+index ec4758e0..ac6c35f6 100644
 --- a/src/grd-vnc-tls.c
 +++ b/src/grd-vnc-tls.c
@@ -67,6 +67,7 @@ grd_vnc_tls_context_new (void)
@ -1280,10 +1276,10 @@ index ec4758e..ac6c35f 100644
     {
       g_warning ("TLS handshake failed: %s", error->message);
 -- 
-2.31.1
+2.51.0


-From 2c24c7ffa583c94d3cfd7eb105eb264a6430b128 Mon Sep 17 00:00:00 2001
+From 62e04d794eaf2c0acfc16af0b0968fead4bb4df1 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
@ -1300,7 +1296,7 @@ long as there is data to read in those buffers.
 2 files changed, 86 insertions(+), 6 deletions(-)

 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index cf275af..efc0038 100644
+index f230887e..9dd33442 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
@@ -79,6 +79,8 @@ void grd_session_vnc_grab_socket (GrdSessionVnc        *session_vnc,
@ -1313,7 +1309,7 @@ index cf275af..efc0038 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 ac6c35f..312b6b9 100644
+index ac6c35f6..312b6b92 100644
 --- a/src/grd-vnc-tls.c
 +++ b/src/grd-vnc-tls.c
@@ -41,6 +41,12 @@ typedef enum _GrdTlsHandshakeState
@ -1450,10 +1446,10 @@ index ac6c35f..312b6b9 100644
     }
 
 -- 
-2.31.1
+2.51.0


-From 28dcea05f8f42c3fe5d43d0dff0cdb1c9fc7f213 Mon Sep 17 00:00:00 2001
+From 799e2b287bd055c46709d0063436b819894200e6 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
@ -1472,10 +1468,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 06b2cf7..7a4c6b3 100644
+index b48b9017..87cc7d86 100644
 --- a/src/grd-session-vnc.c
 +++ b/src/grd-session-vnc.c
-@@ -94,11 +94,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
+@@ -99,11 +99,6 @@ grd_session_vnc_pause (GrdSessionVnc *session_vnc);
 static gboolean
 close_session_idle (gpointer user_data);
 
@ -1487,7 +1483,7 @@ index 06b2cf7..7a4c6b3 100644
 static void
 swap_uint8 (uint8_t *a,
             uint8_t *b)
-@@ -321,7 +316,6 @@ handle_new_client (rfbClientPtr rfb_client)
+@@ -355,7 +350,6 @@ handle_new_client (rfbClientPtr rfb_client)
       grd_session_vnc_pause (session_vnc);
       return RFB_CLIENT_ON_HOLD;
     case GRD_VNC_AUTH_METHOD_PASSWORD:
@ -1495,9 +1491,9 @@ index 06b2cf7..7a4c6b3 100644
       /*
        * authPasswdData needs to be non NULL in libvncserver to trigger
        * password authentication.
-@@ -620,6 +614,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
-   rfb_screen->frameBuffer = g_malloc0 (screen_width * screen_height * 4);
-   memset (rfb_screen->frameBuffer, 0x1f, screen_width * screen_height * 4);
+@@ -719,6 +713,8 @@ init_vnc_session (GrdSessionVnc *session_vnc)
+       session_vnc->monitor_config->connectors = connectors;
+     }
 
 +  rfb_screen->passwordCheck = check_rfb_password;
 +
@ -1505,10 +1501,10 @@ index 06b2cf7..7a4c6b3 100644
   rfbProcessEvents (rfb_screen, 0);
 }
 -- 
-2.31.1
+2.51.0


-From 2327474d5fa0f6527b2f5f39d54f96f8ff9627db Mon Sep 17 00:00:00 2001
+From b74286bdb8876d27d279c725357d73a23a3316b4 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
 Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride
@ -1526,7 +1522,7 @@ dropped.
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
-index efc0038..f3a6314 100644
+index 9dd33442..98c73451 100644
 --- a/src/grd-session-vnc.h
 +++ b/src/grd-session-vnc.h
@@ -67,7 +67,8 @@ int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
@ -1540,5 +1536,6 @@ index efc0038..f3a6314 100644
 gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
 
 -- 
-2.31.1
+2.51.0
+

--- a/plans/main.fmf
+++ b/plans/main.fmf
@ -0,0 +1,6 @@
+summary: Run all tests
+execute:
+  how: tmt
+discover:
+  how: fmf
+
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gnome-remote-desktop-41.2.tar.xz) = 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb
+SHA512 (gnome-remote-desktop-49.2.tar.xz) = b678ee125e1b5f6d58e85f57a332cf02ee6b5dee654469e66f496f9467e6512a701a3e37a9580562e0b064320380d2df4ca6b15e20bd35b1605b4bd9de73827c
--- a/tests/got-audit/got-audit.gdb
+++ b/tests/got-audit/got-audit.gdb
@ -0,0 +1,2 @@
+gef config gef.disable_color True
+got-audit --all
--- a/tests/got-audit/main.fmf
+++ b/tests/got-audit/main.fmf
@ -0,0 +1,10 @@
+summary: Audit the GOT for signs of tampering
+description: |
+  Pointers in the server process GOT will be checked to ensure that
+  each function pointer's value is within a shared object file
+  that exports a symbol of that name, and that no shared object
+  files export conflicting symbols.
+contact: Gordon Messmer <gordon.messmer@gmail.com>
+require+:
+  - gdb-gef           # needed to test got-audit
+  - gnome-remote-desktop
--- a/tests/got-audit/runtest.sh
+++ b/tests/got-audit/runtest.sh
@ -0,0 +1,41 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/gnome-remote-desktop/Sanity/got-audit
+#   Description: Check pointers in the server process GOT for signs of tampering
+#   Author: Gordon Messmer <gordon.messmer@gmail.com>
+#
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "systemctl start --user gnome-remote-desktop-headless"
+        rlRun "TestDir=\$(pwd)"
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+        rlRun "auditfile=\$(mktemp --tmpdir=${TmpDir})"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Run GEF got-audit"
+        rlRun "SERVICE_PID=\$( systemctl show --property=MainPID --user gnome-remote-desktop-headless.service | cut -f2 -d= )"
+        rlRun "echo SERVICE_PID is '$SERVICE_PID'"
+        [ -n "$SERVICE_PID" ] || rlFail "No service pid was found"
+        rlRun "gdb-gef --pid '$SERVICE_PID' --command='$TestDir'/got-audit.gdb --batch > '$auditfile'"
+        # Basic test: ensure that at least one symbol is found in libc.so,
+        #  to verify that the report looks plausible.
+        rlAssertGrep " : /.*/libc.so" "$auditfile"
+        # Ensure the got-audit did not report any errors
+        rlAssertNotGrep " :: ERROR" "$auditfile"
+        rlRun "cp '$auditfile' '$TMT_TEST_DATA'/got-audit.txt"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "systemctl stop --user gnome-remote-desktop-headless"
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -0,0 +1,2 @@
+test: ./runtest.sh
+framework: beakerlib
Author	SHA1	Message	Date
Adrian Vovk	8f70eb6c59	Update to 49.2	2025-12-09 19:54:54 -05:00
Tom spot Callaway	d7212cb16d	rebuild for new fuse3	2025-11-04 15:35:31 -05:00
Petr Schindler	b9ed222ec5	Update to 49.1	2025-10-16 11:25:51 +02:00
Jonas Ådahl	8c9e6a004c	Bump version to 49.0	2025-09-16 23:01:02 +02:00
Gordon Messmer	c0cb73086c	Examine the server process GOT for signs of tampering.	2025-09-16 19:29:56 +00:00
Michael Catanzaro	ca47971a7f	Fix changelog and use %autorelease	2025-08-29 14:30:16 -05:00
Fedora Release Engineering	5107a61be0	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-23 22:45:29 +00:00
Milan Crha	77423cbd45	Update to 49.alpha	2025-07-09 13:19:06 +02:00
nmontero	47eb5467ea	Update to 48.1	2025-04-14 12:12:11 +02:00
nmontero	8157f81b95	Update to 48.0	2025-03-20 12:50:05 +01:00
Fabio Valentini	6c066e6c88	Update to 48.rc	2025-03-06 13:16:50 +01:00
Fedora Release Engineering	5891147c92	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-16 22:49:02 +00:00
nmontero	426b534e7c	Update to 47.2	2024-11-25 09:52:44 +01:00
nmontero	29ca9c1e60	Update to 47.1	2024-10-22 10:59:11 +02:00
nmontero	c58ca2eae6	Update to 47.0	2024-09-17 13:30:45 +02:00
David King	986158f278	Update to 47.rc	2024-09-01 22:17:19 +01:00
nmontero	8cae364fd6	Update to 47~beta	2024-08-14 13:15:07 +02:00
Fedora Release Engineering	618722855e	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-18 03:05:49 +00:00
David King	298db87c80	Update to 47.alpha	2024-07-10 10:52:29 +01:00
Nieves Montero	75a8e6e71d	Update to 46.2	2024-05-27 13:59:54 +00:00
Nieves Montero	1673763321	Update to 46.2	2024-05-23 12:41:41 +02:00
David King	f825717369	Update to 46.1	2024-04-18 11:34:56 +01:00
Adam Williamson	61e4777d04	Correct systemd macros There is no `%systemd_system_post`, `%systemd_system_preun` etc. They're just `%systemd_post` and `%systemd_preun`. These currently wind up as literal strings in the scripts and cause an `fg: no job control` error when you install or remove the package.	2024-03-28 10:29:19 -07:00
Jonas Ådahl	884620465e	Bump version to 46.0	2024-03-26 22:19:21 +01:00
Fedora Release Engineering	308ffcae22	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 15:34:43 +00:00
Fedora Release Engineering	8707c8c7f4	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-19 23:01:11 +00:00
Yaakov Selkowitz	30c0ed8784	Disable VNC in RHEL 10+	2023-11-24 13:10:07 -05:00
Kalev Lember	b86d5f3b4d	Update to 45.1	2023-10-22 23:29:53 +02:00
Kalev Lember	534ec8aafe	Update to 45.0	2023-10-21 13:16:27 +02:00
Kalev Lember	f4ba505883	Add minimum required libei version The required libei version is still in updates-testing for F39 so it's best to be careful. While at this, also move both libei and pipewire minimum version numbers to a global, so that they can be set in a single place and work for both requires and buildrequires.	2023-09-06 11:37:54 +02:00
Kalev Lember	c09c038ad6	Update to 45.rc	2023-09-05 15:53:11 +02:00
Kalev Lember	78affe76dc	Update to 45.beta	2023-08-11 13:34:46 +02:00
Fedora Release Engineering	07cee12810	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-19 23:42:30 +00:00
Jonas Ådahl	57715ab608	Add missing function definition in TLS patch	2023-07-05 16:16:17 +02:00
Jonas Ådahl	bb1bf212e8	Update to 45.alpha	2023-07-05 15:00:48 +02:00
Kalev Lember	ee4a2cc6c7	Update to 44.2	2023-05-31 14:25:44 +02:00
David King	144ec16b0a	Update to 44.1	2023-04-24 14:29:17 +01:00
David King	8d37b5f88d	Update to 44.0	2023-03-19 16:35:57 +00:00
Jonas Ådahl	8f7f0c3700	Enable RDP in ELN	2023-03-16 11:26:32 +01:00
David King	cbd043b91c	Update to 44.rc	2023-03-05 08:47:28 +00:00
David King	5317f83d70	Update to 44.alpha	2023-02-06 18:20:57 +00:00
Fedora Release Engineering	1b80752d7e	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-19 05:33:34 +00:00
David King	a1879e7872	Update to 43.2	2022-12-08 21:04:22 +00:00
Stephen Gallagher	cd6eb69cf7	Fix build on RHEL 9+/ELN Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2022-11-08 09:45:42 -05:00
David King	94af2b84e6	Update to 43.1	2022-10-27 20:45:00 +01:00
Jonas Ådahl	01e33994cf	Bump version to 43.0	2022-09-20 16:00:59 +02:00
Jonas Ådahl	ecba35aba1	Drop dependency on tpm2-abrmd It should be handled by the kernel already.	2022-08-18 15:46:19 +02:00
Kalev Lember	2691874439	Avoid manual requires on tss2* and rely on automatic soname deps instead This fixes the package to be installable again as the requires were wrong. https://pagure.io/releng/failed-composes/issue/3849#comment-810808	2022-08-16 13:44:46 +02:00
Simone Caronni	74e6a3b6c1	Add missing build requirement	2022-08-15 15:58:18 +02:00
Simone Caronni	8f239811a8	Rebuild for updated FreeRDP	2022-08-15 15:37:43 +02:00
Jonas Ådahl	2607ef7a5f	Fix typo tss2-tcildr -> tss2-tctildr	2022-08-11 16:04:25 +02:00
Jonas Ådahl	9e971ca11c	Bump version to gnome-remote-desktop-43.beta	2022-08-11 15:54:34 +02:00
Tomas Popela	97c9b9cc3b	Don't enable RDP support in ELN/RHEL 9+ FreeRDP is built without server support in RHEL and ELN so we should disable the RDP there. Partial backport of a RHEL 9 change from `9a9f01d1`	2022-07-29 11:35:30 +02:00
Jonas Ådahl	7b1e71ddd3	README -> README.md	2022-07-28 21:07:19 +02:00
Jonas Ådahl	16a4814700	Update to 43.alpha	2022-07-28 18:16:08 +02:00
Fedora Release Engineering	14083291c0	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-21 06:56:51 +00:00
David King	f6166f9a71	Update to 43.3 (#2091415 )	2022-07-07 13:44:03 +01:00
David King	8e6dec6081	Update to 42.2	2022-05-29 18:11:31 +01:00
David King	d1e6ebec7f	Update to 42.1.1 (#2061546 )	2022-05-11 11:26:25 +01:00
David King	686710ebe0	Update sources	2022-04-27 12:08:44 +01:00
David King	16e8998039	Fix isa macro in Requires	2022-04-27 12:05:03 +01:00
David King	23d93b3193	Update to 42.1 (#2061546 )	2022-04-26 09:47:03 +01:00
Jonas Ådahl	889e486023	Update to 42.0	2022-03-21 07:14:31 +01:00
Jonas Ådahl	241c229ec7	Fix path to man page	2022-03-14 12:25:43 +01:00
Jonas Ådahl	5970c72c6e	Fix path to grdctl	2022-03-14 11:33:39 +01:00
Jonas Ådahl	2de08150f9	Add missing patch	2022-03-14 11:10:15 +01:00
Jonas Ådahl	8339a17fb0	Add man page	2022-03-14 11:04:13 +01:00
Jonas Ådahl	8f05c2d806	Update to 42.rc	2022-03-14 09:55:28 +01:00
Jonas Ådahl	11ebb379c9	Add build requirements needed for tests	2022-02-16 11:59:05 +01:00
Jonas Ådahl	4352930081	Add missing added dependencies	2022-02-16 11:38:54 +01:00
Jonas Ådahl	58efc5586e	Update to 42.beta	2022-02-16 11:28:36 +01:00