View | Details | Raw Unified | Return to bug 224578 | Differences between
and this patch

Collapse All | Expand All

(-)net/asio/Makefile (-2 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	asio
4
PORTNAME=	asio
5
PORTVERSION=	1.10.6
5
PORTVERSION=	1.10.6
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	net devel
7
CATEGORIES=	net devel
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/
9
9
Lines 15-23 Link Here
15
15
16
RUN_DEPENDS=	${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs
16
RUN_DEPENDS=	${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs
17
17
18
USES=		tar:bz2
18
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
19
USES=		gmake tar:bz2
20
NO_BUILD=	yes
20
NO_BUILD=	yes
21
NO_ARCH=	yes
21
INSTALL_TARGET=	install-data
22
INSTALL_TARGET=	install-data
22
23
23
.include <bsd.port.mk>
24
.include <bsd.port.mk>
(-)net/asio/files/patch-configure (-3 / +5 lines)
Lines 1-9 Link Here
1
Since we aren't compiling anything for the port, don't look for boost:
1
Since we aren't compiling anything for the port, don't look for boost:
2
--- configure	2014-10-01 20:10:53.000000000 -0400
2
--- configure.orig	2015-03-23 20:37:48 UTC
3
+++ configure	2014-11-30 12:32:04.000000000 -0500
3
+++ configure
4
@@ -5026,5 +5026,4 @@
4
@@ -5025,7 +5025,6 @@ else
5
 
5
     echo "Can't find boost headers. Please check the location of the boost"
6
     echo "Can't find boost headers. Please check the location of the boost"
6
     echo "distribution and rerun configure using the --with-boost=DIR option."
7
     echo "distribution and rerun configure using the --with-boost=DIR option."
7
-    exit 1
8
-    exit 1
8
 
9
 
9
 fi
10
 fi
11
 
(-)net/asio/files/patch-include_asio_ssl_impl_context.ipp (-4 / +3 lines)
Lines 1-11 Link Here
1
--- include/asio/ssl/impl/context.ipp.orig	2015-03-23 20:28:30 UTC
1
--- include/asio/ssl/impl/context.ipp.orig	2015-03-23 20:28:30 UTC
2
+++ include/asio/ssl/impl/context.ipp
2
+++ include/asio/ssl/impl/context.ipp
3
@@ -88,7 +88,15 @@ context::context(context::method m)
3
@@ -88,6 +88,14 @@ context::context(context::method m)
4
     handle_ = ::SSL_CTX_new(::SSLv2_server_method());
4
     handle_ = ::SSL_CTX_new(::SSLv2_server_method());
5
     break;
5
     break;
6
 #endif // defined(OPENSSL_NO_SSL2)
6
 #endif // defined(OPENSSL_NO_SSL2)
7
+#if defined(OPENSSL_NO_SSL3)
7
+#if defined(OPENSSL_NO_SSL3)
8
   case context::sslv3:
8
+  case context::sslv3:
9
+  case context::sslv3_client:
9
+  case context::sslv3_client:
10
+  case context::sslv3_server:
10
+  case context::sslv3_server:
11
+    asio::detail::throw_error(
11
+    asio::detail::throw_error(
Lines 12-21 Link Here
12
+        asio::error::invalid_argument, "context");
12
+        asio::error::invalid_argument, "context");
13
+    break;
13
+    break;
14
+#else // defined(OPENSSL_NO_SSL3)
14
+#else // defined(OPENSSL_NO_SSL3)
15
+  case context::sslv3:
15
   case context::sslv3:
16
     handle_ = ::SSL_CTX_new(::SSLv3_method());
16
     handle_ = ::SSL_CTX_new(::SSLv3_method());
17
     break;
17
     break;
18
   case context::sslv3_client:
19
@@ -97,6 +105,7 @@ context::context(context::method m)
18
@@ -97,6 +105,7 @@ context::context(context::method m)
20
   case context::sslv3_server:
19
   case context::sslv3_server:
21
     handle_ = ::SSL_CTX_new(::SSLv3_server_method());
20
     handle_ = ::SSL_CTX_new(::SSLv3_server_method());

Return to bug 224578