svn commit: r463614 - in head/www/domoticz: . files

[Jan Beich]

Author: jbeich
Date: Mon Mar  5 02:06:23 2018
New Revision: 463614
URL: https://svnweb.freebsd.org/changeset/ports/463614

Log:
  www/domoticz: unbreak with boost 1.66
  
  PR:		224181
  Submitted by:	BERÉNYI Balázs (via private mail)
  Obtained from:	upstream
  Approved by:	Xavier Beaudouin (maintainer)

Added:
  head/www/domoticz/files/patch-webserver_proxyclient.cpp   (contents, props changed)
  head/www/domoticz/files/patch-webserver_server.cpp   (contents, props changed)
Modified:
  head/www/domoticz/Makefile   (contents, props changed)

Modified: head/www/domoticz/Makefile
==============================================================================
--- head/www/domoticz/Makefile	Mon Mar  5 02:05:48 2018	(r463613)
+++ head/www/domoticz/Makefile	Mon Mar  5 02:06:23 2018	(r463614)
@@ -11,8 +11,6 @@ COMMENT=	Home Automation System
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-BROKEN=		fails to build with boost 1.66, see bug 224181
-
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2
 

Added: head/www/domoticz/files/patch-webserver_proxyclient.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/domoticz/files/patch-webserver_proxyclient.cpp	Mon Mar  5 02:06:23 2018	(r463614)
@@ -0,0 +1,13 @@
+https://github.com/domoticz/domoticz/commit/388c7b51716c
+
+--- webserver/proxyclient.cpp.orig	2017-07-30 10:19:41 UTC
++++ webserver/proxyclient.cpp
+@@ -639,7 +639,7 @@ namespace http {
+ 		void CProxyManager::StartThread()
+ 		{
+ 			try {
+-				boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
++				boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23);
+ 				ctx.set_verify_mode(boost::asio::ssl::verify_none);
+ 
+ 				proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm));

Added: head/www/domoticz/files/patch-webserver_server.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/domoticz/files/patch-webserver_server.cpp	Mon Mar  5 02:06:23 2018	(r463614)
@@ -0,0 +1,22 @@
+https://github.com/domoticz/domoticz/commit/388c7b51716c
+
+--- webserver/server.cpp.orig	2017-07-30 10:19:41 UTC
++++ webserver/server.cpp
+@@ -148,7 +148,7 @@ void server::handle_accept(const boost::system::error_
+ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) :
+ 		server_base(ssl_settings, user_request_handler),
+ 		settings_(ssl_settings),
+-		context_(io_service_, ssl_settings.get_ssl_method())
++		context_(ssl_settings.get_ssl_method())
+ {
+ #ifdef DEBUG_WWW
+ 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str());
+@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl
+ ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) :
+ 		server_base(settings, user_request_handler),
+ 		settings_(dynamic_cast<ssl_server_settings const &>(settings)),
+-		context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
++		context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
+ #ifdef DEBUG_WWW
+ 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
+ #endif