CVS commit: pkgsrc/sysutils/spice-server

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov  9 12:15:50 UTC 2023

Modified Files:
        pkgsrc/sysutils/spice-server: Makefile distinfo
        pkgsrc/sysutils/spice-server/patches:
            patch-server_tests_test-websocket.c
Added Files:
        pkgsrc/sysutils/spice-server/patches: patch-server_red-stream.cpp
            patch-server_red-worker.cpp
Removed Files:
        pkgsrc/sysutils/spice-server/patches: patch-server_red-stream.c
            patch-server_red-worker.c patch-tools_reds__stat.c

Log Message:
spice-server: updated to 0.15.2

Major Changes in 0.15.2:
========================
Really minor fix release, mainly to fix a distribution issue

* Add missing file to distribution
* Fix sound recording fix in case of buffer wrapping

Major Changes in 0.15.1:
========================

* Fix some compatibility issues with FreeBSD
* Fix some minor issue with build
* Improve packaging with Meson
* Lot of C++ improves (clang-tidy)
* Fix some compatibility with no-Glibc libraries (like Musl)
* Fix minor leaks shutting down library
* Add Doxygen file to distribution
* Fix a longstanding issue related to surface updates where wrong surfaces were possibly used
* Fix compatibility with OpenSSL 3
* Updates and fixes for CI
* Use more random connection IDs to fix possible issues with proxies

Major Changes in 0.15:
======================

This is the first release in the new 0.15.x stable series. This release should
be ready for production use.

* Minor updates to CI
* Some compatibility with OpenSSL
* Change the behavior of handle_dev_start ignoring multiple start requests
* Ignore multiple calls to handle_dev_stop
* Pick up newer spice-common to fix a buffer overflow issue


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/spice-server/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/spice-server/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.c \
    pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.cpp \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.cpp
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.c
cvs rdiff -u -r1.2 -r1.3 \
    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.10 pkgsrc/sysutils/spice-server/Makefile:1.11
--- pkgsrc/sysutils/spice-server/Makefile:1.10  Tue Oct 24 22:11:14 2023
+++ pkgsrc/sysutils/spice-server/Makefile       Thu Nov  9 12:15:50 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2023/10/24 22:11:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2023/11/09 12:15:50 adam Exp $
 
-DISTNAME=      spice-0.14.3
+DISTNAME=      spice-0.15.2
 PKGNAME=       ${DISTNAME:S/spice/spice-server/}
-PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.spice-space.org/download/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -12,19 +11,22 @@ HOMEPAGE=   https://www.spice-space.org/
 COMMENT=       Simple Protocol for Independent Computing Environments
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
+USE_CXX_FEATURES=      c++11
+
+USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
+GNU_CONFIGURE= yes
+TEST_TARGET=   check
 
 PKGCONFIG_OVERRIDE+=   spice-server.pc.in
+PYTHON_FOR_BUILD_ONLY= tool
 
 LDFLAGS.SunOS+=        -lnsl -lsocket
 
-PYTHON_FOR_BUILD_ONLY= tool
-
 .include "../../audio/libopus/buildlink3.mk"
-.include "../../lang/python/tool.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/spice-protocol/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"

Index: pkgsrc/sysutils/spice-server/distinfo
diff -u pkgsrc/sysutils/spice-server/distinfo:1.7 pkgsrc/sysutils/spice-server/distinfo:1.8
--- pkgsrc/sysutils/spice-server/distinfo:1.7   Tue Oct 26 11:20:14 2021
+++ pkgsrc/sysutils/spice-server/distinfo       Thu Nov  9 12:15:50 2023
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:20:14 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/11/09 12:15:50 adam Exp $
 
-BLAKE2s (spice-0.14.3.tar.bz2) = c1d3435df2541d95fe4e57d903c2908706ed6fdd22f9978dd959fbf8e3e94f39
-SHA512 (spice-0.14.3.tar.bz2) = 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4
-Size (spice-0.14.3.tar.bz2) = 1504304 bytes
-SHA1 (patch-server_red-stream.c) = b5aaee6e4bb7f0cfb89606ad026e4fa2c5f05da9
-SHA1 (patch-server_red-worker.c) = 8cee4cafa80812e133ec7883d3544a5245f3ca58
+BLAKE2s (spice-0.15.2.tar.bz2) = e9573c34de862ed41ab65988cb4df7475b8fd390294a1a7856c7eeedaba8e4c4
+SHA512 (spice-0.15.2.tar.bz2) = c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26
+Size (spice-0.15.2.tar.bz2) = 1663326 bytes
+SHA1 (patch-server_red-stream.cpp) = 03353ccc4d8e1b74d3bdf111799eef4ca52bf950
+SHA1 (patch-server_red-worker.cpp) = c26cdd5b0ba6e382cdf859e95fff73e0b80a470e
 SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee
-SHA1 (patch-server_tests_test-websocket.c) = 19bca4dd6f441336588a1ae224f9d3d9b9984917
-SHA1 (patch-tools_reds__stat.c) = 84f465dda5da0659f2fc80d1113616ea8b8e44ac
+SHA1 (patch-server_tests_test-websocket.c) = cce42a587460cf5e89b785d98c79d66724ec83a7

Index: pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c
diff -u pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c:1.2 pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c:1.3
--- pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c:1.2        Tue Jan  5 15:14:39 2021
+++ pkgsrc/sysutils/spice-server/patches/patch-server_tests_test-websocket.c    Thu Nov  9 12:15:50 2023
@@ -1,27 +1,17 @@
-$NetBSD: patch-server_tests_test-websocket.c,v 1.2 2021/01/05 15:14:39 jperkin Exp $
+$NetBSD: patch-server_tests_test-websocket.c,v 1.3 2023/11/09 12:15:50 adam Exp $
 
-Provide fallback definitions for MSG_NOSIGNAL (SunOS) and SOL_TCP (NetBSD)
+Provide fallback definitions for MSG_NOSIGNAL (SunOS).
 
---- server/tests/test-websocket.c.orig 2020-02-27 11:26:12.000000000 +0000
+--- server/tests/test-websocket.c.orig 2023-05-12 08:37:06.000000000 +0000
 +++ server/tests/test-websocket.c
 @@ -42,6 +42,10 @@
  #include "net-utils.h"
  #include "websocket.h"
  
 +#if !defined(MSG_NOSIGNAL)
-+#define MSG_NOSIGNAL  0
++#define MSG_NOSIGNAL 0
 +#endif
 +
  /*
  on data arrived on socket:
    try to read data, read again till error, handle error, on EAGAIN polling again
-@@ -200,6 +204,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

Added files:

Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.cpp
diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.cpp:1.1
--- /dev/null   Thu Nov  9 12:15:50 2023
+++ pkgsrc/sysutils/spice-server/patches/patch-server_red-stream.cpp    Thu Nov  9 12:15:50 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-server_red-stream.cpp,v 1.1 2023/11/09 12:15:50 adam Exp $
+
+TCP_CORK is missing on NetBSD, so disable it (like on win32).
+
+--- server/red-stream.cpp.orig 2023-11-09 12:05:42.873043129 +0000
++++ server/red-stream.cpp
+@@ -106,7 +106,7 @@ struct RedStreamPrivate {
+     SpiceCoreInterfaceInternal *core;
+ };
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__NetBSD__)
+ /**
+  * Set TCP_CORK on socket
+  */
Index: pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.cpp
diff -u /dev/null pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.cpp:1.1
--- /dev/null   Thu Nov  9 12:15:50 2023
+++ pkgsrc/sysutils/spice-server/patches/patch-server_red-worker.cpp    Thu Nov  9 12:15:50 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-server_red-worker.cpp,v 1.1 2023/11/09 12:15:50 adam Exp $
+
+Add NetBSD support.
+
+--- server/red-worker.cpp.orig 2023-11-09 11:45:22.496015555 +0000
++++ server/red-worker.cpp
+@@ -1049,7 +1049,9 @@ bool red_worker_run(RedWorker *worker)
+ #ifndef _WIN32
+     pthread_sigmask(SIG_SETMASK, &curr_sig_mask, nullptr);
+ #endif
+-#if !defined(__APPLE__)
++#if defined(__NetBSD__)
++    pthread_setname_np(worker->thread, "%s", (void *)"SPICE Worker");
++#elif !defined(__APPLE__)
+     pthread_setname_np(worker->thread, "SPICE Worker");
+ #endif
+