From 0c979092b354166c52a936299afd13865436bdeb Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 05 2019 20:19:16 +0000
Subject: import gnome-remote-desktop-0.1.6-5.el8


---

diff --git a/SOURCES/0001-vnc-Allow-overriding-password-with-env-var.patch b/SOURCES/0001-vnc-Allow-overriding-password-with-env-var.patch
new file mode 100644
index 0000000..ba3cc31
--- /dev/null
+++ b/SOURCES/0001-vnc-Allow-overriding-password-with-env-var.patch
@@ -0,0 +1,42 @@
+From 1467e4c26f47ad3747903392a026698a169870aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 10 Apr 2019 15:59:54 +0200
+Subject: [PATCH] vnc: Allow overriding password with env var
+
+For testing purposes. Also overrides VNC auth method setting.
+---
+ src/grd-settings.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/grd-settings.c b/src/grd-settings.c
+index c886b7e..d6c4a25 100644
+--- a/src/grd-settings.c
++++ b/src/grd-settings.c
+@@ -71,6 +71,12 @@ char *
+ grd_settings_get_vnc_password (GrdSettings  *settings,
+                                GError      **error)
+ {
++  const char *test_password_override;
++
++  test_password_override = g_getenv ("GNOME_REMOTE_DESKTOP_TEST_VNC_PASSWORD");
++  if (test_password_override)
++    return g_strdup (test_password_override);
++
+   return secret_password_lookup_sync (GRD_VNC_PASSWORD_SCHEMA,
+                                       NULL, error,
+                                       NULL);
+@@ -85,7 +91,10 @@ grd_settings_get_vnc_view_only (GrdSettings *settings)
+ GrdVncAuthMethod
+ grd_settings_get_vnc_auth_method (GrdSettings *settings)
+ {
+-  return settings->vnc.auth_method;
++  if (g_getenv ("GNOME_REMOTE_DESKTOP_TEST_VNC_PASSWORD"))
++    return GRD_VNC_AUTH_METHOD_PASSWORD;
++  else
++    return settings->vnc.auth_method;
+ }
+ 
+ GrdVncEncryption
+-- 
+2.21.0
+
diff --git a/SPECS/gnome-remote-desktop.spec b/SPECS/gnome-remote-desktop.spec
index fa3e727..67ea66e 100644
--- a/SPECS/gnome-remote-desktop.spec
+++ b/SPECS/gnome-remote-desktop.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-remote-desktop
 Version:        0.1.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME Remote Desktop screen share service
 
 License:        GPLv2+
@@ -22,6 +22,9 @@ Patch3:         0002-vnc-pipewire-stream-Close-session-when-disconnected.patch
 # Backport various fixes (rhbz#1659118)
 Patch4:         rhel8.0.0-backports.patch
 
+# Backport password override, for testing (rhbz#1713330)
+Patch5:         0001-vnc-Allow-overriding-password-with-env-var.patch
+
 BuildRequires:  git
 BuildRequires:  gcc
 BuildRequires:  meson >= 0.36.0
@@ -80,6 +83,13 @@ GNOME desktop environment.
 
 
 %changelog
+* 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)