CVS commit: pkgsrc/sysutils/spice-server

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Nov  1 19:36:37 UTC 2020

Modified Files:
        pkgsrc/sysutils/spice-server: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/sysutils/spice-server/patches: patch-server_red-stream.c
            patch-server_red-worker.c
Added Files:
        pkgsrc/sysutils/spice-server/patches:
            patch-server_tests_test-websocket.c

Log Message:
spice-server: update to 0.14.3

Major Changes in 0.14.3:
========================

Main changes are WebSocket and support for Windows.

* Add support for WebSocket, this will allow to use spice-html5 without proxy
* Support Windows, now Qemu Windows can be build enabling Spice
* Fix some alignment problem
* Converted some documentation to Asciidoc format to make easier to update,
  updated some
* Minor compatibility fix for PPC64EL and ARMHF
* Minor fixes for big endian machines like MIPS
* Avoid some crashes with some buggy guest drivers, simply ignore the invalid
  request
* Fix for old OpenSSL versions
* Minor fix for Windows clients and brushes, fixed an issue with Photoshop
  under Windows 7
* Add ability to query video-codecs
* Small use-after-free fix
* Fix for debugging recording/replaying using QUIC images
* Fix a regression where spice reported no monitors to the client
* Fix DoS in spicevmc if WebDAV used
* Updated and improved test migration script
* Some minor fixes to smartcard support
* Avoid possible disconnection using proxies using a in-flow keepalive
  mechanism


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/spice-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/spice-server/PLIST \
    pkgsrc/sysutils/spice-server/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/spice-server/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/spice-server/Makefile
diff -u pkgsrc/sysutils/spice-server/Makefile:1.3 pkgsrc/sysutils/spice-server/Makefile:1.4
--- pkgsrc/sysutils/spice-server/Makefile:1.3   Sun Mar  8 16:48:13 2020
+++ pkgsrc/sysutils/spice-server/Makefile       Sun Nov  1 19:36:37 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2020/03/08 16:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2020/11/01 19:36:37 maya Exp $
 
-DISTNAME=      spice-0.14.2
+DISTNAME=      spice-0.14.3
 PKGNAME=       ${DISTNAME:S/spice/spice-server/}
-PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.spice-space.org/download/releases/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/sysutils/spice-server/PLIST
diff -u pkgsrc/sysutils/spice-server/PLIST:1.1 pkgsrc/sysutils/spice-server/PLIST:1.2
--- pkgsrc/sysutils/spice-server/PLIST:1.1      Thu Feb  6 21:57:42 2020
+++ pkgsrc/sysutils/spice-server/PLIST  Sun Nov  1 19:36:37 2020
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2020/02/06 21:57:42 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/01 19:36:37 maya Exp $
 include/spice-server/spice-audio.h
 include/spice-server/spice-char.h
 include/spice-server/spice-core.h
-include/spice-server/spice-experimental.h
 include/spice-server/spice-input.h
 include/spice-server/spice-migration.h
 include/spice-server/spice-qxl.h
Index: pkgsrc/sysutils/spice-server/distinfo
diff -u pkgsrc/sysutils/spice-server/distinfo:1.1 pkgsrc/sysutils/spice-server/distinfo:1.2
--- pkgsrc/sysutils/spice-server/distinfo:1.1   Thu Feb  6 21:57:42 2020
+++ pkgsrc/sysutils/spice-server/distinfo       Sun Nov  1 19:36:37 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2020/02/06 21:57:42 kamil Exp $
+$NetBSD: distinfo,v 1.2 2020/11/01 19:36:37 maya Exp $
 
-SHA1 (spice-0.14.2.tar.bz2) = 83a93e47546d496cf2dcc3f4641db3a285044b9e
-RMD160 (spice-0.14.2.tar.bz2) = 30aaafe30af5a9781d630b9f076973dbc4f59eac
-SHA512 (spice-0.14.2.tar.bz2) = 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
-Size (spice-0.14.2.tar.bz2) = 1406009 bytes
-SHA1 (patch-server_red-stream.c) = 453ee9b8e5007c552f2ef3b46f508c7cdba6d14c
-SHA1 (patch-server_red-worker.c) = f684dafdc9eab808e36759fba19340586c90cb62
+SHA1 (spice-0.14.3.tar.bz2) = f5968dd5df5f64805d093b4c85b4165959e6c65b
+RMD160 (spice-0.14.3.tar.bz2) = fe99d8d0db4b275b1d19dc9a7231144133c5bfa0
+SHA512 (spice-0.14.3.tar.bz2) = 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4
+Size (spice-0.14.3.tar.bz2) = 1504304 bytes
+SHA1 (patch-server_red-stream.c) = ba48da44bf4a3a94cf85df3bc486e182bea6afaf
+SHA1 (patch-server_red-worker.c) = 8478e2ce8959061bd15ea226debc76744378c8cf
+SHA1 (patch-server_tests_test-websocket.c) = 8ae8bc975bf81e7683e9f15d1e158899e52f7cc4
 SHA1 (patch-tools_reds__stat.c) = 3464bbb8b25aa871adfbc501412f84ad925f6509

Index: pkgsrc/sysutils/spice-server/buildlink3.mk
diff -u pkgsrc/sysutils/spice-server/buildlink3.mk:1.2 pkgsrc/sysutils/spice-server/buildlink3.mk:1.3
--- pkgsrc/sysutils/spice-server/buildlink3.mk:1.2      Sun Mar  8 16:48:13 2020
+++ pkgsrc/sysutils/spice-server/buildlink3.mk  Sun Nov  1 19:36:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/03/08 16:48:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/11/01 19:36:37 maya Exp $
 
 BUILDLINK_TREE+=       spice-server
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        spice-server
 SPICE_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.spice-server+=   spice-server>=0.14.2
-BUILDLINK_ABI_DEPENDS.spice-server?=   spice-server>=0.14.2nb1
+BUILDLINK_ABI_DEPENDS.spice-server+=   spice-server>=0.14.2nb1
 BUILDLINK_PKGSRCDIR.spice-server?=     ../../sysutils/spice-server
 
 .include "../../audio/libopus/buildlink3.mk"

Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c
diff -u pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c:1.1 pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c:1.2
--- pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c:1.1  Thu Feb  6 21:57:42 2020
+++ pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c      Sun Nov  1 19:36:37 2020
@@ -1,28 +1,15 @@
-$NetBSD: patch-server_red-stream.c,v 1.1 2020/02/06 21:57:42 kamil Exp $
+$NetBSD: patch-server_red-stream.c,v 1.2 2020/11/01 19:36:37 maya Exp $
 
-Add NetBSD support.
+No TCP_CORK on netbsd. Disable (like win32)
 
---- server/red-stream.c.orig   2019-04-30 08:51:11.000000000 +0000
+--- server/red-stream.c.orig   2020-02-27 11:26:12.000000000 +0000
 +++ server/red-stream.c
-@@ -27,6 +27,9 @@
- #include <sys/socket.h>
- #include <netinet/tcp.h>
- #endif
-+#ifdef __NetBSD__
-+#include <netinet/in.h>
-+#endif
+@@ -105,7 +105,7 @@ struct RedStreamPrivate {
+     SpiceCoreInterfaceInternal *core;
+ };
  
- #include <glib.h>
- 
-@@ -109,7 +112,11 @@ struct RedStreamPrivate {
- static int socket_set_cork(int socket, int enabled)
- {
-     SPICE_VERIFY(sizeof(enabled) == sizeof(int));
-+#if defined(__NetBSD__)
-+    return 1; /* Not supported */
-+#else
-     return setsockopt(socket, IPPROTO_TCP, TCP_CORK, &enabled, sizeof(enabled));
-+#endif
- }
- 
- static ssize_t stream_write_cb(RedStream *s, const void *buf, size_t size)
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__NetBSD__)
+ /**
+  * Set TCP_CORK on socket
+  */
Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c
diff -u pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.1 pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.2
--- pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c:1.1  Thu Feb  6 21:57:42 2020
+++ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c      Sun Nov  1 19:36:37 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-server_red-worker.c,v 1.1 2020/02/06 21:57:42 kamil Exp $
+$NetBSD: patch-server_red-worker.c,v 1.2 2020/11/01 19:36:37 maya Exp $
 
 Add NetBSD support.
 
 --- server/red-worker.c.orig   2019-04-30 08:51:11.000000000 +0000
 +++ server/red-worker.c
-@@ -1161,7 +1161,11 @@ bool red_worker_run(RedWorker *worker)
-         spice_error("create thread failed %d", r);
-     }
+@@ -1159,7 +1159,11 @@ bool red_worker_run(RedWorker *worker)
+ #ifndef _WIN32
      pthread_sigmask(SIG_SETMASK, &curr_sig_mask, NULL);
+ #endif
 +#if defined(__NetBSD__)
 +    pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker");
 +#else

Added files:

Index: pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c
diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c:1.1
--- /dev/null   Sun Nov  1 19:36:37 2020
+++ pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c    Sun Nov  1 19:36:37 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-server_tests_test-websocket.c,v 1.1 2020/11/01 19:36:37 maya Exp $
+
+Provide a fallback definition for SOL_TCP (for netbsd)
+
+--- server/tests/test-websocket.c.orig 2020-02-27 11:26:12.000000000 +0000
++++ server/tests/test-websocket.c
+@@ -200,6 +200,9 @@ handle_client(int new_sock)
+     }
+ 
+     int enable = 1;
++#ifndef SOL_TCP
++#define SOL_TCP IPPROTO_TCP
++#endif
+     setsockopt(new_sock, SOL_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable));
+ 
+     // wait header