View | Details | Raw Unified | Return to bug 224181
Collapse All | Expand All

(-)domoticz/Makefile (-3 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	domoticz
3
PORTNAME=	domoticz
4
PORTVERSION=	3.${DOMOTICZ_REL}
4
PORTVERSION=	3.${DOMOTICZ_REL}
5
PORTREVISION=	3
5
PORTREVISION=	4
6
CATEGORIES=	www
6
CATEGORIES=	www
7
7
8
MAINTAINER=	kiwi@oav.net
8
MAINTAINER=	kiwi@oav.net
Lines 11-18 Link Here
11
LICENSE=	GPLv3
11
LICENSE=	GPLv3
12
LICENSE_FILE=	${WRKSRC}/License.txt
12
LICENSE_FILE=	${WRKSRC}/License.txt
13
13
14
BROKEN=		fails to build with boost 1.66, see bug 224181
15
16
LIB_DEPENDS=	libcurl.so:ftp/curl \
14
LIB_DEPENDS=	libcurl.so:ftp/curl \
17
		libexpat.so:textproc/expat2
15
		libexpat.so:textproc/expat2
18
16
(-)domoticz/files/patch-appversion.default (-5 / +5 lines)
Lines 1-9 Link Here
1
--- appversion.default.orig	2016-03-09 17:30:00.000000000 +0100
1
--- appversion.default.orig	2017-07-30 10:19:41 UTC
2
+++ appversion.default	2016-03-09 19:10:01.169567000 +0100
2
+++ appversion.default
3
@@ -1,3 +1,3 @@
3
@@ -1,3 +1,3 @@
4
-#define APPVERSION 4834
4
-#define APPVERSION 5876
5
-#define APPHASH "2bd98a1"
5
-#define APPHASH "b97777b"
6
-#define APPDATE 1456904172
6
-#define APPDATE 1478691222
7
+#define APPVERSION XXXDOMOTICZXXX
7
+#define APPVERSION XXXDOMOTICZXXX
8
+#define APPHASH "XXXHASHXXX"
8
+#define APPHASH "XXXHASHXXX"
9
+#define APPDATE XXXTIMEXXX
9
+#define APPDATE XXXTIMEXXX
(-)domoticz/files/patch-getgit.cmake (-2 / +2 lines)
Lines 1-5 Link Here
1
--- getgit.cmake.orig	2016-04-01 15:27:18.517929000 +0200
1
--- getgit.cmake.orig	2017-07-30 10:19:41 UTC
2
+++ getgit.cmake	2016-04-01 15:27:52.572836000 +0200
2
+++ getgit.cmake
3
@@ -1,66 +1,7 @@
3
@@ -1,66 +1,7 @@
4
 # this macro gets called as a custom build step by running make
4
 # this macro gets called as a custom build step by running make
5
 # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller
5
 # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller
(-)domoticz/files/patch-webserver_proxyclient.cpp (+11 lines)
Line 0 Link Here
1
--- webserver/proxyclient.cpp.orig	2017-07-30 10:19:41 UTC
2
+++ webserver/proxyclient.cpp
3
@@ -639,7 +639,7 @@ namespace http {
4
 		void CProxyManager::StartThread()
5
 		{
6
 			try {
7
-				boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
8
+				boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23);
9
 				ctx.set_verify_mode(boost::asio::ssl::verify_none);
10
 
11
 				proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm));
(-)domoticz/files/patch-webserver_server.cpp (+20 lines)
Line 0 Link Here
1
--- webserver/server.cpp.orig	2017-07-30 10:19:41 UTC
2
+++ webserver/server.cpp
3
@@ -148,7 +148,7 @@ void server::handle_accept(const boost::
4
 ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) :
5
 		server_base(ssl_settings, user_request_handler),
6
 		settings_(ssl_settings),
7
-		context_(io_service_, ssl_settings.get_ssl_method())
8
+		context_(ssl_settings.get_ssl_method())
9
 {
10
 #ifdef DEBUG_WWW
11
 	_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());
12
@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_
13
 ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) :
14
 		server_base(settings, user_request_handler),
15
 		settings_(dynamic_cast<ssl_server_settings const &>(settings)),
16
-		context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
17
+		context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
18
 #ifdef DEBUG_WWW
19
 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
20
 #endif

Return to bug 224181