diff options
| author | Alonso Schaich <alonso@FreeBSD.org> | 2015-07-16 05:29:22 +0000 |
|---|---|---|
| committer | Alonso Schaich <alonso@FreeBSD.org> | 2015-07-16 05:29:22 +0000 |
| commit | 0f6380feb102214049ed4d6947dbd85a02b35d19 (patch) | |
| tree | e7e200838e484b3c659107cb97c5314861ab5d17 | |
| parent | - Drop @dirrm* from plist (diff) | |
Revert 392050
While 392050 fixed the libressl build, it broke compilation against FreeBSD-8
and FreeBSD-9's base openssl.
PR: 199134
PR: 201584
Notes
Notes:
svn path=/head/; revision=392272
| -rw-r--r-- | devel/qca/Makefile | 2 | ||||
| -rw-r--r-- | devel/qca/files/patch-git_593de685 | 25 |
2 files changed, 1 insertions, 26 deletions
diff --git a/devel/qca/Makefile b/devel/qca/Makefile index 0241e076e55e..0b8314602239 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -3,7 +3,7 @@ PORTNAME= qca PORTVERSION= 2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://delta.affinix.com/download/qca/2.0/ diff --git a/devel/qca/files/patch-git_593de685 b/devel/qca/files/patch-git_593de685 deleted file mode 100644 index d8981f34b4ee..000000000000 --- a/devel/qca/files/patch-git_593de685 +++ /dev/null @@ -1,25 +0,0 @@ -commit 593de6855a4f4dc26cface3e96de8889f90cb4bb -Author: Heiko Becker -Date: Mon Oct 20 12:46:34 2014 +0000 - - Fix build with libressl - - libressl removed the SSL Compression functionality (which might - be considered insecure) and thus also compress_meth. - SSL_SESSION_get_compress_id is just a stub in libressl which always - returns 0 and in openssl it returns compress_meth. - - REVIEW: 121107 - ---- plugins/qca-ossl/qca-ossl.cpp -+++ plugins/qca-ossl/qca-ossl.cpp -@@ -5805,7 +5805,7 @@ - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != ssl->session->compress_meth); -+ sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); - - if (ssl->version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; - |