Fri Jan 10 22:57:53 UTC 202020200110225753

a/btrfs-progs-5.4.1-x86_64-1.txz:  Upgraded.
l/libvncserver-0.9.12-x86_64-2.txz:  Rebuilt.
  Merged upstream bugfix pull requests. Thanks to alienBOB.
n/NetworkManager-1.22.4-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-68.4.1-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/68.4.1/releasenotes/
    https://www.mozilla.org/security/known-vulnerabilities/thunderbird.html
    https://www.mozilla.org/en-US/security/advisories/mfsa2020-04/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17026
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17015
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17016
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17017
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17021
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17022
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17024
  (* Security fix *)

3 files changed, 62 insertions, 2 deletions

diff --git a/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch b/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch
new file mode 100644
index 000000000..b8edd35e2
--- /dev/null
+++ b/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch
@@ -0,0 +1,25 @@
+From 15c4f144a3783d9f1f2c976acf9f4d85988fd466 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 5 Jan 2020 19:56:57 +0100
+Subject: [PATCH] rfbShutdownServer: Call rfbClientConnectionGone if no
+ backgroundLoop
+
+Otherwise the servers that don't use rfbRunEventLoop don't get
+notified of client disconnections
+---
+ libvncserver/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libvncserver/main.c b/libvncserver/main.c
+index b51f0ab6..738a501d 100644
+--- a/libvncserver/main.c
++++ b/libvncserver/main.c
+@@ -1152,6 +1152,8 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
+       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
+       /* And wait for it to finish. */
+       pthread_join(currentCl->client_thread, NULL);
++    } else {
++      rfbClientConnectionGone(currentCl);
+     }
+ #else
+       rfbClientConnectionGone(currentCl);
diff --git a/source/l/libvncserver/libvncserver.SlackBuild b/source/l/libvncserver/libvncserver.SlackBuild
index 015b6a5fc..abf5f6640 100755
--- a/source/l/libvncserver/libvncserver.SlackBuild
+++ b/source/l/libvncserver/libvncserver.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2007, 2014  Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libvncserver
 VERSION=${VERSION:-$(echo LibVNCServer-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -91,6 +91,8 @@ find . \
  -exec chmod 644 {} \+
 
 zcat $CWD/libvncserver.CMAKE_INSTALL_LIBDIR.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch.gz | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 mkdir cmake-build
diff --git a/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch b/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch
new file mode 100644
index 000000000..7ef6ec221
--- /dev/null
+++ b/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch
@@ -0,0 +1,33 @@
+From d0a76539835d11c0f4723499f8be4bc9c7724eb9 Mon Sep 17 00:00:00 2001
+From: Rajesh Sahoo <rajesh.sahoo@lge.com>
+Date: Tue, 11 Jun 2019 15:13:04 +0530
+Subject: [PATCH] avoid pthread_join if backgroundLoop is FALSE
+
+client_thread is created depending upon backgroundLoop, but joining
+without checking for same condition. so we are trying to join a garbage
+thread_id.
+---
+ libvncserver/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libvncserver/main.c b/libvncserver/main.c
+index d3cd9b1e..772fb18f 100644
+--- a/libvncserver/main.c
++++ b/libvncserver/main.c
+@@ -1112,6 +1112,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
+       }
+ 
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
++    if(currentCl->screen->backgroundLoop) {
+       /*
+ 	Notify the thread. This simply writes a NULL byte to the notify pipe in order to get past the select()
+ 	in clientInput(), the loop in there will then break because the rfbCloseClient() above has set
+@@ -1120,6 +1121,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
+       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
+       /* And wait for it to finish. */
+       pthread_join(currentCl->client_thread, NULL);
++    }
+ #else
+       rfbClientConnectionGone(currentCl);
+ #endif
+