[0.7.18-1] update

5 files changed, 63 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daf4a15e7a81..717ae46a6456 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.15
+	pkgver = 0.7.18
 	pkgrel = 1
 	url = https://homegear.eu
 	install = homegear.install
@@ -12,9 +12,10 @@ pkgbase = homegear
 	license = LGPL3
 	depends = sqlite3
 	depends = libxslt
+	depends = libzip
 	depends = gnutls
-	depends = homegear-nodes-core
-	depends = php7-homegear
+	depends = homegear-nodes-core=0.7.18
+	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
@@ -30,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.15.tar.gz
+	source = https://github.com/Homegear/Homegear/archive/0.7.18.tar.gz
 	source = homegear.service
 	source = homegear.logrotate
 	source = homegear.sysusers
@@ -38,13 +39,13 @@ pkgbase = homegear
 	source = homegear-makefile.patch
 	source = homegear-config.patch
 	source = homegear-ssl-optional.patch
-	sha512sums = e460426490d8a16a148ec2341c58f351896ff5cd48fbea09c5782c1253f8c10fad6ac28eb77ceb927bf975439d0698b511194bb0958186f687a21829f45e20c3
+	sha512sums = 32a480fc10a8acbee2670ecde57be4986e23eb73b8c98c6a6d71036ae5ea038036e1c8af14a3f358f6ab5559c8f7e2c8fd23c3b19eb0a8c892f304cbacfb4b4c
 	sha512sums = 825ff21b64323122108aba9d4aaf0a0a2ea5107eb225255d29fa95bd2710e00201fda0d99adeed2890fe7eec17b867e4626fd2dacddd5f9743cf6a07d7ca5333
 	sha512sums = c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a
 	sha512sums = aed267cb77c6a23a563152a17781cbe12fe14b68ed3d77dc75145c6422c3818f0d3550b5d20609d06e0bf937f24627806c0bfb3201fd27da0b420f6fbd4ebc66
 	sha512sums = 23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0
-	sha512sums = dbf22df28653890a62fb0c7d41d1de5ee5d5ee1377d51e0470562bff9d0fcbadf6290a113c5ae584ead8a29c005c84be22c9266de0818d7ef43012c19e7c12ea
-	sha512sums = fd60fe50bedfc3d60cb93159087927c1f5d4d80a7176ec4c53b01e5c254f339ab6df436342684f0240b75d01d37c72f39af4379c57b13b18826e5997810df4fe
+	sha512sums = c70d30f4f9ddd7a9fb876230f814e333d6319397049da97c6715887a471f6e4d62de236414323b70c87db8a039c95390e8cef33c30ed1aa47d694358ca1e8e13
+	sha512sums = e09418e41f44e80aad18a342c1f4e7efc15e32d62483ea29c68c68ac7c644c2e42eb5673df9d8f90a51a0d65af8ee7867ca4d49df077f22195fb0d9e4970e398
 	sha512sums = 5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498
 
 pkgname = homegear
diff --git a/PKGBUILD b/PKGBUILD
index 08236995f88e..85e81037ee4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
+# Package build for homegear (https://www.homegear.eu/index.php/Main_Page)
 # Maintainer: Niklas <dev@n1klas.net>
 # Contributor: Michael Lipp <mnl at mnl dot de>
 
 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.15
+pkgver=0.7.18
 pkgrel=1
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 license=('LGPL3')
 url="https://homegear.eu"
-depends=('sqlite3' 'libxslt' 'gnutls' 'homegear-nodes-core' 'php7-homegear')
+depends=('sqlite3' 'libxslt' 'libzip' 'gnutls' 'homegear-nodes-core=0.7.18' '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'
@@ -24,13 +25,13 @@ source=("https://github.com/Homegear/${_gitname}/archive/${pkgver}.tar.gz"
         'homegear-makefile.patch'
         'homegear-config.patch'
         'homegear-ssl-optional.patch')
-sha512sums=('e460426490d8a16a148ec2341c58f351896ff5cd48fbea09c5782c1253f8c10fad6ac28eb77ceb927bf975439d0698b511194bb0958186f687a21829f45e20c3'
+sha512sums=('32a480fc10a8acbee2670ecde57be4986e23eb73b8c98c6a6d71036ae5ea038036e1c8af14a3f358f6ab5559c8f7e2c8fd23c3b19eb0a8c892f304cbacfb4b4c'
             '825ff21b64323122108aba9d4aaf0a0a2ea5107eb225255d29fa95bd2710e00201fda0d99adeed2890fe7eec17b867e4626fd2dacddd5f9743cf6a07d7ca5333'
             'c58a093cc923551e8482503962bfb9f043ee651b2d9954df6a8bf478715848bdac226dc0f3eb4e4f4aa44cdc9c7ca041560db735e27d6cc89122d02e2ffecc2a'
             'aed267cb77c6a23a563152a17781cbe12fe14b68ed3d77dc75145c6422c3818f0d3550b5d20609d06e0bf937f24627806c0bfb3201fd27da0b420f6fbd4ebc66'
             '23fb3b1a49f7b3433bd71ca262545aa31d67e7ae88801b41a7c1e306be926a06b7b29389cc63f3342cf8f5e55f908dc0847be6ba7d6b2657018240883a658ce0'
-            'dbf22df28653890a62fb0c7d41d1de5ee5d5ee1377d51e0470562bff9d0fcbadf6290a113c5ae584ead8a29c005c84be22c9266de0818d7ef43012c19e7c12ea'
-            'fd60fe50bedfc3d60cb93159087927c1f5d4d80a7176ec4c53b01e5c254f339ab6df436342684f0240b75d01d37c72f39af4379c57b13b18826e5997810df4fe'
+            'c70d30f4f9ddd7a9fb876230f814e333d6319397049da97c6715887a471f6e4d62de236414323b70c87db8a039c95390e8cef33c30ed1aa47d694358ca1e8e13'
+            'e09418e41f44e80aad18a342c1f4e7efc15e32d62483ea29c68c68ac7c644c2e42eb5673df9d8f90a51a0d65af8ee7867ca4d49df077f22195fb0d9e4970e398'
             '5b25817cbbf5a5fb1d7c8414d36441de18cef3c43693329facb84b4312fd83c92bfcf6100937f3e5c9a7329e4ba80de1418cc0b9374c46d14255a612e8617498')
 install='homegear.install'
 backup=('etc/homegear/main.conf'
@@ -46,17 +47,16 @@ backup=('etc/homegear/main.conf'
 prepare() {
     cd "${srcdir}/${_gitname}-${pkgver}"
 
+    patch -p1 -i "${srcdir}"/homegear-makefile.patch
+    patch -p1 -i "${srcdir}"/homegear-config.patch
+    patch -p1 -i "${srcdir}"/homegear-ssl-optional.patch
+
     # Use the our version number instead of the script which would have fetched it from Github
     sed -i -e "s#m4_esyscmd_s(\[./getVersion.sh\])#${pkgver}#" configure.ac
     # Put the modules in /usr/lib instead of /var/lib because that is where they belong
     sed -i -e 's#libdir = $(localstatedir)/lib/homegear/modules#libdir = $(prefix)/lib/homegear/modules#' homegear-miscellaneous/src/Makefile.am
-
     # Fix enchant header path change
     sed -i -e 's# -lenchant # -lenchant-2 #' src/Makefile.am
-
-    patch -p1 -i "${srcdir}"/homegear-makefile.patch
-    patch -p1 -i "${srcdir}"/homegear-config.patch
-    patch -p1 -i "${srcdir}"/homegear-ssl-optional.patch
 }
 
 build() {
@@ -88,12 +88,12 @@ package() {
     install -dm550 "${pkgdir}/var/lib/homegear/scripts"
     install -dm750 "${pkgdir}/var/lib/homegear/firmware"
 
-    install -dm755 "${pkgdir}/etc/homegear/devices/254"
+    install -dm755 "${pkgdir}"/etc/homegear/devices/254
     cp -r "homegear-miscellaneous/misc/Device Description Files/"* "${pkgdir}/etc/homegear/devices/254"
     chmod 644 "${pkgdir}/etc/homegear/devices/254/"*
 
-    install -Dm755 "${srcdir}/homegear.service" "${pkgdir}/usr/lib/systemd/system/homegear.service"
-    install -Dm755 "${srcdir}/homegear.sysusers" "${pkgdir}/usr/lib/sysusers.d/homegear.conf"
-    install -Dm755 "${srcdir}/homegear.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/homegear.conf"
-    install -Dm755 "${srcdir}/homegear.logrotate" "${pkgdir}/etc/logrotate.d/homegear"
+    install -Dm644 "${srcdir}/homegear.service" "${pkgdir}/usr/lib/systemd/system/homegear.service"
+    install -Dm644 "${srcdir}/homegear.sysusers" "${pkgdir}/usr/lib/sysusers.d/homegear.conf"
+    install -Dm644 "${srcdir}/homegear.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/homegear.conf"
+    install -Dm644 "${srcdir}/homegear.logrotate" "${pkgdir}/etc/logrotate.d/homegear"
 }
diff --git a/homegear-config.patch b/homegear-config.patch
index 485fa2f03f40..41b73c5b5029 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 9f6716e..5e3aa16 100644
+index 1227873..c1bd51c 100644
 --- a/misc/Config Directory/main.conf	
 +++ b/misc/Config Directory/main.conf	
 @@ -2,10 +2,10 @@
@@ -24,16 +24,43 @@ index 9f6716e..5e3aa16 100644
  
  # If dataPath is empty, the executable path is used.
  # Default: dataPath =
-@@ -189,7 +189,7 @@ enableFlows = true
+@@ -189,7 +189,7 @@ enableNodeBlue = true
  
  # Path where Node-BLUE is located.
- # Default: flowsPath = /var/lib/homegear/flows
--flowsPath = /var/lib/homegear/flows
-+flowsPath = /usr/lib/homegear/flows
+ # Default: nodeBluePath = /var/lib/homegear/node-blue
+-nodeBluePath = /var/lib/homegear/node-blue
++nodeBluePath = /usr/lib/homegear/node-blue
  
- # Default: flowsPathPermissions = 770
- # flowsPathPermissions = 770
-@@ -219,21 +219,21 @@ nodeBlueDebugOutput = true
+ # Default: nodeBluePathPermissions = 770
+ # nodeBluePathPermissions = 770
+@@ -202,7 +202,7 @@ nodeBluePath = /var/lib/homegear/node-blue
+ 
+ # Path where flow data is stored.
+ # Default: nodeBlueDataPath = /var/lib/homegear/node-blue/data
+-nodeBlueDataPath = /var/lib/homegear/node-blue/data
++nodeBlueDataPath = /usr/lib/homegear/node-blue/data
+ 
+ # Default: nodeBlueDataPathPermissions = 770
+ # nodeBlueDataPathPermissions = 770
+@@ -219,7 +219,7 @@ nodeBlueDebugOutput = true
+ 
+ # Path where Admin UI is located.
+ # Default: adminUiPath = /var/lib/homegear/admin-ui
+-adminUiPath = /var/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
+ 
+ # Path where UI is located.
+ # Default: uiPath = /var/lib/homegear/ui
+-uiPath = /var/lib/homegear/ui
++uiPath = /usr/lib/homegear/ui
+ 
+ # Default: uiPathPermissions = 770
+ # uiPathPermissions = 770
+@@ -245,21 +245,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 599f37b830f2..8b87c51f2f6a 100644
--- a/homegear-makefile.patch
+++ b/homegear-makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 5342ae3..1783369 100644
+index 1cdaecc..5618347 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -8,12 +8,6 @@ LIBS += -Wl,-Bstatic -lphp7-homegear -Wl,-Bdynamic -lz -lexslt -lresolv -ledit -
@@ -18,7 +18,7 @@ index 5342ae3..1783369 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 Flows/FlowsClient.cpp Flows/FlowsClientData.cpp Flows/FlowsProcess.cpp Flows/FlowsServer.cpp Flows/NodeManager.cpp Flows/SimplePhpNode.cpp Flows/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 UPnP/UPnP.cpp User/User.cpp
+ 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
  
diff --git a/homegear.install b/homegear.install
index 46bffd9625a8..30f0b75da97a 100644
--- a/homegear.install
+++ b/homegear.install
@@ -1,4 +1,7 @@
 post_install() {
+    echo '>>> IMPORTANT: If you changed /etc/homegear/main.conf, please check the .pacnew file'
+    echo '>>> and implement any new options to your configuration.'
+    echo 
     echo '>>> SSL on ports 2002 and 2003 is disabled by default.'
     echo '>>> Run the following commands and then enable SSL in /etc/homegear/rpcservers.conf:'
     echo '>>> # openssl genrsa -out /etc/homegear/homegear.key 2048'