Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory
checked in at 2022-02-11 23:07:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Fri Feb 11 23:07:15 2022 rev:86 rq:953175 version:1.10.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2021-11-18
10:33:08.211868500 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new.1956/tigervnc.changes
2022-02-11 23:08:26.418777778 +0100
@@ -1,0 +2,7 @@
+Thu Feb 10 12:17:07 UTC 2022 - Joan Torres <joan.tor...@suse.com>
+
+- u_Fix-non-functional-MaxDisconnectionTime.patch
+ * Backport patch that fixes issue with MaxDisconnetionTime
+ (bsc#1195661).
+
+-------------------------------------------------------------------
New:
----
u_Fix-non-functional-MaxDisconnectionTime.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.1lxQnl/_old 2022-02-11 23:08:27.178779976 +0100
+++ /var/tmp/diff_new_pack.1lxQnl/_new 2022-02-11 23:08:27.182779988 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tigervnc
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -77,7 +77,8 @@
Patch23: n_utilize-system-crypto-policies.patch
Patch24: tigervnc-FIPS-use-RFC7919.patch
Patch25: u_tigervnc-211.patch
-Patch26: xserver211.patch
+Patch26: u_Fix-non-functional-MaxDisconnectionTime.patch
+Patch27: xserver211.patch
Provides: tightvnc = 1.3.9
Obsoletes: tightvnc < 1.3.9
Provides: vnc
@@ -274,11 +275,12 @@
%endif
%patch24 -p1
%patch25 -p0
+%patch26 -p1
cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver
#patch -p1 < ../xserver120.patch
-%patch26 -p1
+%patch27 -p1
popd
%build
++++++ u_Fix-non-functional-MaxDisconnectionTime.patch ++++++
>From 38726ce083db1a9227325bf87989513499bfa698 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <oss...@cendio.se>
Date: Thu, 18 Jun 2020 09:20:17 +0200
Subject: [PATCH] Fix non-functional MaxDisconnectionTime
References: bsc#1195661
Upstream: Merged
Since 8e09912 this wasn't triggered properly as we checked if all
clients were gone before we actually removed the last client from our
list.
---
common/rfb/VNCServerST.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
index 8329bb23..35f65a2e 100644
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@ -172,11 +172,6 @@ void VNCServerST::removeSocket(network::Socket* sock) {
clipboardClient = NULL;
clipboardRequestors.remove(*ci);
- // Adjust the exit timers
- connectTimer.stop();
- if (rfb::Server::maxDisconnectionTime && clients.empty())
- disconnectTimer.start(secsToMillis(rfb::Server::maxDisconnectionTime));
-
// - Delete the per-Socket resources
delete *ci;
@@ -193,6 +188,11 @@ void VNCServerST::removeSocket(network::Socket* sock) {
if (comparer)
comparer->logStats();
+ // Adjust the exit timers
+ connectTimer.stop();
+ if (rfb::Server::maxDisconnectionTime && clients.empty())
+ disconnectTimer.start(secsToMillis(rfb::Server::maxDisconnectionTime));
+
return;
}
}
--
2.34.1
