Attachment 155163 Details for Bug 199134 – conditional patch to compile with libressl

[patch] conditional patch to compile with libressl

devel-qca-2.1.0_2_new.diff (text/plain), 1.22 KB, created by Adam McDougall on 2015-04-03 17:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam McDougall

Created: 2015-04-03 17:04:22 UTC

Size: 1.22 KB

patch

obsolete

>diff -urN devel/qca.orig/Makefile devel/qca/Makefile
>--- devel/qca.orig/Makefile	2015-04-02 22:05:22.743206000 -0400
>+++ devel/qca/Makefile	2015-04-02 22:14:52.889166141 -0400
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qca
> PORTVERSION=	2.1.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
> 
>diff -urN devel/qca.orig/files/patch-plugins-qca-ossl-qca-ossl.cpp devel/qca/files/patch-plugins-qca-ossl-qca-ossl.cpp
>--- devel/qca.orig/files/patch-plugins-qca-ossl-qca-ossl.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ devel/qca/files/patch-plugins-qca-ossl-qca-ossl.cpp	2015-04-03 13:00:19.000000000 -0400
>@@ -0,0 +1,16 @@
>+diff -urN qca-2.1.0.orig/plugins/qca-ossl/qca-ossl.cpp qca-2.1.0/plugins/qca-ossl/qca-ossl.cpp
>+--- plugins/qca-ossl/qca-ossl.cpp	2014-11-06 03:15:45.000000000 -0500
>++++ plugins/qca-ossl/qca-ossl.cpp	2015-04-03 12:59:49.271507403 -0400
>+@@ -5801,7 +5801,11 @@
>+ 	{
>+ 		SessionInfo sessInfo;
>+ 
>+-		sessInfo.isCompressed = (0 != ssl->session->compress_meth);
>++		#ifndef OPENSSL_NO_COMP
>++			sessInfo.isCompressed = (0 != ssl->session->compress_meth);
>++		#else
>++			sessInfo.isCompressed = 0;
>++		#endif
>+ 
>+ 		if (ssl->version == TLS1_VERSION)
>+ 			sessInfo.version = TLS::TLS_v1;

Actions: View | Diff

Attachments on bug 199134: 155143 | 155144 | 155163 | 155164 | 158803