0.7.30

1 files changed, 54 insertions, 5 deletions

diff --git a/homegear-makefile.patch b/homegear-makefile.patch
index 8b87c51f2f6a..d94ee64c8daa 100644
--- a/homegear-makefile.patch
+++ b/homegear-makefile.patch
@@ -1,8 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32fa76f..60ac99a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(Homegear)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ 
+-include_directories(/usr/include/php7-homegear/ext /usr/include/php7-homegear/main /usr/include/php7-homegear/sapi /usr/include/php7-homegear/TSRM /usr/include/php7-homegear/Zend)
++include_directories(/usr/include/php-homegear/ext /usr/include/php-homegear/main /usr/include/php-homegear/sapi /usr/include/php-homegear/TSRM /usr/include/php-homegear/Zend)
+ 
+ set(SOURCE_FILES
+         homegear-miscellaneous/src/Factory.cpp
+@@ -112,4 +112,4 @@ set(SOURCE_FILES
+ 
+ add_custom_target(homegear COMMAND ../../devscripts/makeAll.sh SOURCES ${SOURCE_FILES})
+ 
+-add_library(homegear-dummy ${SOURCE_FILES})
+\ No newline at end of file
++add_library(homegear-dummy ${SOURCE_FILES})
+diff --git a/configure.ac b/configure.ac
+index 399a410..6416b00 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,7 +70,7 @@ esac
+ AC_CHECK_LIB([mysqlclient], [mysql_init], [AM_CONDITIONAL(HAVE_MYSQLCLIENT, true)], [AM_CONDITIONAL(HAVE_MYSQLCLIENT, false)])
+ AC_CHECK_HEADERS([curl/curl.h], [AM_CONDITIONAL(HAVE_CURL_HEADERS, true)], [AM_CONDITIONAL(HAVE_CURL_HEADERS, false)])
+ AC_CHECK_LIB([curl], [curl_easy_send], [AM_CONDITIONAL(HAVE_CURL, true)], [AM_CONDITIONAL(HAVE_CURL, false)])
+-AC_CHECK_HEADERS([php7-homegear/main/php_config.h], [AM_CONDITIONAL(HAVE_PHP_HEADERS, true)], [AM_CONDITIONAL(HAVE_PHP_HEADERS, false)])
++AC_CHECK_HEADERS([php-homegear/main/php_config.h], [AM_CONDITIONAL(HAVE_PHP_HEADERS, true)], [AM_CONDITIONAL(HAVE_PHP_HEADERS, false)])
+ 
+ AC_DEFINE_UNQUOTED([GITCOMMITSHABASE], [`./getGitCommitBase.sh`], [Define git commit SHA of libhomegear-base])
+ AC_DEFINE_UNQUOTED([GITCOMMITSHAHOMEGEAR], [`./getGitCommitHomegear.sh`], [Define git commit SHA of Homegear])
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 1cdaecc..5618347 100644
+index 6518a60..caf5b11 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -8,12 +8,6 @@ LIBS += -Wl,-Bstatic -lphp7-homegear -Wl,-Bdynamic -lz -lexslt -lresolv -ledit -
+@@ -4,16 +4,10 @@ AM_CPPFLAGS = -Wall -std=c++11 -DFORTIFY_SOURCE=2 -DGCRYPT_NO_DEPRECATED
+ AM_LDFLAGS = -Wl,--export-dynamic -Wl,-rpath=/lib/homegear -Wl,-rpath=/usr/lib/homegear -Wl,-rpath=/usr/local/lib/homegear
+ if HAVE_PHP_HEADERS
+ # {{{ PHP libraries
+-LIBS += -Wl,-Bstatic -lphp7-homegear -Wl,-Bdynamic -lz -lexslt -lresolv -ledit -lrt -lltdl -lgmp -lenchant -lrt -lm -lnsl -lxml2 -lxslt -licuuc -licui18n -licuio -lcrypt -lcrypto -lssl -lgnutls
++LIBS += -Wl,-Bstatic -lphp-homegear -Wl,-Bdynamic -lz -lexslt -lresolv -ledit -lrt -lltdl -lgmp -lenchant -lrt -lm -lnsl -lxml2 -lxslt -licuuc -licui18n -licuio -lcrypt -lcrypto -lssl -lgnutls
  # }}}
  endif
  
@@ -18,9 +56,20 @@ index 1cdaecc..5618347 100644
 @@ -21,7 +15,7 @@ endif
  
  bin_PROGRAMS = homegear
- homegear_SOURCES = main.cpp Monitor.cpp CLI/CLIClient.cpp CLI/CLIServer.cpp Database/SQLite3.cpp Events/EventHandler.cpp Node-BLUE/NodeBlueClient.cpp Node-BLUE/NodeBlueClientData.cpp Node-BLUE/NodeBlueProcess.cpp Node-BLUE/NodeBlueServer.cpp Node-BLUE/NodeManager.cpp Node-BLUE/SimplePhpNode.cpp Node-BLUE/StatefulPhpNode.cpp IPC/IpcClientData.cpp IPC/IpcServer.cpp GD/GD.cpp Licensing/LicensingController.cpp MQTT/Mqtt.cpp MQTT/MqttSettings.cpp RPC/Auth.cpp RPC/Client.cpp RPC/ClientSettings.cpp RPC/RemoteRpcServer.cpp RPC/RestServer.cpp RPC/RpcClient.cpp RPC/RPCMethods.cpp RPC/RPCServer.cpp RPC/Server.cpp WebServer/WebServer.cpp Systems/DatabaseController.cpp Systems/FamilyController.cpp Systems/UiController.cpp UPnP/UPnP.cpp User/User.cpp
--homegear_LDADD = -lpthread -lreadline -lgcrypt -lgnutls -lhomegear-base -lhomegear-node -lgpg-error -lsqlite3
-+homegear_LDADD = -lpthread -lreadline -lgcrypt -lgnutls -lhomegear-base -lhomegear-node -lgpg-error -lsqlite3 -latomic
+ homegear_SOURCES = main.cpp Monitor.cpp CLI/CliClient.cpp CLI/CliServer.cpp Database/SQLite3.cpp Events/EventHandler.cpp Node-BLUE/NodeBlueClient.cpp Node-BLUE/NodeBlueClientData.cpp Node-BLUE/NodeBlueProcess.cpp Node-BLUE/NodeBlueServer.cpp Node-BLUE/NodeManager.cpp Node-BLUE/SimplePhpNode.cpp Node-BLUE/StatefulPhpNode.cpp IPC/IpcClientData.cpp IPC/IpcServer.cpp GD/GD.cpp Licensing/LicensingController.cpp MQTT/Mqtt.cpp MQTT/MqttSettings.cpp RPC/Auth.cpp RPC/Client.cpp RPC/ClientSettings.cpp RPC/RemoteRpcServer.cpp RPC/RestServer.cpp RPC/RpcClient.cpp RPC/RPCMethods.cpp RPC/RpcServer.cpp WebServer/WebServer.cpp Systems/DatabaseController.cpp Systems/FamilyController.cpp Systems/UiController.cpp UPnP/UPnP.cpp User/User.cpp
+-homegear_LDADD = -lpthread -lreadline -lgcrypt -lgnutls -lhomegear-base -lhomegear-node -lhomegear-ipc -lgpg-error -lsqlite3
++homegear_LDADD = -lpthread -lreadline -lgcrypt -lgnutls -lhomegear-base -lhomegear-node -lhomegear-ipc -lgpg-error -lsqlite3 -latomic
  
  if BSDSYSTEM
  else
+@@ -34,8 +28,8 @@ libscriptengine_a_SOURCES = ScriptEngine/php_homegear_globals.cpp ScriptEngine/p
+ homegear_LDADD += libscriptengine.a
+ libscriptengine_a_CPPFLAGS = -Wall -std=c++11 -DFORTIFY_SOURCE=2 -DGCRYPT_NO_DEPRECATED
+ if BSDSYSTEM
+-libscriptengine_a_CPPFLAGS += -I/usr/include/php7-homegear -I/usr/include/php7-homegear/main -I/usr/include/php7-homegear/sapi -I/usr/include/php7-homegear/TSRM -I/usr/include/php7-homegear/Zend -I/usr/include/php7-homegear/php -I/usr/include/php7-homegear/php/main -I/usr/include/php7-homegear/php/sapi -I/usr/include/php7-homegear/php/TSRM -I/usr/include/php7-homegear/php/Zend
++libscriptengine_a_CPPFLAGS += -I/usr/include/php-homegear -I/usr/include/php-homegear/main -I/usr/include/php-homegear/sapi -I/usr/include/php-homegear/TSRM -I/usr/include/php-homegear/Zend -I/usr/include/php-homegear/php -I/usr/include/php-homegear/php/main -I/usr/include/php-homegear/php/sapi -I/usr/include/php-homegear/php/TSRM -I/usr/include/php-homegear/php/Zend
+ else
+-libscriptengine_a_CPPFLAGS += -I/usr/include/php7-homegear -I/usr/include/php7-homegear/main -I/usr/include/php7-homegear/sapi -I/usr/include/php7-homegear/TSRM -I/usr/include/php7-homegear/Zend -I/usr/include/php7-homegear/php -I/usr/include/php7-homegear/php/main -I/usr/include/php7-homegear/php/sapi -I/usr/include/php7-homegear/php/TSRM -I/usr/include/php7-homegear/php/Zend
++libscriptengine_a_CPPFLAGS += -I/usr/include/php-homegear -I/usr/include/php-homegear/main -I/usr/include/php-homegear/sapi -I/usr/include/php-homegear/TSRM -I/usr/include/php-homegear/Zend -I/usr/include/php-homegear/php -I/usr/include/php-homegear/php/main -I/usr/include/php-homegear/php/sapi -I/usr/include/php-homegear/php/TSRM -I/usr/include/php-homegear/php/Zend
+ endif
+ #endif