Hello community, here is the log from the commit of package vino for openSUSE:Factory checked in at 2019-01-26 22:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vino (Old) and /work/SRC/openSUSE:Factory/.vino.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vino" Sat Jan 26 22:17:31 2019 rev:100 rq:668256 version:3.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vino/vino.changes 2018-08-02 14:50:15.095488354 +0200 +++ /work/SRC/openSUSE:Factory/.vino.new.28833/vino.changes 2019-01-26 22:17:33.467091914 +0100 @@ -1,0 +2,6 @@ +Wed Jan 23 21:16:55 UTC 2019 - mgo...@suse.com + +- Add vino-error-on-wayland.patch: print an error if wayland is + detected, rather than segfaulting (boo#1122549 bgo#761120). + +------------------------------------------------------------------- New: ---- vino-error-on-wayland.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.UIfqCK/_old 2019-01-26 22:17:33.907091556 +0100 +++ /var/tmp/diff_new_pack.UIfqCK/_new 2019-01-26 22:17:33.911091553 +0100 @@ -1,7 +1,7 @@ # # spec file for package vino # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,6 +24,8 @@ Group: Productivity/Networking/Other URL: http://www.gnome.org Source0: https://download.gnome.org/sources/vino/3.22/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM vino-error-on-wayland.patch boo#1122549 mgo...@suse.com -- have vino-server print an error if wayland is detected, rather than segfaulting. +Patch0: vino-error-on-wayland.patch BuildRequires: fdupes BuildRequires: intltool >= 0.50.0 ++++++ vino-error-on-wayland.patch ++++++ >From d5b743b11a6f102353af719fa34abd5e6c679e77 Mon Sep 17 00:00:00 2001 From: Ondrej Holy <oh...@redhat.com> Date: Tue, 20 Feb 2018 12:26:18 +0100 Subject: [PATCH] Return error if X11 is not detected Vino-server crashes on Wayland in XQueryExtension. Since vino-server is not expected to work on displays other than X11, let's exit immediately if GDK_IS_X11_DISPLAY fail. https://bugzilla.gnome.org/show_bug.cgi?id=761120 --- server/vino-main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/vino-main.c b/server/vino-main.c index dd95de7..7be3fff 100644 --- a/server/vino-main.c +++ b/server/vino-main.c @@ -28,6 +28,7 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> #include <locale.h> +#include <gdk/gdkx.h> #include "vino-input.h" #include "vino-mdns.h" @@ -273,6 +274,12 @@ main (int argc, char **argv) g_option_context_free (context); } + if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) + { + g_printerr ("X11 is not detected\n"); + return 1; + } + /* GSettings */ vino.settings = g_settings_new ("org.gnome.Vino"); >From c5e3011b7364729fa2cd4f11761bf1f001a931a4 Mon Sep 17 00:00:00 2001 From: Ondrej Holy <oh...@redhat.com> Date: Tue, 22 May 2018 20:45:45 +0200 Subject: [PATCH] Do not restart service after unclean exit code Currently, the vino-server.service has Restart=on-failure, which means that it is restarted in abnormal cases, but also in case of non-zero exit code. It is restarted 5 times e.g. in case when X11 is not detected, which doesn't make sense. Non-zero exit code is used only for states which won't change with restart (invalid commandline, wayland and some sanity checks). Change the value to Restart=on-abnormal in order to prevent the useless restarts and to not spam journal. https://bugzilla.gnome.org/show_bug.cgi?id=761120 --- server/vino-server.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/vino-server.service.in b/server/vino-server.service.in index a48b813..49e9c1f 100644 --- a/server/vino-server.service.in +++ b/server/vino-server.service.in @@ -5,4 +5,4 @@ Description=Vino VNC server Type=dbus BusName=org.gnome.Vino ExecStart=@libexecdir@/vino-server -Restart=on-failure +Restart=on-abnormal -- 2.18.0
