From 35e893edcc648acf309e268f85e915254d7e07d0 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 10 Jan 2017 15:13:36 +0000 Subject: [PATCH] MFH: r431089 mail/archiveopteryx{-devel}: Fix build on HEAD Approved by: ports-secteam (with hat) --- mail/archiveopteryx-devel/Makefile | 2 +- .../files/patch-server_tlsthread.cpp | 11 +++++++++++ mail/archiveopteryx/Makefile | 2 +- mail/archiveopteryx/files/patch-server_tlsthread.cpp | 11 +++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp create mode 100644 mail/archiveopteryx/files/patch-server_tlsthread.cpp diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile index a494714615c1..b001aa447bd8 100644 --- a/mail/archiveopteryx-devel/Makefile +++ b/mail/archiveopteryx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= archiveopteryx PORTVERSION= 3.2.99.20160129 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail PKGNAMESUFFIX= -devel diff --git a/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp b/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp new file mode 100644 index 000000000000..bb0f90c58bb5 --- /dev/null +++ b/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp @@ -0,0 +1,11 @@ +--- server/tlsthread.cpp.orig 2017-01-10 15:06:31 UTC ++++ server/tlsthread.cpp +@@ -93,7 +93,7 @@ void TlsThread::setup() + SSL_library_init(); + + ctx = ::SSL_CTX_new( SSLv23_server_method() ); +- int options = SSL_OP_ALL ++ long options = SSL_OP_ALL + // also try to pick the same ciphers suites more often + | SSL_OP_CIPHER_SERVER_PREFERENCE + // and don't use SSLv2, even if the client wants to diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index fd9a8f660147..21915218554b 100644 --- a/mail/archiveopteryx/Makefile +++ b/mail/archiveopteryx/Makefile @@ -3,7 +3,7 @@ PORTNAME= archiveopteryx PORTVERSION= 3.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= http://archiveopteryx.org/download/ diff --git a/mail/archiveopteryx/files/patch-server_tlsthread.cpp b/mail/archiveopteryx/files/patch-server_tlsthread.cpp new file mode 100644 index 000000000000..d43d193746fd --- /dev/null +++ b/mail/archiveopteryx/files/patch-server_tlsthread.cpp @@ -0,0 +1,11 @@ +--- server/tlsthread.cpp.orig 2017-01-10 15:10:07 UTC ++++ server/tlsthread.cpp +@@ -93,7 +93,7 @@ void TlsThread::setup() + SSL_library_init(); + + ctx = ::SSL_CTX_new( SSLv23_server_method() ); +- int options = SSL_OP_ALL ++ long options = SSL_OP_ALL + // also try to pick the same ciphers suites more often + | SSL_OP_CIPHER_SERVER_PREFERENCE + // and don't use SSLv2, even if the client wants to