svn commit: r461150 - head/deskutils/spice-gtk/files

[Pawel Pekala]

Author: pawel
Date: Wed Feb  7 15:55:49 2018
New Revision: 461150
URL: https://svnweb.freebsd.org/changeset/ports/461150

Log:
  Fix build with LibreSSL:
  
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_set_read'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_get_data'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_set_write'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_set_ctrl'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_set_puts'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_free'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_meth_new'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_set_init'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `EVP_PKEY_get0_RSA'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `ASN1_STRING_get0_data'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_get_new_index'
  ./.libs/libspice-client-glib-2.0.so: undefined reference to `BIO_set_data'
  cc: error: linker command failed with exit code 1 (use -v to see invocation)
  
  Patches were submitted and accepted by upstream:
  
  https://lists.freedesktop.org/archives/spice-commits/2018-January/004276.html
  https://lists.freedesktop.org/archives/spice-commits/2018-January/004277.html
  
  PR:		225407
  Submitted by:	myself
  Approved by:	maintainer timeout

Added:
  head/deskutils/spice-gtk/files/patch-libressl   (contents, props changed)

Added: head/deskutils/spice-gtk/files/patch-libressl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/spice-gtk/files/patch-libressl	Wed Feb  7 15:55:49 2018	(r461150)
@@ -0,0 +1,33 @@
+--- src/bio-gio.c.orig	2017-01-13 14:00:07 UTC
++++ src/bio-gio.c
+@@ -23,7 +23,7 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD one_static_bio;
+ 
+ static int BIO_meth_set_read(BIO_METHOD *biom,
+--- src/spice-channel.c.orig	2018-01-21 15:48:25 UTC
++++ src/spice-channel.c
+@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChan
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+ {
+     if (pkey->type != EVP_PKEY_RSA) {
+--- spice-common/common/ssl_verify.c.orig	2018-01-21 15:52:12 UTC
++++ spice-common/common/ssl_verify.c
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <gio/gio.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
+ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+ {
+     return M_ASN1_STRING_data(asn1);