Here's the patch without the svn metadata
On Wed, Jun 20, 2018 at 6:02 AM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote:
>>
>> Hi, I maintain the spice-gtk port in FreeBSD and noticed that in
>> spice-gtk-0.35, there was a fix for libressl but that fix needs to
>> only apply to older versions of libressl. Here is a patch that
>> implements this. Can we can get in the new version so I can remove our
>> patch? Thanks.
>>
>> https://bz-attachments.freebsd.org/attachment.cgi?id=194274
>>
>> -#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
>> +#if OPENSSL_VERSION_NUMBER < 0x10100000 ||
>> (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <
>> 0x20700000)
>
> Hi,
> can you send a proper formatted git patch?
> Is it only a single file? If not maybe would be good to have a common
> check.
>
> Frediano
Index: files/patch-spice-common_common_ssl__verify.c
===================================================================
--- files/patch-spice-common_common_ssl__verify.c (nonexistent)
+++ files/patch-spice-common_common_ssl__verify.c (working copy)
@@ -0,0 +1,11 @@
+--- spice-common/common/ssl_verify.c.orig 2018-05-18 12:28:10 UTC
++++ spice-common/common/ssl_verify.c
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <gio/gio.h>
+
+-#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);
Index: files/patch-src_bio-gio.c
===================================================================
--- files/patch-src_bio-gio.c (nonexistent)
+++ files/patch-src_bio-gio.c (working copy)
@@ -0,0 +1,11 @@
+--- src/bio-gio.c.orig 2018-06-15 16:59:02 UTC
++++ src/bio-gio.c
+@@ -23,7 +23,7 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+
+-#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,
Index: files/patch-src_spice-channel.c
===================================================================
--- files/patch-src_spice-channel.c (nonexistent)
+++ files/patch-src_spice-channel.c (working copy)
@@ -0,0 +1,11 @@
+--- src/spice-channel.c.orig 2018-06-15 16:59:48 UTC
++++ src/spice-channel.c
+@@ -55,7 +55,7 @@ static void spice_channel_reset_capabili
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+
+-#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) {
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel