Attachment 189637 Details for Bug 225088 – devel/libspice-server: Implements the server side of the SPICE protocol

devel/libspice-server: Implements the server side of the SPICE protocol

libspice-server.shar (text/plain), 8.70 KB, created by Oleg Ginzburg on 2018-01-11 23:08:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Ginzburg

Created: 2018-01-11 23:08:43 UTC

Size: 8.70 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	libspice-server
>#	libspice-server/pkg-plist
>#	libspice-server/distinfo
>#	libspice-server/Makefile
>#	libspice-server/pkg-descr
>#	libspice-server/files
>#	libspice-server/files/patch-tools-reds_stat.c
>#	libspice-server/files/patch-server-red-worker.c
>#	libspice-server/files/patch-server-net-utils.c
>#	libspice-server/files/patch-server-tests-test-display-base.c
>#	libspice-server/files/patch-server-sound.c
>#
>echo c - libspice-server
>mkdir -p libspice-server > /dev/null 2>&1
>echo x - libspice-server/pkg-plist
>sed 's/^X//' >libspice-server/pkg-plist << '2901a0c3800fdd810451a03d45f2e0a3'
>Xlibdata/pkgconfig/spice-server.pc
>Xinclude/spice-server/spice-experimental.h
>Xinclude/spice-server/spice-server.h
>Xinclude/spice-server/spice-replay.h
>Xinclude/spice-server/spice-char.h
>Xinclude/spice-server/spice-core.h
>Xinclude/spice-server/spice-migration.h
>Xinclude/spice-server/spice-input.h
>Xinclude/spice-server/spice.h
>Xinclude/spice-server/spice-audio.h
>Xinclude/spice-server/spice-version.h
>Xinclude/spice-server/spice-qxl.h
>Xlib/libspice-server.so.1.12.4
>Xlib/libspice-server.so
>Xlib/libspice-server.so.1
>2901a0c3800fdd810451a03d45f2e0a3
>echo x - libspice-server/distinfo
>sed 's/^X//' >libspice-server/distinfo << '8d7d0057553c165f41be179b766e43a7'
>XTIMESTAMP = 1514376420
>XSHA256 (spice-0.14.0.tar.bz2) = 3adb9495b51650e5eab53c74dd6a74919af4b339ff21721d9ab2a45b2e3bb848
>XSIZE (spice-0.14.0.tar.bz2) = 1330195
>8d7d0057553c165f41be179b766e43a7
>echo x - libspice-server/Makefile
>sed 's/^X//' >libspice-server/Makefile << 'b959dc8ee5ad3b0dbd787aae872699da'
>X# Created by: olevole@olevole.ru
>X# $FreeBSD: $
>X
>XPORTNAME=	libspice-server
>XPORTVERSION=	0.14.0
>XCATEGORIES=	devel
>XMASTER_SITES=	https://www.spice-space.org/download/releases/
>XDISTNAME=	spice-${PORTVERSION}
>X
>XMAINTAINER=	olevole@olevole.ru
>XCOMMENT=	Implements the server side of the SPICE protocol
>X
>XLICENSE=	GPLv2
>X
>XBUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
>XRUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
>X
>XUSES=		autoreconf gmake jpeg libtool localbase:ldflag pkgconfig \
>X		ssl tar:bzip2
>X
>XUSE_GNOME=	glib20
>XUSE_XORG=	pixman
>X
>XCPE_VENDOR=	redhat
>X
>XCONFIGURE_ARGS+=--disable-celt051
>X
>XSPICE_SSL_CFLAGS=	-I${OPENSSLINC}
>XSPICE_SSL_LIBS=	-L${OPENSSLLIB} -lcrypto -lssl
>XCONFIGURE_ENV+=	SSL_CFLAGS="${SPICE_SSL_CFLAGS}" SSL_LIBS="${SPICE_SSL_LIBS}" \
>X		OPENSSL_CFLAGS="${SPICE_SSL_CFLAGS}" OPENSSL_LIBS="${SPICE_SSL_LIBS}"
>X
>XGNU_CONFIGURE=	yes
>X
>XINSTALL_TARGET=	install-strip
>X
>X.include <bsd.port.mk>
>b959dc8ee5ad3b0dbd787aae872699da
>echo x - libspice-server/pkg-descr
>sed 's/^X//' >libspice-server/pkg-descr << '1f9ccebade38f195cc6cdef13dc492a8'
>XThe Simple Protocol for Independent Computing Environments (SPICE) is
>Xa remote display system built for virtual environments which allows
>Xyou to view a computing 'desktop' environment not only on the machine
>Xwhere it is running, but from anywhere on the Internet and from a wide
>Xvariety of machine architectures.
>X
>XThis package contains the run-time libraries for any application that
>Xwishes to be a SPICE server
>X
>XWWW: http://spice-space.org/
>1f9ccebade38f195cc6cdef13dc492a8
>echo c - libspice-server/files
>mkdir -p libspice-server/files > /dev/null 2>&1
>echo x - libspice-server/files/patch-tools-reds_stat.c
>sed 's/^X//' >libspice-server/files/patch-tools-reds_stat.c << '3d6da62cc4b1391faa54c81caeaa80d9'
>X--- tools/reds_stat.c.orig	2017-09-21 11:05:07 UTC
>X+++ tools/reds_stat.c
>X@@ -34,11 +34,47 @@
>X #define VALUE_TABS 7
>X #define INVALID_STAT_REF (~(uint32_t)0)
>X 
>X+#define MREMAP_MAYMOVE     1
>X+
>X verify(sizeof(SpiceStat) == 20 || sizeof(SpiceStat) == 24);
>X 
>X static SpiceStatNode *reds_nodes = NULL;
>X static uint64_t *values = NULL;
>X 
>X+void *mremap(int fd,void *oldaddr,size_t oldlen,size_t newlen,int prot,int flags);
>X+
>X+void *mremap(int fd,void *oldaddr,size_t oldlen,
>X+                                size_t newlen,int prot,int flags){
>X+        void *ret;
>X+
>X+        // From mmap(2) on freebsd 6.3: A successful FIXED mmap deletes any
>X+        // previous mapping in the allocated address range. This means:
>X+        // remapping over a current map will blow it away (unless FIXED isn't
>X+        // provided, in which case it can't overlap an old mapping. See bug
>X+        // 733 for extensive discussion of this issue for Linux and FreeBSD).
>X+        if((ret = mmap((char *)oldaddr + oldlen,newlen - oldlen,prot,flags,fd,oldlen)) == MAP_FAILED){
>X+                // We couldn't get the memory whatsoever (or we were a fresh
>X+                // allocation that succeeded). Return the immediate result...
>X+                return ret;
>X+        } // ret != MAP_FAILED. Did we squash?
>X+        if(ret != (char *)oldaddr + oldlen){
>X+                // We got the memory, but not where we wanted it. Copy over the
>X+                // old map, and then free it up...
>X+                //nag("Wanted %p, got %p\n",(char *)oldaddr + oldlen,ret);
>X+                munmap(ret,newlen - oldlen);
>X+//                Munmap(ret,newlen - oldlen);
>X+                if((ret = mmap(NULL,newlen,prot,flags,fd,0)) == MAP_FAILED){
>X+                        return ret;
>X+                }
>X+                memcpy(ret,oldaddr,oldlen);
>X+                munmap(oldaddr,oldlen); // Free the old mapping
>X+//                Munmap(oldaddr,oldlen); // Free the old mapping
>X+                return ret;
>X+        } // We successfully squashed. Return a pointer to the first buf.
>X+        return oldaddr;
>X+}
>X+
>X+
>X static void print_stat_tree(int32_t node_index, int depth)
>X {
>X     SpiceStatNode *node = &reds_nodes[node_index];
>X@@ -144,7 +180,8 @@ int main(int argc, char **argv)
>X             num_of_nodes = reds_stat->num_of_nodes;
>X             shm_old_size = shm_size;
>X             shm_size = header_size + num_of_nodes * sizeof(SpiceStatNode);
>X-            reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE);
>X+// todo
>X+//            reds_stat = mremap(reds_stat, shm_old_size, shm_size, MREMAP_MAYMOVE);
>X             if (reds_stat == (SpiceStat *)MAP_FAILED) {
>X                 perror("mremap");
>X                 goto error;
>3d6da62cc4b1391faa54c81caeaa80d9
>echo x - libspice-server/files/patch-server-red-worker.c
>sed 's/^X//' >libspice-server/files/patch-server-red-worker.c << '66f7699661f28cd9eb56851720ce8476'
>X--- server/red-worker.c.orig	2017-09-21 11:05:07 UTC
>X+++ server/red-worker.c
>X@@ -28,6 +28,7 @@
>X #include <unistd.h>
>X #include <poll.h>
>X #include <pthread.h>
>X+#include <pthread_np.h>
>X #include <openssl/ssl.h>
>X #include <inttypes.h>
>X #include <glib.h>
>X@@ -52,6 +53,16 @@
>X 
>X #define INF_EVENT_WAIT ~0
>X 
>X+int pthread_setname_np(pthread_t, const char *);
>X+
>X+
>X+int pthread_setname_np(pthread_t id, const char *name)
>X+{
>X+	/* this BSD function returns no error */
>X+	pthread_set_name_np(id, name);
>X+	return 0;
>X+}
>X+
>X struct RedWorker {
>X     pthread_t thread;
>X     QXLInstance *qxl;
>66f7699661f28cd9eb56851720ce8476
>echo x - libspice-server/files/patch-server-net-utils.c
>sed 's/^X//' >libspice-server/files/patch-server-net-utils.c << '7603d6a2be973f72aa11af99d467b96f'
>X--- server/net-utils.c.orig	2017-09-12 12:00:11 UTC
>X+++ server/net-utils.c
>X@@ -23,6 +23,9 @@
>X #include <fcntl.h>
>X #include <stdbool.h>
>X #include <string.h>
>X+#include <sys/types.h>
>X+#include <arpa/inet.h>
>X+#include <netinet/in.h>
>X #include <netinet/ip.h>
>X #include <netinet/tcp.h>
>X #include <sys/socket.h>
>X@@ -31,6 +34,10 @@
>X 
>X #include "net-utils.h"
>X 
>X+#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
>X+#define SOL_TCP IPPROTO_TCP
>X+#endif
>X+
>X /**
>X  * red_socket_set_keepalive:
>X  * @fd: a socket file descriptor
>7603d6a2be973f72aa11af99d467b96f
>echo x - libspice-server/files/patch-server-tests-test-display-base.c
>sed 's/^X//' >libspice-server/files/patch-server-tests-test-display-base.c << 'bf5d0e6512e08023a4ff2ddf3084d73c'
>X--- server/tests/test-display-base.c.orig	2017-09-21 15:45:56 UTC
>X+++ server/tests/test-display-base.c
>X@@ -22,7 +22,6 @@
>X #include <stdio.h>
>X #include <unistd.h>
>X #include <signal.h>
>X-#include <wait.h>
>X #include <sys/select.h>
>X #include <sys/types.h>
>X #include <getopt.h>
>bf5d0e6512e08023a4ff2ddf3084d73c
>echo x - libspice-server/files/patch-server-sound.c
>sed 's/^X//' >libspice-server/files/patch-server-sound.c << '698deb4c79685ba8d7c759c87d5d7b38'
>X--- server/sound.c.orig	2017-09-21 11:05:07 UTC
>X+++ server/sound.c
>X@@ -22,6 +22,8 @@
>X #include <fcntl.h>
>X #include <errno.h>
>X #include <limits.h>
>X+#include <sys/types.h>
>X+#include <netinet/in.h>
>X #include <sys/socket.h>
>X #include <netinet/ip.h>
>X #include <netinet/tcp.h>
>698deb4c79685ba8d7c759c87d5d7b38
>exit
>

Flags:

olevole: maintainer-approval+

Actions: View

Attachments on bug 225088: 189637 | 189647 | 189651