testing/domoticz: use approot arg and use abuild snapshot

5 files changed, 16 insertions, 70 deletions

diff --git a/testing/domoticz/3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch b/testing/domoticz/3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
deleted file mode 100644
index cd53fb42a3..0000000000
--- a/testing/domoticz/3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3d203dcfe6fef7c8ff5d0dbc030b7b7934406999 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@gmail.com>
-Date: Mon, 8 Feb 2016 14:19:26 +0100
-Subject: [PATCH] Fix detection of system Lua
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbf2735..ff356c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,10 +10,11 @@ IF(USE_BUILTIN_LUA)
-     DEFINITION LUA_LIBRARIES)
- ELSE(USE_BUILTIN_LUA)
-   find_package(PkgConfig)
--  pkg_check_modules(LUA lua>=5.2)
-+  pkg_search_module(LUA lua5.2>=5.2 lua>=5.2)
-   IF(LUA_FOUND)
-     INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIRS})
-     add_definitions(-DWITH_EXTERNAL_LUA)
-+    link_directories(${LUA_LIBRARY_DIRS})
-   ELSE(LUA_FOUND)
-     MESSAGE(FATAL_ERROR "LUA not found but USE_BUILTIN_LUA=NO")
-   ENDIF(LUA_FOUND)
diff --git a/testing/domoticz/APKBUILD b/testing/domoticz/APKBUILD
index d674bd1081..93f3e1eed3 100644
--- a/testing/domoticz/APKBUILD
+++ b/testing/domoticz/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=domoticz
-pkgver=20160207
-pkgrel=3
+pkgver=0_git20160214
+pkgrel=4
 pkgdesc="Open source Home Automation System"
 url="http://www.domoticz.com/"
 arch="all"
@@ -15,14 +15,14 @@ makedepends="cmake $depends_dev openssl-dev zlib-dev curl-dev boost-dev
 	sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev openzwave-dev"
 install="$pkgname.pre-install"
 subpackages=""
+giturl="https://github.com/domoticz/domoticz.git"
+disturl="dev.alpinelinux.org:/archive/$pkgname"
 source="http://dev.alpinelinux.org/archive/domoticz/domoticz-$pkgver.tar.gz
-	3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
-	use-datapath-for-zwave-config.patch
 	$pkgname.initd
 	$pkgname.confd
 	"
 
-_builddir="$srcdir/domoticz-master"
+_builddir="$srcdir/domoticz-$pkgver"
 
 prepare() {
 	local i
@@ -66,18 +66,12 @@ package() {
         install -D -m644 "$srcdir"/$pkgname.confd \
                 "$pkgdir"/etc/conf.d/$pkgname || return 1
 }
-md5sums="1092ea41a91d82f321b372e3b390c09c  domoticz-20160207.tar.gz
-39295664197b86b9b67cce90220f8c10  3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
-018a8d1d100468a8de19e95e3d7d8bc5  use-datapath-for-zwave-config.patch
-ddb53f4567fc49e8ed14c4635a2b8953  domoticz.initd
-20f77ac45233623ad0685c1ed32d77ea  domoticz.confd"
-sha256sums="33419077e8f45ab30084867d09271db359fb57cdc54dce8fafa09a2e2327bdec  domoticz-20160207.tar.gz
-be6748531de484d5a40da4abde4989216b4d91a06b03639faa2943efcf71a8c0  3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
-27b65e0748fce9a20e2908833b9963adc2693603fe25ce6c0e25dc70975f536b  use-datapath-for-zwave-config.patch
-f096951e74715e11a399ce6be1445bd5da07656f5a956585b1098959d79d5d3c  domoticz.initd
-2b00fadcdc36a3b275e7c209a1a4b34aabd9e885b8d2aaca105aa9b7da91e271  domoticz.confd"
-sha512sums="19ea7391004c109199f913a6b08d8b4ad03c0e3f0405047e52d9c178735f309ae9e25748f0c297e4f777353e6cd78309049811b93a743390256f10abc27833a0  domoticz-20160207.tar.gz
-2d8ccffc508d9ee7360bd718187a3c9c1eee1356d415f8258259e52640e249dc5af5998c9c4d26e9d8fdf27b61e5b14607fbb55e1c531619a5df91a6d80b5e86  3d203dcfe6fef7c8ff5d0dbc030b7b7934406999.patch
-52e2cc45b7a49276d24997eb4b0a1de6384d0ee4c533d76c2d266dea28318de9ef106be9b6d52ed165b1331583e1b664c7fd9f157c16770a8a32fa7872d40ff0  use-datapath-for-zwave-config.patch
-272f6353a51a44ecd5997f73fbb8866a2ffad81f69d2fabaf144aa1cf639a536be97856b046c785203811926352e71a11975642b6069713477237a5f0afd5de7  domoticz.initd
-089b7c9979917ac82336e7bd2eeb997147a7fd3eee1468ea2181dd8560b433240107a715a2b73e875bc47c3552368e67ff1d2a0ac0bc1684916b94fcba4ae76a  domoticz.confd"
+md5sums="efd24da757ee95b721744b39eb114fd8  domoticz-0_git20160214.tar.gz
+c7a183cf8d3df2d0dd14380d13694847  domoticz.initd
+e5ecebdcc238af91a89081a115530175  domoticz.confd"
+sha256sums="b170a4e91f456032b175e59bba043922c650254978c321f0fed29eb7e5878fff  domoticz-0_git20160214.tar.gz
+4701360626f3951102e8b827031d2099f241a003123bc9114237ba67b24e2845  domoticz.initd
+155e9c33c5a99bb32e925c834b2530451640a8a58e39aa63e358401711d67ff3  domoticz.confd"
+sha512sums="fa1cf347961435710ded56e08e9335526ec124c044bfaf308858b2e7cfd1c77ec6361f60a6c7992d2c02cd04168b3bda46ade1921c0656d5f40c1265688c68eb  domoticz-0_git20160214.tar.gz
+3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2  domoticz.initd
+724440da335f1e22c8dc181df62dac9ad2bcca98b39bff059de4be5901a93a0a8cb6864d92262092041d796ee7d3933f62cf337316d35a800bbb44f84a1709e0  domoticz.confd"
diff --git a/testing/domoticz/domoticz.confd b/testing/domoticz/domoticz.confd
index 31ee17f1ef..cad15cabe6 100644
--- a/testing/domoticz/domoticz.confd
+++ b/testing/domoticz/domoticz.confd
@@ -1,7 +1,6 @@
 # domoticz settings
 user="domoticz"
-dbase="/var/lib/domoticz/domoticz.db"
 userdata="/var/lib/domoticz/"
-wwwroot="/usr/share/domoticz/www/"
+approot="/usr/share/domoticz/"
 pidfile="/var/run/domoticz/domoticz.pid"
 daemon_args=""
diff --git a/testing/domoticz/domoticz.initd b/testing/domoticz/domoticz.initd
index f8286f0740..139e3345fd 100644
--- a/testing/domoticz/domoticz.initd
+++ b/testing/domoticz/domoticz.initd
@@ -2,7 +2,7 @@
 
 name=domoticz
 command=/usr/bin/$name
-command_args="-dbase $dbase -userdata $userdata -wwwroot $wwwroot -pidfile $pidfile -syslog -daemon $daemon_args"
+command_args="-daemon -userdata $userdata -approot $approot -pidfile $pidfile $daemon_args"
 command_background=YES
 start_stop_daemon_args="--user $user"
 
diff --git a/testing/domoticz/use-datapath-for-zwave-config.patch b/testing/domoticz/use-datapath-for-zwave-config.patch
deleted file mode 100644
index 9a7f498223..0000000000
--- a/testing/domoticz/use-datapath-for-zwave-config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp
-index 6bb88d1..9a77005 100644
---- a/hardware/OpenZWave.cpp
-+++ b/hardware/OpenZWave.cpp
-@@ -955,13 +955,15 @@ bool COpenZWave::OpenSerialConnector()
- 	std::string UserPath = ConfigPath;

- 	if (szStartupFolder != szUserDataFolder)

- 	{

--		UserPath = szUserDataFolder;

-+		ConfigPath = szUserDataFolder + "Config/";

-+		UserPath = ConfigPath;

- 	}

- 	// Create the OpenZWave Manager.

- 	// The first argument is the path to the config files (where the manufacturer_specific.xml file is located

- 	// The second argument is the path for saved Z-Wave network state and the log file.  If you leave it NULL 

- 	// the log file will appear in the program's working directory.

- 	_log.Log(LOG_STATUS, "OpenZWave: using config in: %s", ConfigPath.c_str());

-+	_log.Log(LOG_STATUS, "OpenZWave: writing config in: %s", UserPath.c_str());

- 	OpenZWave::Options::Create(ConfigPath, UserPath, "--SaveConfiguration=true ");

- 	EnableDisableDebug();

- 	OpenZWave::Options::Get()->AddOptionInt("PollInterval", 60000); //enable polling each 60 seconds