CVS commit: pkgsrc/sysutils/spice-server

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sun Jan 10 14:53:47 UTC 2021

Modified Files:
        pkgsrc/sysutils/spice-server: distinfo
        pkgsrc/sysutils/spice-server/patches: patch-tools_reds__stat.c

Log Message:
spice-server: Another SunOS fix.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/spice-server/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.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/distinfo
diff -u pkgsrc/sysutils/spice-server/distinfo:1.3 pkgsrc/sysutils/spice-server/distinfo:1.4
--- pkgsrc/sysutils/spice-server/distinfo:1.3   Tue Jan  5 15:14:38 2021
+++ pkgsrc/sysutils/spice-server/distinfo       Sun Jan 10 14:53:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/01/05 15:14:38 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2021/01/10 14:53:47 jperkin Exp $
 
 SHA1 (spice-0.14.3.tar.bz2) = f5968dd5df5f64805d093b4c85b4165959e6c65b
 RMD160 (spice-0.14.3.tar.bz2) = fe99d8d0db4b275b1d19dc9a7231144133c5bfa0
@@ -8,4 +8,4 @@ SHA1 (patch-server_red-stream.c) = b5aae
 SHA1 (patch-server_red-worker.c) = 93699283fa99299bd672f930e8b90f5951d3726a
 SHA1 (patch-server_tests_test-stream.c) = 4b06d20626f06581c40164aa6d670e9b6530cdee
 SHA1 (patch-server_tests_test-websocket.c) = 19bca4dd6f441336588a1ae224f9d3d9b9984917
-SHA1 (patch-tools_reds__stat.c) = 3464bbb8b25aa871adfbc501412f84ad925f6509
+SHA1 (patch-tools_reds__stat.c) = dcf0a7152577dcd12719971a13e5fd00f0cf15d6

Index: pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c
diff -u pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.1 pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.2
--- pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c:1.1   Thu Feb  6 21:57:42 2020
+++ pkgsrc/sysutils/spice-server/patches/patch-tools_reds__stat.c       Sun Jan 10 14:53:47 2021
@@ -1,15 +1,18 @@
-$NetBSD: patch-tools_reds__stat.c,v 1.1 2020/02/06 21:57:42 kamil Exp $
+$NetBSD: patch-tools_reds__stat.c,v 1.2 2021/01/10 14:53:47 jperkin Exp $
 
-Add NetBSD support.
+Add SunOS and NetBSD support.
 
---- tools/reds_stat.c.orig     2019-04-30 08:51:05.000000000 +0000
+--- tools/reds_stat.c.orig     2020-02-27 11:26:12.000000000 +0000
 +++ tools/reds_stat.c
-@@ -144,7 +144,11 @@ int main(int argc, char **argv)
+@@ -144,7 +144,14 @@ int main(int argc, char **argv)
              num_of_nodes = reds_stat->num_of_nodes;
              shm_old_size = shm_size;
              shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode);
 +#if defined(__NetBSD__)
 +            reds_stat = mremap(reds_stat, shm_old_size, NULL, shm_size, 0);
++#elif defined(__sun)
++            munmap(reds_stat, shm_old_size);
++            reds_stat = (SpiceStat *)mmap(NULL, shm_size, PROT_READ, MAP_SHARED, fd, 0);
 +#else
              reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE);
 +#endif