Attachment #160646 for bug #202844

Lines 2-8 Link Here

(-)devel/ace/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/devel/ace/Makefile 377650 2015-01-22 12:01:05Z vanilla $	2	# $FreeBSD: head/devel/ace/Makefile 377650 2015-01-22 12:01:05Z vanilla $
3		3
4	PORTNAME= ace	4	PORTNAME= ace
5	PORTVERSION= 6.3.1	5	PORTVERSION= 6.3.2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \	7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \
8	http://download.dre.vanderbilt.edu/previous_versions/	8	http://download.dre.vanderbilt.edu/previous_versions/

Lines 1-2 Link Here

(-)devel/ace/distinfo (-2 / +2 lines)
1	SHA256 (ACE-6.3.1.tar.bz2) = 7a453ed93a5c1d0c07e2200c6c4ea47b99b218dc2fc5b543ed4c99f498824dad	1	SHA256 (ACE-6.3.2.tar.bz2) = d8e5ad92eab743936fb8921301e7df09a4d331270be2b7b3dec7f47b8ba2ce5f
2	SIZE (ACE-6.3.1.tar.bz2) = 8719870	2	SIZE (ACE-6.3.2.tar.bz2) = 8741018




--- ace/SSL/SSL_Context.cpp.orig	2014-12-29 10:41:20 UTC
+++ ace/SSL/SSL_Context.cpp
@@ -274,7 +274,7 @@ ACE_SSL_Context::set_mode (int mode)
     case ACE_SSL_Context::TLSv1:
       method = ::TLSv1_method ();
       break;
-#ifdef TLS1_1_VERSION
+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
     case ACE_SSL_Context::TLSv1_1_client:
       method = ::TLSv1_1_client_method ();
       break;
@@ -285,7 +285,7 @@ ACE_SSL_Context::set_mode (int mode)
       method = ::TLSv1_1_method ();
       break;
 #endif
-#ifdef TLS1_2_VERSION
+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
     case ACE_SSL_Context::TLSv1_2_client:
       method = ::TLSv1_2_client_method ();
       break;
@@ -556,7 +556,7 @@ ACE_SSL_Context::random_seed (const char
 int
 ACE_SSL_Context::egd_file (const char * socket_file)
 {
-#if OPENSSL_VERSION_NUMBER < 0x00905100L
+#if OPENSSL_VERSION_NUMBER < 0x00905100L || defined(LIBRESSL_VERSION_NUMBER)
   // OpenSSL < 0.9.5 doesn't have EGD support.
   ACE_UNUSED_ARG (socket_file);
   ACE_NOTSUP_RETURN (-1);

Return to bug 202844

Lines 1-29 Link Here

(-)devel/ace/files/patch-ace__SSL__SSL_Context.cpp (-29 lines)
1	--- ace/SSL/SSL_Context.cpp.orig 2014-12-29 10:41:20 UTC
2	+++ ace/SSL/SSL_Context.cpp
3	@@ -274,7 +274,7 @@ ACE_SSL_Context::set_mode (int mode)
4	case ACE_SSL_Context::TLSv1:
5	method = ::TLSv1_method ();
6	break;
7	-#ifdef TLS1_1_VERSION
8	+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
9	case ACE_SSL_Context::TLSv1_1_client:
10	method = ::TLSv1_1_client_method ();
11	break;
12	@@ -285,7 +285,7 @@ ACE_SSL_Context::set_mode (int mode)
13	method = ::TLSv1_1_method ();
14	break;
15	#endif
16	-#ifdef TLS1_2_VERSION
17	+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
18	case ACE_SSL_Context::TLSv1_2_client:
19	method = ::TLSv1_2_client_method ();
20	break;
21	@@ -556,7 +556,7 @@ ACE_SSL_Context::random_seed (const char
22	int
23	ACE_SSL_Context::egd_file (const char * socket_file)
24	{
25	-#if OPENSSL_VERSION_NUMBER < 0x00905100L
26	+#if OPENSSL_VERSION_NUMBER < 0x00905100L \|\| defined(LIBRESSL_VERSION_NUMBER)
27	// OpenSSL < 0.9.5 doesn't have EGD support.
28	ACE_UNUSED_ARG (socket_file);
29	ACE_NOTSUP_RETURN (-1);