Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Apr 2018 10:34:23 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r468416 - head/deskutils/spice-gtk/files
Message-ID:  <201804271034.w3RAYNE7015140@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: brnrd
Date: Fri Apr 27 10:34:23 2018
New Revision: 468416
URL: https://svnweb.freebsd.org/changeset/ports/468416

Log:
  deskutils/spice-gtk: Fix build with LibreSSL 2.7
  
  PR:		227804

Modified:
  head/deskutils/spice-gtk/files/patch-libressl

Modified: head/deskutils/spice-gtk/files/patch-libressl
==============================================================================
--- head/deskutils/spice-gtk/files/patch-libressl	Fri Apr 27 10:32:59 2018	(r468415)
+++ head/deskutils/spice-gtk/files/patch-libressl	Fri Apr 27 10:34:23 2018	(r468416)
@@ -5,7 +5,7 @@
  #include "bio-gio.h"
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static BIO_METHOD one_static_bio;
  
  static int BIO_meth_set_read(BIO_METHOD *biom,
@@ -16,7 +16,7 @@
  static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
  {
      if (pkey->type != EVP_PKEY_RSA) {
@@ -27,7 +27,7 @@
  #include <gio/gio.h>
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
  {
      return M_ASN1_STRING_data(asn1);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804271034.w3RAYNE7015140>