Merge pull request #7575 from IdrisKalp/master

libvncserver 0.9.12

server/misc/libvncserver/actions.py

@@ -6,22 +6,29 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import get
 
 WorkDir = "libvncserver-LibVNCServer-%s" % get.srcVERSION()
 
 def setup():
-    autotools.autoreconf("-vif")
+    #autotools.autoreconf("-vif")
-    autotools.configure("--disable-static \
+    #autotools.configure("--disable-static \
-                         --disable-dependency-tracking \
+                         #--disable-dependency-tracking \
-                         --with-24bpp \
+                         #--with-24bpp \
-                         --with-zlib \
+                         #--with-zlib \
-                         --with-jpeg")
+                         #--with-jpeg")
 
-    pisitools.dosed("libtool", " -shared ", " -shared -Wl,--as-needed")
+    #pisitools.dosed("libtool", " -shared ", " -shared -Wl,--as-needed")
+    
+    cmaketools.configure("-DWITH_FFMPEG=OFF \
+                          -DWITH_SASL=OFF \
+                          -DWITH_SDL=OFF \
+                          -DWITH_SYSTEMD=OFF \
+                          ")
 
 def build():
-    autotools.make()
+    cmaketools.make()
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())

server/misc/libvncserver/files/krfb-crash-1.patch

@@ -0,0 +1,32 @@
+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

server/misc/libvncserver/files/krfb-crash-2.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);

server/misc/libvncserver/pspec.xml

@@ -12,15 +12,18 @@
         <IsA>app:console</IsA>
         <Summary>Library for creating VNC (Virtual Network Computing) servers</Summary>
         <Description>libvncserver provides a C library to create VNC servers.</Description>
-        <Archive sha1sum="d844a2c9e69465d104a8468dce515a49e4db9585" type="targz">https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.11.tar.gz</Archive>
+        <Archive sha1sum="f2111a7d7e96d7101e7ff3834abd5b0c71c1ed5f" type="targz">https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.12.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gnutls-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>libgcrypt-devel</Dependency>
             <Dependency>libpng-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
+            <Dependency>lzo-devel</Dependency>
         </BuildDependencies>
         <Patches>
+			<Patch level="1">krfb-crash-1.patch</Patch>
+			<Patch level="1">krfb-crash-2.patch</Patch>
         </Patches>
     </Source>
 
@@ -33,6 +36,7 @@
             <Dependency>gnutls</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>openssl</Dependency>
+            <Dependency>lzo</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/*-config</Path>
@@ -58,6 +62,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2020-01-15</Date>
+            <Version>0.9.12</Version>
+            <Comment>Version Bump</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-07</Date>
             <Version>0.9.11</Version>