0.7.30

4 files changed, 81 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 906af67a0074..ec2cfeac3d0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = homegear
 	pkgdesc = Interface your HomeMatic BidCoS, HomeMatic Wired, MAX!, INSTEON or Philips hue devices with your home automation software or your own control scripts
-	pkgver = 0.7.18
-	pkgrel = 2
+	pkgver = 0.7.30
+	pkgrel = 1
 	url = https://homegear.eu
 	install = homegear.install
 	arch = x86_64
@@ -14,8 +14,8 @@ pkgbase = homegear
 	depends = libxslt
 	depends = libzip
 	depends = gnutls
-	depends = homegear-nodes-core=0.7.18
-	depends = php7-homegear
+	depends = homegear-nodes-core=0.7.30
+	depends = php-homegear
 	optdepends = homegear-homematicbidcos: Support for eQ-3 HomeMatic BidCoS (wireless) devices
 	optdepends = homegear-homematicwired: Support for eQ-3 HomeMatic Wired devices
 	optdepends = homegear-insteon: Support for Insteon devices
@@ -31,7 +31,7 @@ pkgbase = homegear
 	backup = etc/homegear/devices/254/OpenWeatherMap.xml
 	backup = etc/homegear/devices/254/VirtualWindowContact.xml
 	backup = etc/logrotate.d/homegear
-	source = https://github.com/Homegear/Homegear/archive/0.7.18.tar.gz
+	source = https://github.com/Homegear/Homegear/archive/0.7.30.tar.gz
 	source = homegear.service
 	source = homegear.logrotate
 	source = homegear.sysusers
@@ -39,13 +39,13 @@ pkgbase = homegear
 	source = homegear-makefile.patch
 	source = homegear-config.patch
 	source = homegear-ssl-optional.patch
-	sha512sums = 32a480fc10a8acbee2670ecde57be4986e23eb73b8c98c6a6d71036ae5ea038036e1c8af14a3f358f6ab5559c8f7e2c8fd23c3b19eb0a8c892f304cbacfb4b4c
+	sha512sums = 8f8065b05863b2c6e634cfadb982efe5f2281c616f47c1a0794642de9cec8d49decc6ff05f5d1b7c35da272ba8b257441ad1947eded9891adbe1fec28601df03
 	sha512sums = 825ff21b64323122108aba9d4aaf0a0a2ea5107eb225255d29fa95bd2710e00201fda0d99adeed2890fe7eec17b867e4626fd2dacddd5f9743cf6a07d7ca5333
 	sha512sums = c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a
 	sha512sums = aed267cb77c6a23a563152a17781cbe12fe14b68ed3d77dc75145c6422c3818f0d3550b5d20609d06e0bf937f24627806c0bfb3201fd27da0b420f6fbd4ebc66
 	sha512sums = 23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0
-	sha512sums = c70d30f4f9ddd7a9fb876230f814e333d6319397049da97c6715887a471f6e4d62de236414323b70c87db8a039c95390e8cef33c30ed1aa47d694358ca1e8e13
-	sha512sums = e09418e41f44e80aad18a342c1f4e7efc15e32d62483ea29c68c68ac7c644c2e42eb5673df9d8f90a51a0d65af8ee7867ca4d49df077f22195fb0d9e4970e398
+	sha512sums = b603487c3273c3e7abd9a4ad28ace16d309ef59750ea29737f5d93bbd607cfe322c6f79f68a555ed6fee7370d319ac9be3ff284794caad3be1ebb24f5b792647
+	sha512sums = 4dbe1a9999ba8331f9f8debd7e7d761e4f6d08538c8f9cfc1cb7d22b450313156e49a977710ff1e18e7b322d70ed1280da1d5f18da2033d33e871a0b3a701ed8
 	sha512sums = 5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498
 
 pkgname = homegear
diff --git a/PKGBUILD b/PKGBUILD
index 0fa85ad0bd04..4a916f3cba0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
 pkgname='homegear'
 _gitname='Homegear'
 pkgdesc='Interface your HomeMatic BidCoS, HomeMatic Wired, MAX!, INSTEON or Philips hue devices with your home automation software or your own control scripts'
-pkgver=0.7.18
-pkgrel=2
+pkgver=0.7.30
+pkgrel=1
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 license=('LGPL3')
 url="https://homegear.eu"
-depends=('sqlite3' 'libxslt' 'libzip' 'gnutls' 'homegear-nodes-core=0.7.18' 'php7-homegear')
+depends=('sqlite3' 'libxslt' 'libzip' 'gnutls' 'homegear-nodes-core=0.7.30' 'php-homegear')
 optdepends=('homegear-homematicbidcos: Support for eQ-3 HomeMatic BidCoS (wireless) devices'
             'homegear-homematicwired: Support for eQ-3 HomeMatic Wired devices'
             'homegear-insteon: Support for Insteon devices'
@@ -25,13 +25,13 @@ source=("https://github.com/Homegear/${_gitname}/archive/${pkgver}.tar.gz"
         'homegear-makefile.patch'
         'homegear-config.patch'
         'homegear-ssl-optional.patch')
-sha512sums=('32a480fc10a8acbee2670ecde57be4986e23eb73b8c98c6a6d71036ae5ea038036e1c8af14a3f358f6ab5559c8f7e2c8fd23c3b19eb0a8c892f304cbacfb4b4c'
+sha512sums=('8f8065b05863b2c6e634cfadb982efe5f2281c616f47c1a0794642de9cec8d49decc6ff05f5d1b7c35da272ba8b257441ad1947eded9891adbe1fec28601df03'
             '825ff21b64323122108aba9d4aaf0a0a2ea5107eb225255d29fa95bd2710e00201fda0d99adeed2890fe7eec17b867e4626fd2dacddd5f9743cf6a07d7ca5333'
             'c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a'
             'aed267cb77c6a23a563152a17781cbe12fe14b68ed3d77dc75145c6422c3818f0d3550b5d20609d06e0bf937f24627806c0bfb3201fd27da0b420f6fbd4ebc66'
             '23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0'
-            'c70d30f4f9ddd7a9fb876230f814e333d6319397049da97c6715887a471f6e4d62de236414323b70c87db8a039c95390e8cef33c30ed1aa47d694358ca1e8e13'
-            'e09418e41f44e80aad18a342c1f4e7efc15e32d62483ea29c68c68ac7c644c2e42eb5673df9d8f90a51a0d65af8ee7867ca4d49df077f22195fb0d9e4970e398'
+            'b603487c3273c3e7abd9a4ad28ace16d309ef59750ea29737f5d93bbd607cfe322c6f79f68a555ed6fee7370d319ac9be3ff284794caad3be1ebb24f5b792647'
+            '4dbe1a9999ba8331f9f8debd7e7d761e4f6d08538c8f9cfc1cb7d22b450313156e49a977710ff1e18e7b322d70ed1280da1d5f18da2033d33e871a0b3a701ed8'
             '5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498')
 install='homegear.install'
 backup=('etc/homegear/main.conf'
diff --git a/homegear-config.patch b/homegear-config.patch
index 41b73c5b5029..1daf198f1b5a 100644
--- a/homegear-config.patch
+++ b/homegear-config.patch
@@ -1,5 +1,5 @@
 diff --git a/misc/Config Directory/main.conf b/misc/Config Directory/main.conf
-index 1227873..c1bd51c 100644
+index a5df031..b9baf7f 100644
 --- a/misc/Config Directory/main.conf	
 +++ b/misc/Config Directory/main.conf	
 @@ -2,10 +2,10 @@
@@ -24,7 +24,7 @@ index 1227873..c1bd51c 100644
  
  # If dataPath is empty, the executable path is used.
  # Default: dataPath =
-@@ -189,7 +189,7 @@ enableNodeBlue = true
+@@ -165,7 +165,7 @@ enableNodeBlue = true
  
  # Path where Node-BLUE is located.
  # Default: nodeBluePath = /var/lib/homegear/node-blue
@@ -33,7 +33,7 @@ index 1227873..c1bd51c 100644
  
  # Default: nodeBluePathPermissions = 770
  # nodeBluePathPermissions = 770
-@@ -202,7 +202,7 @@ nodeBluePath = /var/lib/homegear/node-blue
+@@ -178,7 +178,7 @@ nodeBluePath = /var/lib/homegear/node-blue
  
  # Path where flow data is stored.
  # Default: nodeBlueDataPath = /var/lib/homegear/node-blue/data
@@ -42,25 +42,29 @@ index 1227873..c1bd51c 100644
  
  # Default: nodeBlueDataPathPermissions = 770
  # nodeBlueDataPathPermissions = 770
-@@ -219,7 +219,7 @@ nodeBlueDebugOutput = true
+@@ -194,8 +194,8 @@ nodeBlueDataPath = /var/lib/homegear/node-blue/data
+ nodeBlueDebugOutput = true
  
  # Path where Admin UI is located.
- # Default: adminUiPath = /var/lib/homegear/admin-ui
--adminUiPath = /var/lib/homegear/admin-ui
+-# Default: adminUiPath = /var/lib/homegear/admin-ui
+-adminUiPath = /var/lib/homegear/admin-ui/public
++# Default: adminUiPath = /usr/lib/homegear/admin-ui
 +adminUiPath = /usr/lib/homegear/admin-ui
  
  # Default: adminUiPathPermissions = 770
  # adminUiPathPermissions = 770
-@@ -232,7 +232,7 @@ adminUiPath = /var/lib/homegear/admin-ui
+@@ -207,8 +207,8 @@ adminUiPath = /var/lib/homegear/admin-ui/public
+ # adminUiPathGroup = homegear
  
  # Path where UI is located.
- # Default: uiPath = /var/lib/homegear/ui
+-# Default: uiPath = /var/lib/homegear/ui
 -uiPath = /var/lib/homegear/ui
++# Default: uiPath = /usr/lib/homegear/ui
 +uiPath = /usr/lib/homegear/ui
  
  # Default: uiPathPermissions = 770
  # uiPathPermissions = 770
-@@ -245,21 +245,21 @@ uiPath = /var/lib/homegear/ui
+@@ -221,21 +221,21 @@ uiPath = /var/lib/homegear/ui
  
  # Path to the family modules.
  # Default: modulePath = /var/lib/homegear/modules
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