svn commit: r431090 - in branches/2017Q1/mail: archiveopteryx archiveopteryx-devel archiveopteryx-devel/files archiveopteryx/files

[Mark Felder]

Author: feld
Date: Tue Jan 10 15:13:36 2017
New Revision: 431090
URL: https://svnweb.freebsd.org/changeset/ports/431090

Log:
  MFH: r431089
  
  mail/archiveopteryx{-devel}: Fix build on HEAD
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
     - copied unchanged from r431089, head/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
  branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp
     - copied unchanged from r431089, head/mail/archiveopteryx/files/patch-server_tlsthread.cpp
Modified:
  branches/2017Q1/mail/archiveopteryx-devel/Makefile
  branches/2017Q1/mail/archiveopteryx/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/mail/archiveopteryx-devel/Makefile
==============================================================================
--- branches/2017Q1/mail/archiveopteryx-devel/Makefile	Tue Jan 10 15:12:44 2017	(r431089)
+++ branches/2017Q1/mail/archiveopteryx-devel/Makefile	Tue Jan 10 15:13:36 2017	(r431090)
@@ -3,7 +3,7 @@
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.99.20160129
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 

Copied: branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp (from r431089, head/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp	Tue Jan 10 15:13:36 2017	(r431090, copy of r431089, head/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

Modified: branches/2017Q1/mail/archiveopteryx/Makefile
==============================================================================
--- branches/2017Q1/mail/archiveopteryx/Makefile	Tue Jan 10 15:12:44 2017	(r431089)
+++ branches/2017Q1/mail/archiveopteryx/Makefile	Tue Jan 10 15:13:36 2017	(r431090)
@@ -3,7 +3,7 @@
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 

Copied: branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp (from r431089, head/mail/archiveopteryx/files/patch-server_tlsthread.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp	Tue Jan 10 15:13:36 2017	(r431090, copy of r431089, head/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