diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | tixmltext.patch | 12 | ||||
| -rw-r--r-- | usercode.patch | 25 |
4 files changed, 26 insertions, 39 deletions
@@ -1,17 +1,17 @@ pkgbase = openzwave pkgdesc = Opensource Z-Wave control - pkgver = 1.5 - pkgrel = 2 + pkgver = 1.6 + pkgrel = 1 url = http://www.openzwave.com arch = i686 arch = x86_64 license = LGPL makedepends = doxygen depends = libsystemd - source = https://github.com/OpenZWave/open-zwave/archive/V1.5.tar.gz - source = usercode.patch - sha256sums = abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 - sha256sums = 10d1c748d073a2bd9ce626536153e932e81f272af4bbf2f7943267b54b32bd5f + source = https://github.com/OpenZWave/open-zwave/archive/v1.6.tar.gz + source = tixmltext.patch + sha256sums = 3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b + sha256sums = 98dfb22e6fb1b3a01eba9cb5dbbe664c1b859ddd9255de14a36b6e17dfa848dd pkgname = openzwave @@ -1,21 +1,21 @@ # Maintainer: Jameson Pugh <imntreal@gmail.com> pkgname=openzwave -pkgver=1.5 -pkgrel=2 +pkgver=1.6 +pkgrel=1 pkgdesc="Opensource Z-Wave control" url="http://www.openzwave.com" arch=('i686' 'x86_64') license=('LGPL') depends=('libsystemd') makedepends=('doxygen') -source=("https://github.com/OpenZWave/open-zwave/archive/V${pkgver}.tar.gz" - 'usercode.patch') -sha256sums=('abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238' - '10d1c748d073a2bd9ce626536153e932e81f272af4bbf2f7943267b54b32bd5f') +source=("https://github.com/OpenZWave/open-zwave/archive/v${pkgver}.tar.gz" + 'tixmltext.patch') +sha256sums=('3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b' + '98dfb22e6fb1b3a01eba9cb5dbbe664c1b859ddd9255de14a36b6e17dfa848dd') prepare() { - cd "${srcdir}/open-zwave-${pkgver}" - patch -p1 < ../usercode.patch + cd "${srcdir}/open-zwave-${pkgver}/cpp/src" + patch -p0 < "${srcdir}/tixmltext.patch" } build() { diff --git a/tixmltext.patch b/tixmltext.patch new file mode 100644 index 000000000000..0d3b78ab66b1 --- /dev/null +++ b/tixmltext.patch @@ -0,0 +1,12 @@ +diff -u CompatOptionManager.cpp-orig CompatOptionManager.cpp +--- CompatOptionManager.cpp-orig 2019-06-05 08:20:29.837235450 -0400 ++++ CompatOptionManager.cpp 2019-06-05 08:20:53.757883997 -0400 +@@ -237,7 +237,7 @@ + { + TiXmlElement* valElement = new TiXmlElement( it->first.c_str() ); + char str[32]; +- TiXmlText * text; ++ TiXmlText * text = NULL; + // std::cout << "Name " << it->first << " Type: " << m_CompatVals[it->second].type << std::endl; + switch (m_CompatVals[it->second].type) { + case COMPAT_FLAG_TYPE_BOOL: diff --git a/usercode.patch b/usercode.patch deleted file mode 100644 index 82ecb2a0875d..000000000000 --- a/usercode.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp -index c235a849..be0ea5ac 100644 ---- a/cpp/src/command_classes/DoorLockLogging.cpp -+++ b/cpp/src/command_classes/DoorLockLogging.cpp -@@ -304,16 +304,15 @@ bool DoorLockLogging::HandleMsg - } - uint8 userid = (_data[10]); - uint8 usercodelength = (_data[11]); -- char usercode[254]; -- snprintf(usercode, sizeof(usercode), "UserCode:"); -+ char usercode[254] = { 0 }; - if (usercodelength > 0) -- for (int i = 0; i < usercodelength; i++ ) -+ for (int i = 0, j = 0; i < usercodelength && j < (int)sizeof(usercode); i++ ) - { -- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]); -+ j += snprintf(usercode + j, sizeof(usercode) - j, " %d", (int)_data[12+i]); - } - - if (valid) { -- snprintf(msg, sizeof(msg), "%02d/%02d/%02d %02d:%02d:%02d \tMessage: %s \tUserID: %d \t%s", (int)day, (int)month, (int)year, (int)hour, (int)minute, (int)second, c_DoorLockEventType[EventType], (int)userid, usercode); -+ snprintf(msg, sizeof(msg), "%02d/%02d/%02d %02d:%02d:%02d \tMessage: %s \tUserID: %d \tUserCode:%s", (int)day, (int)month, (int)year, (int)hour, (int)minute, (int)second, c_DoorLockEventType[EventType], (int)userid, usercode); - } else - snprintf(msg, sizeof(msg), "Invalid Record"); - value->OnValueRefreshed(msg); |