Attachment #224177 for bug #255142

Lines 1-8 Link Here

(-)b/devel/libspice-server/Makefile (-2 / +1 lines)
1	# Created by: olevole@olevole.ru	1	# Created by: olevole@olevole.ru
2		2
3	PORTNAME= libspice-server	3	PORTNAME= libspice-server
4	DISTVERSION= 0.14.0	4	DISTVERSION= 0.14.3
5	PORTREVISION= 4
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= https://www.spice-space.org/download/releases/	6	MASTER_SITES= https://www.spice-space.org/download/releases/
8	DISTNAME= spice-${PORTVERSION}	7	DISTNAME= spice-${PORTVERSION}

Lines 1-3 Link Here

(-)b/devel/libspice-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1514376420	1	TIMESTAMP = 1618031169
2	SHA256 (spice-0.14.0.tar.bz2) = 3adb9495b51650e5eab53c74dd6a74919af4b339ff21721d9ab2a45b2e3bb848	2	SHA256 (spice-0.14.3.tar.bz2) = 551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114
3	SIZE (spice-0.14.0.tar.bz2) = 1330195	3	SIZE (spice-0.14.3.tar.bz2) = 1504304




--- configure.ac.orig	2018-01-13 04:00:56 UTC
+++ configure.ac
@@ -62,7 +62,7 @@ AC_SUBST(SPICE_LT_VERSION)
 
 # Check for the CPU we are using
 case $host_cpu in
-  x86_64)
+  x86_64|amd64)
         ;;
   *)
         SPICE_WARNING([spice-server on non-x86_64 architectures has not been extensively tested])
@@ -186,10 +186,18 @@ if test "x$enable_celt051" = "xyes"; then
                       AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"]))
 fi
 
+OPENSSL_PKGCONF_USED=1
+if test -n "${OPENSSL_LIBS}" || test -n "${OPENSSL_CFLAGS}"; then
+    OPENSSL_PKGCONF_USED=0
+fi
 PKG_CHECK_MODULES(SSL, openssl)
 AC_SUBST(SSL_CFLAGS)
 AC_SUBST(SSL_LIBS)
-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
+if test "{OPENSSL_PKGCONF_USED}" = 1; then
+    AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
+else
+    AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $SSL_LIBS"])
+fi
 
 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
     AC_MSG_CHECKING([for jpeglib.h])




--- server/net-utils.c.orig	2017-09-12 12:00:11 UTC
+++ server/net-utils.c
@@ -23,6 +23,9 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <string.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
@@ -31,6 +34,10 @@
 
 #include "net-utils.h"
 
+#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
+#define SOL_TCP IPPROTO_TCP
+#endif
+
 /**
  * red_socket_set_keepalive:
  * @fd: a socket file descriptor




--- server/red-worker.c.orig	2017-09-21 11:05:07 UTC
+++ server/red-worker.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <poll.h>
 #include <pthread.h>
+#include <pthread_np.h>
 #include <openssl/ssl.h>
 #include <inttypes.h>
 #include <glib.h>
@@ -52,6 +53,16 @@
 
 #define INF_EVENT_WAIT ~0
 
+int pthread_setname_np(pthread_t, const char *);
+
+
+int pthread_setname_np(pthread_t id, const char *name)
+{
+	/* this BSD function returns no error */
+	pthread_set_name_np(id, name);
+	return 0;
+}
+
 struct RedWorker {
     pthread_t thread;
     QXLInstance *qxl;

Removed Link Here

(-)a/devel/libspice-server/files/patch-server-sound.c (-11 lines)
1	--- server/sound.c.orig 2017-09-21 11:05:07 UTC
2	+++ server/sound.c
3	@@ -22,6 +22,8 @@
4	#include <fcntl.h>
5	#include <errno.h>
6	#include <limits.h>
7	+#include <sys/types.h>
8	+#include <netinet/in.h>
9	#include <sys/socket.h>
10	#include <netinet/ip.h>
11	#include <netinet/tcp.h>

Removed Link Here

(-)a/devel/libspice-server/files/patch-server-tests-test-display-base.c (-10 lines)
1	--- server/tests/test-display-base.c.orig 2017-09-21 15:45:56 UTC
2	+++ server/tests/test-display-base.c
3	@@ -22,7 +22,6 @@
4	#include <stdio.h>
5	#include <unistd.h>
6	#include <signal.h>
7	-#include <wait.h>
8	#include <sys/select.h>
9	#include <sys/types.h>
10	#include <getopt.h>




--- server/net-utils.c.orig	2021-04-17 01:15:39 UTC
+++ server/net-utils.c
@@ -47,7 +47,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int
     int keepalive = !!enable;
 
     if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)) == -1) {
-        if (errno != ENOTSUP) {
+        if (errno != ENOTSUP && errno != EINVAL) {
             g_warning("setsockopt for keepalive failed, %s", strerror(errno));
             return false;
         }
@@ -59,7 +59,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int
 
 #ifdef HAVE_TCP_KEEPIDLE
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &timeout, sizeof(timeout)) == -1) {
-        if (errno != ENOTSUP) {
+        if (errno != ENOTSUP && errno != EINVAL) {
             g_warning("setsockopt for keepalive timeout failed, %s", strerror(errno));
             return false;
         }
@@ -82,7 +82,7 @@ bool red_socket_set_no_delay(int fd, bool no_delay)
 
     if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
                    &optval, sizeof(optval)) != 0) {
-        if (errno != ENOTSUP && errno != ENOPROTOOPT) {
+        if (errno != ENOTSUP && errno != ENOPROTOOPT && errno != EINVAL) {
             spice_warning("setsockopt failed, %s", strerror(errno));
             return false;
         }

Added Link Here

(-)b/devel/libspice-server/files/patch-server_red-stream.c (+10 lines)
1	--- server/red-stream.c.orig 2021-04-10 05:13:57 UTC
2	+++ server/red-stream.c
3	@@ -24,6 +24,7 @@
4	#include <netdb.h>
5	#include <sys/socket.h>
6	#include <netinet/tcp.h>
7	+#include <netinet/in.h>
8	#else
9	#include <ws2tcpip.h>
10	#endif

Added Link Here

(-)b/devel/libspice-server/files/patch-server_tests_test-websocket.c (+11 lines)
1	--- server/tests/test-websocket.c.orig 2021-04-10 05:22:05 UTC
2	+++ server/tests/test-websocket.c
3	@@ -200,7 +200,7 @@ handle_client(int new_sock)
4	}
5
6	int enable = 1;
7	- setsockopt(new_sock, SOL_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable));
8	+ setsockopt(new_sock, IPPROTO_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable));
9
10	// wait header
11	wait_for(new_sock, POLLIN);

Lines 1-5 Link Here

(-)b/devel/libspice-server/pkg-plist (-3 / +1 lines)
1	libdata/pkgconfig/spice-server.pc	1	libdata/pkgconfig/spice-server.pc
2	include/spice-server/spice-experimental.h
3	include/spice-server/spice-server.h	2	include/spice-server/spice-server.h
4	include/spice-server/spice-replay.h	3	include/spice-server/spice-replay.h
5	include/spice-server/spice-char.h	4	include/spice-server/spice-char.h
Lines 10-15 include/spice-server/spice.h Link Here
10	include/spice-server/spice-audio.h	9	include/spice-server/spice-audio.h
11	include/spice-server/spice-version.h	10	include/spice-server/spice-version.h
12	include/spice-server/spice-qxl.h	11	include/spice-server/spice-qxl.h
13	lib/libspice-server.so.1.12.4	12	lib/libspice-server.so.1.14.0
14	lib/libspice-server.so	13	lib/libspice-server.so
15	lib/libspice-server.so.1	14	lib/libspice-server.so.1
16	-

Return to bug 255142

Removed Link Here

(-)a/devel/libspice-server/files/patch-configure.ac (-31 lines)
1	--- configure.ac.orig 2018-01-13 04:00:56 UTC
2	+++ configure.ac
3	@@ -62,7 +62,7 @@ AC_SUBST(SPICE_LT_VERSION)
4
5	# Check for the CPU we are using
6	case $host_cpu in
7	- x86_64)
8	+ x86_64\|amd64)
9	;;
10	*)
11	SPICE_WARNING([spice-server on non-x86_64 architectures has not been extensively tested])
12	@@ -186,10 +186,18 @@ if test "x$enable_celt051" = "xyes"; then
13	AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"]))
14	fi
15
16	+OPENSSL_PKGCONF_USED=1
17	+if test -n "${OPENSSL_LIBS}" \|\| test -n "${OPENSSL_CFLAGS}"; then
18	+ OPENSSL_PKGCONF_USED=0
19	+fi
20	PKG_CHECK_MODULES(SSL, openssl)
21	AC_SUBST(SSL_CFLAGS)
22	AC_SUBST(SSL_LIBS)
23	-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
24	+if test "{OPENSSL_PKGCONF_USED}" = 1; then
25	+ AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
26	+else
27	+ AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $SSL_LIBS"])
28	+fi
29
30	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
31	AC_MSG_CHECKING([for jpeglib.h])

Removed Link Here

(-)a/devel/libspice-server/files/patch-server-net-utils.c (-23 lines)
1	--- server/net-utils.c.orig 2017-09-12 12:00:11 UTC
2	+++ server/net-utils.c
3	@@ -23,6 +23,9 @@
4	#include <fcntl.h>
5	#include <stdbool.h>
6	#include <string.h>
7	+#include <sys/types.h>
8	+#include <arpa/inet.h>
9	+#include <netinet/in.h>
10	#include <netinet/ip.h>
11	#include <netinet/tcp.h>
12	#include <sys/socket.h>
13	@@ -31,6 +34,10 @@
14
15	#include "net-utils.h"
16
17	+#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
18	+#define SOL_TCP IPPROTO_TCP
19	+#endif
20	+
21	/**
22	* red_socket_set_keepalive:
23	* @fd: a socket file descriptor

Removed Link Here

(-)a/devel/libspice-server/files/patch-server-red-worker.c (-27 lines)
1	--- server/red-worker.c.orig 2017-09-21 11:05:07 UTC
2	+++ server/red-worker.c
3	@@ -28,6 +28,7 @@
4	#include <unistd.h>
5	#include <poll.h>
6	#include <pthread.h>
7	+#include <pthread_np.h>
8	#include <openssl/ssl.h>
9	#include <inttypes.h>
10	#include <glib.h>
11	@@ -52,6 +53,16 @@
12
13	#define INF_EVENT_WAIT ~0
14
15	+int pthread_setname_np(pthread_t, const char *);
16	+
17	+
18	+int pthread_setname_np(pthread_t id, const char *name)
19	+{
20	+ /* this BSD function returns no error */
21	+ pthread_set_name_np(id, name);
22	+ return 0;
23	+}
24	+
25	struct RedWorker {
26	pthread_t thread;
27	QXLInstance *qxl;

Added Link Here

(-)b/devel/libspice-server/files/patch-server_net-utils.c (+29 lines)
1	--- server/net-utils.c.orig 2021-04-17 01:15:39 UTC
2	+++ server/net-utils.c
3	@@ -47,7 +47,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int
4	int keepalive = !!enable;
5
6	if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive, sizeof(keepalive)) == -1) {
7	- if (errno != ENOTSUP) {
8	+ if (errno != ENOTSUP && errno != EINVAL) {
9	g_warning("setsockopt for keepalive failed, %s", strerror(errno));
10	return false;
11	}
12	@@ -59,7 +59,7 @@ bool red_socket_set_keepalive(int fd, bool enable, int
13
14	#ifdef HAVE_TCP_KEEPIDLE
15	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &timeout, sizeof(timeout)) == -1) {
16	- if (errno != ENOTSUP) {
17	+ if (errno != ENOTSUP && errno != EINVAL) {
18	g_warning("setsockopt for keepalive timeout failed, %s", strerror(errno));
19	return false;
20	}
21	@@ -82,7 +82,7 @@ bool red_socket_set_no_delay(int fd, bool no_delay)
22
23	if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
24	&optval, sizeof(optval)) != 0) {
25	- if (errno != ENOTSUP && errno != ENOPROTOOPT) {
26	+ if (errno != ENOTSUP && errno != ENOPROTOOPT && errno != EINVAL) {
27	spice_warning("setsockopt failed, %s", strerror(errno));
28	return false;
29	}