From owner-svn-ports-head@freebsd.org Mon Mar 5 02:06:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31B59F491BC; Mon, 5 Mar 2018 02:06:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D43F37C74D; Mon, 5 Mar 2018 02:06:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF20A1D9E4; Mon, 5 Mar 2018 02:06:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2526Ng1026035; Mon, 5 Mar 2018 02:06:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2526N4R026032; Mon, 5 Mar 2018 02:06:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803050206.w2526N4R026032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 5 Mar 2018 02:06:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463614 - in head/www/domoticz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/domoticz: . files X-SVN-Commit-Revision: 463614 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2018 02:06:24 -0000 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(settings)), +- context_(io_service_, dynamic_cast(settings).get_ssl_method()) { ++ context_(dynamic_cast(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