Attachment #183398 for bug #219924




# $FreeBSD$

PORTNAME=	asio
PORTVERSION=	1.10.6
PORTREVISION=	3
CATEGORIES=	net devel
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/


MAINTAINER=	acm@FreeBSD.org
COMMENT=	Cross-platform C++ library for network and low-level I/O programming

LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt

RUN_DEPENDS=	${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs

GNU_CONFIGURE=	yes

Lines 1-2 Link Here

(-)net/asio/distinfo (-2 / +3 lines)
1	SHA256 (asio-1.10.4.tar.bz2) = 313b0d69bd5fd528a6748fec2f24c56ab143310302c903efe5f0728232b7b14a	1	TIMESTAMP = 1497173194
2	SIZE (asio-1.10.4.tar.bz2) = 1270594	2	SHA256 (asio-1.10.6.tar.bz2) = e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e
		3	SIZE (asio-1.10.6.tar.bz2) = 1266180

Lines 1-9 Link Here

(-)net/asio/files/patch-configure (-3 / +5 lines)
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




--- include/asio/ssl/impl/context.ipp.orig	2015-03-23 20:28:30 UTC
+++ include/asio/ssl/impl/context.ipp
@@ -88,7 +88,16 @@ context::context(context::method m)
     handle_ = ::SSL_CTX_new(::SSLv2_server_method());
     break;
 #endif // defined(OPENSSL_NO_SSL2)
+#if defined(OPENSSL_NO_SSL3)
   case context::sslv3:
+  case context::sslv3_client:
+  case context::sslv3_server:
+    asio::detail::throw_error(
+        asio::error::invalid_argument, "context");
+    break;
+#else // defined(OPENSSL_NO_SSL3)
+  case context::sslv2:
+  case context::sslv3:
     handle_ = ::SSL_CTX_new(::SSLv3_method());
     break;
   case context::sslv3_client:
@@ -97,6 +106,8 @@ context::context(context::method m)
   case context::sslv3_server:
     handle_ = ::SSL_CTX_new(::SSLv3_server_method());
     break;
+#else // defined(OPENSSL_NO_SSL3)
+  case context::sslv2:
   case context::tlsv1:
     handle_ = ::SSL_CTX_new(::TLSv1_method());
     break;

Return to bug 219924

Lines 2-9 Link Here

(-)net/asio/Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= asio	4	PORTNAME= asio
5	PORTVERSION= 1.10.4	5	PORTVERSION= 1.10.6
6	PORTREVISION= 3
7	CATEGORIES= net devel	6	CATEGORIES= net devel
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/
9		8
Lines 10-15 Link Here
10	MAINTAINER= acm@FreeBSD.org	9	MAINTAINER= acm@FreeBSD.org
11	COMMENT= Cross-platform C++ library for network and low-level I/O programming	10	COMMENT= Cross-platform C++ library for network and low-level I/O programming
12		11
		12	LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt
		13
13	RUN_DEPENDS= ${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs	14	RUN_DEPENDS= ${LOCALBASE}/include/boost/chrono/system_clocks.hpp:devel/boost-libs
14		15
15	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes

Line 0 Link Here

(-)net/asio/files/patch-include_asio_ssl_impl_context.ipp (+28 lines)
	1	--- include/asio/ssl/impl/context.ipp.orig 2015-03-23 20:28:30 UTC
	2	+++ include/asio/ssl/impl/context.ipp
	3	@@ -88,7 +88,16 @@ context::context(context::method m)
	4	handle_ = ::SSL_CTX_new(::SSLv2_server_method());
	5	break;
	6	#endif // defined(OPENSSL_NO_SSL2)
	7	+#if defined(OPENSSL_NO_SSL3)
	8	case context::sslv3:
	9	+ case context::sslv3_client:
	10	+ case context::sslv3_server:
	11	+ asio::detail::throw_error(
	12	+ asio::error::invalid_argument, "context");
	13	+ break;
	14	+#else // defined(OPENSSL_NO_SSL3)
	15	+ case context::sslv2:
	16	+ case context::sslv3:
	17	handle_ = ::SSL_CTX_new(::SSLv3_method());
	18	break;
	19	case context::sslv3_client:
	20	@@ -97,6 +106,8 @@ context::context(context::method m)
	21	case context::sslv3_server:
	22	handle_ = ::SSL_CTX_new(::SSLv3_server_method());
	23	break;
	24	+#else // defined(OPENSSL_NO_SSL3)
	25	+ case context::sslv2:
	26	case context::tlsv1:
	27	handle_ = ::SSL_CTX_new(::TLSv1_method());
	28	break;