Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

spice: bump to version 0.14.3

Browse source 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2020-03-18 10:13:01 +08:00
parent 1f00e4a327
commit d977f63136
7 changed files with 53 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/spice/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=spice
PKG_VERSION:=0.14.2
PKG_RELEASE:=4
PKG_VERSION:=0.14.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.spice-space.org/download/releases/spice-server
PKG_HASH:=b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7
PKG_HASH:=551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114
PKG_LICENSE:=LGPL-2.1-only
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1

26
libs/spice/patches/0001-build-skip-tests.patch Normal file
View file

@ -0,0 +1,26 @@
From 9380ff5a8849ea5a772958b5dcfc5462182f1597 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Fri, 20 Mar 2020 17:06:31 +0800
Subject: [PATCH] build: skip tests
Tests build can fail for arc700 for the following causes
- Missing -stack-protector-all argument when building test progs
- Missing linker flag -lgmodule-2.0 -lffi
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
server/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/Makefile.am b/server/Makefile.am
index 2d148c14..5b927a1b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,5 +1,5 @@
NULL =
-SUBDIRS = . tests
+SUBDIRS = .
check-valgrind:
$(MAKE) -C tests check-valgrind

48
libs/spice/patches/0001-reds-Fix-SSL_CTX_set_ecdh_auto-call-for-some-old-Ope.patch
View file

@ -1,48 +0,0 @@
From 214736dce643ce3ee257da017373e88cc19d2d3b Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <fziglio@redhat.com>
Date: Thu, 20 Jun 2019 13:26:11 +0100
Subject: [PATCH] reds: Fix SSL_CTX_set_ecdh_auto call for some old OpenSSL
SSL_CTX_set_ecdh_auto is not defined in some old versions of OpenSSL
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jeremy White <jwhite@codeweavers.com>
---
configure.ac | 9 +++++++++
server/reds.c | 2 ++
2 files changed, 11 insertions(+)
diff --git a/configure.ac b/configure.ac
index e12d7e85..49c009d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,15 @@ AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)
AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $SSL_CFLAGS"
+AC_CHECK_DECLS([SSL_CTX_set_ecdh_auto], [], [], [
+AC_INCLUDES_DEFAULT
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+])
+CFLAGS="$save_CFLAGS"
+
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
AC_MSG_CHECKING([for jpeglib.h])
AC_TRY_CPP(
diff --git a/server/reds.c b/server/reds.c
index 792e9838..b4061fbc 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2937,7 +2937,9 @@ static int reds_init_ssl(RedsState *reds)
}
SSL_CTX_set_options(reds->ctx, ssl_options);
+#if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO || defined(SSL_CTX_set_ecdh_auto)
SSL_CTX_set_ecdh_auto(reds->ctx, 1);
+#endif
/* Load our keys and certificates*/
return_code = SSL_CTX_use_certificate_chain_file(reds->ctx, reds->config->ssl_parameters.certs_file);

24
libs/spice/patches/0002-build-tools-fix-build-failure.patch Normal file
View file

@ -0,0 +1,24 @@
From d37fe6af97a45f0567c47932fd5c66d451fcb128 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Fri, 20 Mar 2020 17:07:03 +0800
Subject: [PATCH] build: tools: fix build failure
Tools build can fail because -stack-protector-all is missing
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
tools/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 702fcdd1..7dc70c4e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
AM_LDFLAGS = \
$(LIBRT) \
+ $(WARN_LDFLAGS) \
$(NULL)
if !OS_WIN32

78
libs/spice/patches/0002-reds-Fix-compilation-without-deprecated-OpenSSL-1.1-.patch
View file

@ -1,78 +0,0 @@
From 5bc932f7a71ede7d8ecd9d88804af95a2eb955c0 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 3 Nov 2019 15:34:33 -0800
Subject: [PATCH] reds: Fix compilation without deprecated OpenSSL 1.1 APIs
Missing headers for BN_ and RSA_ functions.
Initialization is deprecated with 1.1.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
---
AUTHORS hunk removed as it does not apply (with 0.14.2 at least)
AUTHORS | 1 +
server/reds.c | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/server/reds.c b/server/reds.c
index c55aa3f8..dc03ef3a 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -36,7 +36,9 @@
#include <ws2tcpip.h>
#endif
+#include <openssl/bn.h>
#include <openssl/err.h>
+#include <openssl/rsa.h>
#if HAVE_SASL
#include <sasl/sasl.h>
@@ -2838,13 +2840,8 @@ static void openssl_thread_setup(void)
CRYPTO_set_id_callback(pthreads_thread_id);
CRYPTO_set_locking_callback(pthreads_locking_callback);
}
-#else
-static inline void openssl_thread_setup(void)
-{
-}
-#endif
-static gpointer openssl_global_init(gpointer arg)
+static gpointer openssl_global_init_once(gpointer arg)
{
SSL_library_init();
SSL_load_error_strings();
@@ -2854,9 +2851,20 @@ static gpointer openssl_global_init(gpointer arg)
return NULL;
}
-static int reds_init_ssl(RedsState *reds)
+static inline void openssl_global_init(void)
{
static GOnce openssl_once = G_ONCE_INIT;
+ g_once(&openssl_once, openssl_global_init_once, NULL);
+}
+
+#else
+static inline void openssl_global_init(void)
+{
+}
+#endif
+
+static int reds_init_ssl(RedsState *reds)
+{
const SSL_METHOD *ssl_method;
int return_code;
/* Limit connection to TLSv1.1 or newer.
@@ -2865,7 +2873,7 @@ static int reds_init_ssl(RedsState *reds)
long ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION | SSL_OP_NO_TLSv1;
/* Global system initialization*/
- g_once(&openssl_once, openssl_global_init, NULL);
+ openssl_global_init();
/* Create our context*/
/* SSLv23_method() handles TLSv1.x in addition to SSLv2/v3 */

14
libs/spice/patches/0003-disable-building-tests.patch
View file

@ -1,14 +0,0 @@
Tests build can fail for arc700 for the following causes
- Missing -stack-protector-all argument when building test progs
- Missing linker flag -lgmodule-2.0 -lffi
--- a/server/Makefile.am.orig 2019-12-25 18:31:59.133981942 +0800
+++ b/server/Makefile.am 2019-12-25 18:32:06.308976585 +0800
@@ -1,5 +1,5 @@
NULL =
-SUBDIRS = . tests
+SUBDIRS = .
check-valgrind:
$(MAKE) -C tests check-valgrind

12
libs/spice/patches/0004-fix-building-tools.patch
View file

@ -1,12 +0,0 @@
Tools build can fail because -stack-protector-all is missing
--- a/tools/Makefile.am.orig 2019-12-25 18:51:48.947959673 +0800
+++ b/tools/Makefile.am 2019-12-25 18:51:56.165952726 +0800
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
AM_LDFLAGS = \
$(LIBRT) \
+ $(WARN_LDFLAGS) \
$(NULL)
noinst_PROGRAMS = \