4 files changed, 85 insertions, 96 deletions
diff --git a/www/domoticz/files/domoticz.in b/www/domoticz/files/domoticz.in
index b6956f645cae..c4d14bdb0e83 100644
--- a/www/domoticz/files/domoticz.in
+++ b/www/domoticz/files/domoticz.in
@@ -31,7 +31,7 @@ load_rc_config $name
 : ${domoticz_group:=domoticz}
 : ${domoticz_enable:=NO}
 : ${domoticz_directory:=%%PREFIX%%/domoticz/domoticz}
-: ${domoticz_args:="-syslog -daemon -wwwbind 0.0.0.0"}
+: ${domoticz_args:="-syslog -daemon"}
 
 #: ${domoticz_args:="-syslog -dbase %%PREFIX%%/domoticz/db/domoticz.db -daemon -wwwbind 0.0.0.0 -p /var/run/domoticz.pid"}
 
diff --git a/www/domoticz/files/patch-CMakeLists.txt b/www/domoticz/files/patch-CMakeLists.txt
index 38f80e889086..499e6a789fe4 100644
--- a/www/domoticz/files/patch-CMakeLists.txt
+++ b/www/domoticz/files/patch-CMakeLists.txt
@@ -1,57 +1,33 @@
---- CMakeLists.txt.orig	2015-12-17 18:30:44.000000000 +0100
-+++ CMakeLists.txt	2015-12-22 17:37:43.246216000 +0100
-@@ -10,7 +10,7 @@
-     DEFINITION LUA_LIBRARIES)
- ELSE(USE_BUILTIN_LUA)
-   find_package(PkgConfig)
--  pkg_check_modules(LUA lua>=5.2)
-+  pkg_check_modules(LUA lua-5.2)
-   IF(LUA_FOUND)
-     INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIRS})
-     add_definitions(-DWITH_EXTERNAL_LUA)
-@@ -132,23 +132,24 @@
+--- CMakeLists.txt.orig	2016-11-10 15:44:33 UTC
++++ CMakeLists.txt
+@@ -163,7 +163,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName
    ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  ENDMACRO()
  
 -FIND_PROGRAM(GIT_EXECUTABLE git
--  DOC "git command line client")
-+#FIND_PROGRAM(GIT_EXECUTABLE git
-+#  DOC "git command line client")
++FIND_PROGRAM(GIT_EXECUTABLE NOgitNO
+   DOC "git command line client")
  
--MACRO(Gitversion_GET_REVISION dir variable)
--  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
--    OUTPUT_VARIABLE ${variable}
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--ENDMACRO(Gitversion_GET_REVISION)
--
--Gitversion_GET_REVISION(. ProjectRevision)
--MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
--MESSAGE(STATUS "Compiling Revision #${ProjectRevision}")
-+#MACRO(Gitversion_GET_REVISION dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_REVISION)
-+
-+#Gitversion_GET_REVISION(. ProjectRevision)
-+#MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-+#MESSAGE(STATUS "Compiling Revision #${ProjectRevision}")
-+MESSAGE(STATUS "Compiling Revision #XXXDOMOTICZXXX")
+ MACRO(Gitversion_GET_REVISION dir variable)
+@@ -653,14 +653,13 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D
+   set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
+ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
  
- # The version number.
- set (domoticz_VERSION_MAJOR 3)
- set (domoticz_VERSION_MINOR 0)
--set (domoticz_VERSION_PATCH ${ProjectRevision})
-+set (domoticz_VERSION_PATCH XXXDOMOTICZXXX)
+-install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
++install(TARGETS domoticz DESTINATION "XXXPREFIXXXX")
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION "XXXPREFIXXXX")
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION "XXXPREFIXXXX" USE_SOURCE_PERMISSIONS)
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION "XXXPREFIXXXX")
  
- include_directories(${CMAKE_SOURCE_DIR}/main) 
+ INCLUDE(TestBigEndian)
  
-@@ -482,7 +483,7 @@
- IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-   target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
- else()
--  target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
-+  target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} -LXXXPREFIXXX/lib pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
- ENDIF()
- 
- ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h")
diff --git a/www/domoticz/files/patch-appversion.default b/www/domoticz/files/patch-appversion.default
new file mode 100644
index 000000000000..6ffbe742c2ca
--- /dev/null
+++ b/www/domoticz/files/patch-appversion.default
@@ -0,0 +1,9 @@
+--- appversion.default.orig	2016-11-10 15:44:33 UTC
++++ appversion.default
+@@ -1,3 +1,3 @@
+-#define APPVERSION 5876
+-#define APPHASH "b97777b"
+-#define APPDATE 1478691222
++#define APPVERSION XXXDOMOTICZXXX
++#define APPHASH "XXXHASHXXX"
++#define APPDATE XXXTIMEXXX
diff --git a/www/domoticz/files/patch-getgit.cmake b/www/domoticz/files/patch-getgit.cmake
index 1918b85c1811..f1a73fee9147 100644
--- a/www/domoticz/files/patch-getgit.cmake
+++ b/www/domoticz/files/patch-getgit.cmake
@@ -1,66 +1,70 @@
---- getgit.cmake.old	2015-12-15 12:12:10.000000000 +0100
-+++ getgit.cmake	2015-12-16 13:04:15.081839000 +0100
-@@ -1,34 +1,35 @@
- # the git.cmake module is part of the standard distribution
+--- getgit.cmake.orig	2016-11-10 15:44:33 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
+ 
+-# the git.cmake module is part of the standard distribution
 -find_package(Git)
 -if(NOT GIT_FOUND)
 -  MESSAGE(FATAL_ERROR "Git not found!.")
 -endif()
 -
 -MACRO(Gitversion_GET_REVISION dir variable)
--  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
+-  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
+-    WORKING_DIRECTORY ${dir}
 -    OUTPUT_VARIABLE ${variable}
 -    OUTPUT_STRIP_TRAILING_WHITESPACE)
 -ENDMACRO(Gitversion_GET_REVISION)
 -
 -MACRO(Gitversion_GET_HASH dir variable)
--  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+-  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD
+-    WORKING_DIRECTORY ${dir}
 -    OUTPUT_VARIABLE ${variable}
 -    OUTPUT_STRIP_TRAILING_WHITESPACE)
 -ENDMACRO(Gitversion_GET_HASH)
 -
 -MACRO(Gitversion_GET_DATE dir variable)
--  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
+-  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct
+-    WORKING_DIRECTORY ${dir}
 -    OUTPUT_VARIABLE ${variable}
 -    OUTPUT_STRIP_TRAILING_WHITESPACE)
 -ENDMACRO(Gitversion_GET_DATE)
 -
--Gitversion_GET_REVISION(. ProjectRevision)
--Gitversion_GET_HASH(. ProjectHash)
--Gitversion_GET_DATE(. ProjectDate)
-+#find_package(Git)
-+#if(NOT GIT_FOUND)
-+#  MESSAGE(FATAL_ERROR "Git not found!.")
-+#endif()
-+#
-+#MACRO(Gitversion_GET_REVISION dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_REVISION)
-+#
-+#MACRO(Gitversion_GET_HASH dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_HASH)
-+#
-+#MACRO(Gitversion_GET_DATE dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_DATE)
-+#
-+#Gitversion_GET_REVISION(. ProjectRevision)
-+#Gitversion_GET_HASH(. ProjectHash)
-+#Gitversion_GET_DATE(. ProjectDate)
- 
- # write a file with the APPVERSION define
--MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
--file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+#MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-+#file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+file(WRITE appversion.h.txt "#define APPVERSION XXXDOMOTICZXXX\n#define APPHASH \"XXXHASHXXX\"\n#define APPDATE XXXTIMEXXX\n")
- # copy the file to the final header only if the version changes
- # reduces needless rebuilds
- 
+-MACRO(Gitversion_CHECK_DIRTY dir variable)
+-  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
+-    WORKING_DIRECTORY ${dir}
+-    OUTPUT_VARIABLE ${variable}
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-ENDMACRO(Gitversion_CHECK_DIRTY)
+-
+-Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision)
+-IF(NOT ProjectRevision)
+-  MESSAGE(STATUS "Failed to get ProjectRevision from git, set it to 0")
+-  set (ProjectRevision 0)
+-ELSE(NOT ProjectRevision)
+-  MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
+-ENDIF(NOT ProjectRevision)
+-Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash)
+-IF(NOT ProjectHash)
+-  MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0")
+-  set (ProjectHash 0)
+-ENDIF(NOT ProjectHash)
+-Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate)
+-IF(NOT ProjectDate)
+-  MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0")
+-  set (ProjectDate 0)
+-ENDIF(NOT ProjectDate)
+-Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty)
+-IF(ProjectDirty)
+-  MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash")
+-  set (ProjectHash "${ProjectHash}-modified")
+-ENDIF(ProjectDirty)
+-
+-# write a file with the APPVERSION define
+-file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
+-
++set (ProjectDate 0)
+ # if ProjectDate is 0, create appversion.h.txt from a copy of appversion.default
+ IF(NOT ProjectDate AND EXISTS ${SOURCE_DIR}/appversion.default)
+   MESSAGE(STATUS "ProjectDate is 0 and appversion.default exists, copy it")