Attachment 191201 Details for Bug 224181 – Patch to fix boost 1.66 support

[patch] Patch to fix boost 1.66 support

domoticz-boost.diff (text/plain), 4.19 KB, created by Xavier Beaudouin on 2018-03-04 16:10:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Beaudouin

Created: 2018-03-04 16:10:53 UTC

Size: 4.19 KB

patch

obsolete

>diff -u --new-file --recursive domoticz.old/Makefile domoticz/Makefile
>--- domoticz.old/Makefile	2018-01-18 05:11:02.000000000 +0100
>+++ domoticz/Makefile	2018-02-26 15:53:46.882293000 +0100
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	domoticz
> PORTVERSION=	3.${DOMOTICZ_REL}
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> 
> MAINTAINER=	kiwi@oav.net
>@@ -11,8 +11,6 @@
> 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
> 
>diff -u --new-file --recursive domoticz.old/files/patch-appversion.default domoticz/files/patch-appversion.default
>--- domoticz.old/files/patch-appversion.default	2018-02-26 15:31:50.334379000 +0100
>+++ domoticz/files/patch-appversion.default	2018-02-26 15:48:47.794092000 +0100
>@@ -1,9 +1,9 @@
>---- appversion.default.orig	2016-03-09 17:30:00.000000000 +0100
>-+++ appversion.default	2016-03-09 19:10:01.169567000 +0100
>+--- appversion.default.orig	2017-07-30 10:19:41 UTC
>++++ appversion.default
> @@ -1,3 +1,3 @@
>--#define APPVERSION 4834
>--#define APPHASH "2bd98a1"
>--#define APPDATE 1456904172
>+-#define APPVERSION 5876
>+-#define APPHASH "b97777b"
>+-#define APPDATE 1478691222
> +#define APPVERSION XXXDOMOTICZXXX
> +#define APPHASH "XXXHASHXXX"
> +#define APPDATE XXXTIMEXXX
>diff -u --new-file --recursive domoticz.old/files/patch-getgit.cmake domoticz/files/patch-getgit.cmake
>--- domoticz.old/files/patch-getgit.cmake	2017-08-18 05:14:03.000000000 +0200
>+++ domoticz/files/patch-getgit.cmake	2018-02-26 15:47:22.691398000 +0100
>@@ -1,5 +1,5 @@
>---- getgit.cmake.orig	2016-04-01 15:27:18.517929000 +0200
>-+++ getgit.cmake	2016-04-01 15:27:52.572836000 +0200
>+--- getgit.cmake.orig	2017-07-30 10:19:41 UTC
>++++ getgit.cmake
> @@ -1,66 +1,7 @@
>  # this macro gets called as a custom build step by running make
>  # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller
>diff -u --new-file --recursive domoticz.old/files/patch-webserver_proxyclient.cpp domoticz/files/patch-webserver_proxyclient.cpp
>--- domoticz.old/files/patch-webserver_proxyclient.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ domoticz/files/patch-webserver_proxyclient.cpp	2018-02-26 15:47:22.695895000 +0100
>@@ -0,0 +1,11 @@
>+--- 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));
>diff -u --new-file --recursive domoticz.old/files/patch-webserver_server.cpp domoticz/files/patch-webserver_server.cpp
>--- domoticz.old/files/patch-webserver_server.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ domoticz/files/patch-webserver_server.cpp	2018-02-26 15:47:22.700819000 +0100
>@@ -0,0 +1,20 @@
>+--- webserver/server.cpp.orig	2017-07-30 10:19:41 UTC
>++++ webserver/server.cpp
>+@@ -148,7 +148,7 @@ void server::handle_accept(const boost::
>+ 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_
>+ 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

Actions: View | Diff

Attachments on bug 224181: 191201